[ORECO-564] ORECO-564