Backport of r195249 and r195756 commits to the release_34 branch

Forward to the group.

Hi Bill,

Can I just check that we will be ok to merge this to release_34 early next week assuming Chad approves it? I'm not sure what patches you'll accept between the 2nd and the 8th of December.