Merge branch 'jk/ls-files-doc-markup-fix'