Merge branch 'new-user-emails' into 'develop'