[ORECS-246] ORECS-246