Bz1102084 6.3.x