rebase for bug 760876