Merge branch 'jc/builtin-n-tar-tree'