Contacts: Backport #917