[ORECO-338] ORECO-338