Merge branch 'tc/format-patch-p'