Bz1102665 6.3.x