Merge branch 'rs/drop-core-compression-vars' into maint