Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Sat, 11 Jun 2022 02:49:07 +0000 (02:49 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Sat, 11 Jun 2022 02:49:07 +0000 (02:49 +0000)

Trivial merge