Code reviewed bug 902711