CVS #6996