Deploy bug 1056351 and bug 1058625