[ORECS-162] ORECS-162