Merge pull request #7771 from nielosz/group_titles