Merge pull request #20434 from colemanw/groupContact