Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Thu, 20 Jan 2022 17:36:23 +0000 (17:36 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Thu, 20 Jan 2022 17:36:23 +0000 (17:36 +0000)

Trivial merge