Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Thu, 14 Oct 2021 19:11:30 +0000 (19:11 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Thu, 14 Oct 2021 19:11:30 +0000 (19:11 +0000)

Trivial merge