Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Sat, 12 Feb 2022 00:17:36 +0000 (00:17 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Sat, 12 Feb 2022 00:17:36 +0000 (00:17 +0000)

Trivial merge