Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Wed, 4 May 2022 17:56:59 +0000 (17:56 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Wed, 4 May 2022 17:56:59 +0000 (17:56 +0000)

Trivial merge