Merge branch '2022-01-12-pci-updates'

- PCI code clean up and bug fixes from Pali