Merge branch 'jk/tree-name-and-depth-limit'