Merge branch 'jk/format-patch-from'