Merge branch 'jc/maint-add-p-overlapping-hunks'