Merge branch 'from/develop/tusooa/add-remove-emails' into 'develop'