Merge pull request #2720 from mono/fix-39325