[OTIM-388] OTIM-388