Merge branch 'js/ls-tree-error'