CVS #6131