Merge in 'release/6.0-rc2' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Fri, 24 Sep 2021 17:28:06 +0000 (17:28 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Fri, 24 Sep 2021 17:28:06 +0000 (17:28 +0000)

Trivial merge