[ORECS-251] ORECS-251