Small changes related to 5.1 UI.
Merge remote-tracking branch 'origin/development' into development