Merge branch 'jc/diff-format-doc' into maint