[ORECO-637] ORECO-637