Merge pull request #4316 from mono/work-51562