Code

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