Merge "Add implementation for OOF PCI use case"