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

Trivial merge