Fix checking for sort control
Merge branch 'sssvlv' into dev0.8