Fix my contacts
Merge branch 'MH-780' into dev