Fix do not contact list
Merge branch 'MH-587' into dev