Merge branch 'jk/http-redact-fix' into maint