Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Wed, 23 Feb 2022 19:21:53 +0000 (19:21 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Wed, 23 Feb 2022 19:21:53 +0000 (19:21 +0000)

Trivial merge