Merge branch 'jc/maint-diff-patch-header' into maint