Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Thu, 13 Jan 2022 16:50:38 +0000 (16:50 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Thu, 13 Jan 2022 16:50:38 +0000 (16:50 +0000)

Trivial merge