Merge branch 'pci/notes'