Merge branch 'lt/dirwalk' into jc/dirwalk-n-cache-tree