Manually backporting #74599 to 7.0 for RC2.#75366

carlossanlop merged 2 commits intodotnet:release/7.0dotnet/runtime:release/7.0from

StephenMolloy:backport_74599_to_7.0StephenMolloy/runtime:backport_74599_to_7.0Copy head branch name to clipboard