[ORECS-196] ORECS-196