CMS-4352 Ordering - Add support for manual sorting