Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Wed, 13 Jul 2022 16:56:12 +0000 (16:56 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Wed, 13 Jul 2022 16:56:12 +0000 (16:56 +0000)

Trivial merge