[OTIM-358] OTIM-358