Item12952: group plugins and contribs and sort within the sets