[ORECS-166] ORECS-166