Merge branch 'fk/doc-format-patch-vn' into maint