Merge pull request #20456 from eileenmcnaughton/group2