Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Tue, 10 May 2022 22:41:52 +0000 (22:41 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Tue, 10 May 2022 22:41:52 +0000 (22:41 +0000)

Trivial merge