Merge branch 'dev' into Issue/2127-userEmailsDisplayed