[ORECS-253] ORECS-253