Merge branch 'sh/pci-express-integration'