Merge pull request #3527 from xmcclure/cherrypick-monoerror-fix

No match.