Cherry picked UX fixes tested in master for 5.2