Merge branch 'jt/http-redact-cookies' into maint