[ORECS-248] ORECS-248