resend pr for bug 948826