Backport commits for 5B#7172

mthalman merged 2 commits into

dotnet:release/2026-05Bdotnet/dotnet-docker:release/2026-05Bfrom

mthalman:backport-5bmthalman/dotnet-docker:backport-5bCopy head branch name to clipboard