Merge branch 'sp/maint-http-enable-gzip' into maint