Fix massive update labels in all contacts
Fix conflicts after merging MH-580 to dev