[ORECS-138] ORECS-138