Merge branch 'feat/expose_email_to_self' into 'develop'