[OREMO-278] OREMO-278