Packages from the vendor xw2423

xw2423/svn-user-up