Merge branch 'lh/submodule-tree-traversal' (early part)