Merge branch 'js/ls-files-x-doc'