Reduce header parsing
Merge pull request #5144 from wmtan/ReduceHeaderParsing

Reduce header parsing