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

Trivial merge