[ORECS-169] ORECS-169