Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Thu, 7 Oct 2021 17:20:23 +0000 (17:20 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Thu, 7 Oct 2021 17:20:23 +0000 (17:20 +0000)

Trivial merge