[ORECS-243] ORECS-243