Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Wed, 6 Apr 2022 15:41:02 +0000 (15:41 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Wed, 6 Apr 2022 15:41:02 +0000 (15:41 +0000)

Trivial merge