Merge pull request #9381 from annando/group-number