Updates for bug 920180