MatUDP TDI v6 and bug fix