[ORECS-167] ORECS-167