Uplift bug 783499 and bug 796073.