[ORECS-258] ORECS-258