Merge branch 'fix/signup-without-email' into 'develop'