Bz1088178 6.3.x