Merge pull request #45 from graimundo/5.2

Cherry picked UX fixes tested in master for 5.2
Merge pull request #47 from graimundo/5.2

Cherry picked UX fixes tested in master for 5.2