Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Wed, 9 Mar 2022 20:00:57 +0000 (20:00 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Wed, 9 Mar 2022 20:00:57 +0000 (20:00 +0000)

Trivial merge