Merge branch 'master' into ui
minor fixes on ui
Merge branch 'ui'