Merge branch 'password-ampersand-validation' into develop