[6.1] Port #3912 to release/6.1#4133

paulmedynski merged 2 commits intodev/samsharma2700/backport_3912_61dotnet/SqlClient:dev/samsharma2700/backport_3912_61from

copilot/sub-pr-3947dotnet/SqlClient:copilot/sub-pr-3947Copy head branch name to clipboard