Merge pull request #201 from bcreane/automated-cherry-pick-of-#200-upstream-v0.50