Merge "Persistent connection to DO/PO service." into oc-dev