rebase for bug 808370