Merge branch 'pci/deletion' into next