[OREMO-284] OREMO-284