Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Wed, 13 Oct 2021 14:00:41 +0000 (14:00 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Wed, 13 Oct 2021 14:00:41 +0000 (14:00 +0000)

Trivial merge