[ORECS-257] ORECS-257