Bz1102655 6.3.x