Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Wed, 13 Apr 2022 15:31:40 +0000 (15:31 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Wed, 13 Apr 2022 15:31:40 +0000 (15:31 +0000)

Trivial merge