[OTIM-337] OTIM-337