Group all duplicate emails per person
Fix conflicts after merging MH-825 to dev