CVS #3338 (EFT)