Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Mon, 18 Oct 2021 05:10:53 +0000 (05:10 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Mon, 18 Oct 2021 05:10:53 +0000 (05:10 +0000)

Trivial merge