cherry-pick listSorter update from 190
Merging origin/john/master-pending-listSorter-update into master