Changes for saving email
Merge branch 'develop' into feature/email_not_saved_issue
Merge branch 'feature/email_not_saved_issue' into develop