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

Trivial merge