bug 963686 - 1.3t branch