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