Merge branch 'jk/diff-m-doc' into maint