Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Mon, 20 Jun 2022 16:07:23 +0000 (16:07 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Mon, 20 Jun 2022 16:07:23 +0000 (16:07 +0000)

Trivial merge