Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'