TABDEV-3420: Added new sort order options.
Merge branch 'feature/TABDEV-3420' into develop