Merge branch 'ui-fixes'
Merge branch 'master' into ui-fixes