[ORECS-224] ORECS-224