Merge branch 'pci/resource'