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

Trivial merge