email update
Merge branch 'hotfix/email_update'