2 bugs are fixed: 31806, 31817
Merge branch '#31623_Sorting' into dev