Merge branch 'login-with-email' into 'develop'