Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Fri, 11 Feb 2022 23:44:09 +0000 (23:44 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Fri, 11 Feb 2022 23:44:09 +0000 (23:44 +0000)

Trivial merge