Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Wed, 6 Jul 2022 14:44:32 +0000 (14:44 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Wed, 6 Jul 2022 14:44:32 +0000 (14:44 +0000)

Trivial merge