Merge branch 'pci' into for_anthony