Merge branch 'test/pci-rename' into topic/misc