Merge branch 'jc/format-patch-rfc-more'