[ORECS-171] ORECS-171