Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Tue, 8 Mar 2022 22:27:30 +0000 (22:27 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Tue, 8 Mar 2022 22:27:30 +0000 (22:27 +0000)

Trivial merge