Merge pull request #10434 from dotnet/mirror-merge-9060302