Merge branch 'jk/redact-h2h3-headers-fix' into maint-2.41