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