Merge "Auto PCI picking issue fix"