Merge branch 'email-fix-develop' into 'develop'