Merge "Add cps client to PCI app"