[ORECS-229] ORECS-229