Merge "Bug-1338: Create a grouping for order to help create generic OrderComparator...