CVS #2840