[ORECO-387] ORECO-387