sync udt4 to cvs upstream