Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Mon, 11 Oct 2021 06:58:13 +0000 (06:58 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Mon, 11 Oct 2021 06:58:13 +0000 (06:58 +0000)

Trivial merge