Merge pull request dotnet/coreclr#20409 from lol768/patch-1