[ORECS-231] ORECS-231