Merge pull request #17766 from colemanw/activityContacts