[ORECS-262] ORECS-262