Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maint