[ORECO-540] ORECO-540