Merge branch 'jk/maint-add-p-delete-fix' into maint