Merge branch 'jt/format-patch-rfc'