Merge from vendor branch CVS: