Merge branch 'jc/compression-config' into maint