bugs 826388 and 826798 landed. worked on bugs 808370 and 827083