Issue-id: OCS-9