Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Mon, 4 Oct 2021 14:32:48 +0000 (14:32 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Mon, 4 Oct 2021 14:32:48 +0000 (14:32 +0000)

Trivial merge