Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Fri, 1 Oct 2021 15:56:08 +0000 (15:56 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Fri, 1 Oct 2021 15:56:08 +0000 (15:56 +0000)

Trivial merge