Merge remote-tracking branch 'upstream/master' into unify_header_handling
Retain existing unittest to avoid reducing coverage
Making place for toc_3 testcases to be merged from the unify_header_handling branch
Merge branch 'unify_header_handling'