[ORECS-061] ORECS-061