[ORECS-255] ORECS-255