[ORECS-217] ORECS-217