[ORECS-131] ORECS-131