Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Tue, 9 Nov 2021 19:06:13 +0000 (19:06 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Tue, 9 Nov 2021 19:06:13 +0000 (19:06 +0000)

Trivial merge