SUG-397 : Support for OcStore