[ORECS-236] ORECS-236