[OREMO-297] OREMO-297