CVS tag R_3_0_4