Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Wed, 17 Nov 2021 03:24:16 +0000 (03:24 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Wed, 17 Nov 2021 03:24:16 +0000 (03:24 +0000)

Trivial merge