Merge branch 'xy/format-patch-prereq-patch-id-fix'