Bz1087463 6.3.x