Merge branch 'jk/doc-submodule-markup-fix'