Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Tue, 3 May 2022 23:36:39 +0000 (23:36 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Tue, 3 May 2022 23:36:39 +0000 (23:36 +0000)

Trivial merge