Merge in 'release/6.0-rc2' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Tue, 21 Sep 2021 17:10:58 +0000 (17:10 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Tue, 21 Sep 2021 17:10:58 +0000 (17:10 +0000)

Trivial merge