[ORECS-242] ORECS-242