Merge pull request #20455 from eileenmcnaughton/group