Merge branch 'hotfix/Fix_email_address'
Merge branch 'master' into develop