updates for bug 808370