Cherry pick from trivial-fixes to reduce the size of the merge
Merge pull request #520 from peternewman/e1.37-2

Cherry pick from trivial-fixes to reduce the size of the merge
Resync with trunk