CVS #2587 (EFT)