Merge branch 'tr/format-patch-thread'