Merge branch 'sb/format-patch-base-patch-id-fix'