Merging changes from release/10.1 into main#7128

ericstj merged 4 commits intodotnet:maindotnet/extensions:mainfrom

joperezr:MergeRelBranchjoperezr/extensions:MergeRelBranchCopy head branch name to clipboard