Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Mon, 27 Sep 2021 17:02:20 +0000 (17:02 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Mon, 27 Sep 2021 17:02:20 +0000 (17:02 +0000)

Trivial merge