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