[OTIM-394] OTIM-394