Branchless nesting fix
Merge branch 'support-tree-complex-headers' into gh-pages