Bz1094354 6.3.x