[ORECS-119] ORECS-119