finish addressing review comments for bug 877262. rebase bug 793966