Merge branch 'jk/doc-remote-helpers-markup-fix'