[Experimental] UDP/rUDP modifications