[ORECO-684] ORECO-684