[ORECS-215] ORECS-215