Sorting and No Compression
Merge branch 'master' into deploy