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

Trivial merge