[ORECO-638] ORECO-638