Merge commit 'mst/pci' into staging