Merge branch 'sc/fmt-merge-msg-doc-markup-fix'