Merge branch 'jk/revisions-doc-markup-fix' into maint