Merge in RED/ui from change-password-RED-681 to master * commit '4bfb3229680a3749bb0c498f80198ff69c6ebc61': change password