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