Added bug 1085622 and bug 1089815.