[release/7.0] Backport pr 48892 to 7.0#48911

danmoseley merged 2 commits intodotnet:release/7.0dotnet/aspnetcore:release/7.0from

mitchdenny:backport-pr-48892-to-7.0mitchdenny/aspnetcore:backport-pr-48892-to-7.0Copy head branch name to clipboard