Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Fri, 31 Dec 2021 04:15:17 +0000 (04:15 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Fri, 31 Dec 2021 04:15:17 +0000 (04:15 +0000)

Trivial merge