[ORECS-261] ORECS-261