CVS #3645 (EFT)