Merge pull request #8833 from eileenmcnaughton/group_iterator