Bz1167760 6.4.x