Merge pull request #2182 from Montellese/xsp_grouping