PIM-2374 : update field sorter and add related spec
PIM-2374 : update in group sorter and add related spec