Merge remote-tracking branch 'origin/case-1854' into develop
Merge branch 'develop'
Release: v1.8.6
Merge branch 'master' into develop
case 1854 - Use custom validation for user email in order to allow email sharing among different ALMA users.