Merge branch 'password-reset' into 'develop'