CVS #4336 (EFT)