Merge branch 'master' into wip_leon_T7774_Check_values_of_email_in