[OREMO-296] OREMO-296