HH-35189 set header length cap to a more appropriate value
Merge remote-tracking branch 'origin/HH-35189' into release-candidate