Merge branch 'jc/compression-config'