[OTIM-395] OTIM-395