Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Tue, 21 Jun 2022 18:11:12 +0000 (18:11 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Tue, 21 Jun 2022 18:11:12 +0000 (18:11 +0000)

Trivial merge