[OREMO-273] OREMO-273