Merge branch 'allow-disabling-compression'