Updated sorting algorithm for the SORT_DESC option being set
Merge remote-tracking branch 'origin/2.4' into 2.4