Update for bug 897026