Issue-id: OCS-102