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

Trivial merge