Merge branch 'fix/no-email-no-fail' into 'develop'