Merge remote-tracking branch 'origin/develop' into fix/signup-without-email