[ORECS-170] ORECS-170