Merge pull request #6491 from neheb/pci