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

Trivial merge