[master] Merge in changes from contact.