Group all duplicate emails per person
Merge branch 'MH-825' into dev