[ORECS-038] ORECS-038