Updates for bug 1025322