sync udt4 to CVS upstream