CVS #3697 (EFT)