Code

Merge branch 'bc/maint-diff-hunk-header-fix' into maint