Merge branch 'jk/maint-pack-objects-compete-with-delete' into next