[OTIM-413] OTIM-413