[ORECS-238] ORECS-238