[ORECS-239] ORECS-239