Internal request to back-port below PR to MDS v6.1: https://github.com/dotnet/SqlClient/pull/3609
Internal request to back-port below PR to MDS v6.1:
#3609