Merge "Password change request should be optional on soft reset"