[ORECS-245] ORECS-245