Some sort changes
Merge branch 'master' into qa