Merge "Change to support PCI unchangeable cells"