Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Tue, 14 Jun 2022 03:06:36 +0000 (03:06 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Tue, 14 Jun 2022 03:06:36 +0000 (03:06 +0000)

Trivial merge