Merge branch 'feature/1078-password-reset' into 'develop'