Merge pull request #20242 from eileenmcnaughton/group