[ORECS-228] ORECS-228