Selections to reduce header parsing
Merge pull request #5884 from wmtan/MoreMemoryUseReduction

Selections to reduce header parsing