Fixing sorting problemw

s2234645 requested to merge tek-dev into develop Apr 06, 2022