Merge branch 'jn/format-patch-doc' into maint