CVS #4338 (EFT)