Merge branch 'AIRAVATA-2571-email-verified' into develop