[CLC-1639] New sorting schema
Merge pull request #949 from yuhunglin/CLC-1638b

[CLC-1638] New sorting schema