Merge branch 'nd/attr-pathspec-in-tree-walk'