CVS #6129