Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Thu, 5 May 2022 00:56:40 +0000 (00:56 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Thu, 5 May 2022 00:56:40 +0000 (00:56 +0000)

Trivial merge