Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Wed, 15 Sep 2021 13:19:43 +0000 (13:19 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Wed, 15 Sep 2021 13:19:43 +0000 (13:19 +0000)

Trivial merge