[OTIM-361] OTIM-361