Merge pull request #9258 from eileenmcnaughton/group_fix