Merge branch 'bg/format-patch-N'