Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Thu, 16 Dec 2021 16:52:24 +0000 (16:52 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Thu, 16 Dec 2021 16:52:24 +0000 (16:52 +0000)

Trivial merge