Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Wed, 6 Oct 2021 23:48:31 +0000 (23:48 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Wed, 6 Oct 2021 23:48:31 +0000 (23:48 +0000)

Trivial merge