Merge branch 'gc/redact-h2h3-headers'