fixes #5412 do not mail UI
Merge branch 'dev' into test