Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint