[ORECS-168] ORECS-168