[OTIM-389] OTIM-389