Merge branch 'jc/fix-tree-walk' into pu