[ORECS-137] ORECS-137