Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Wed, 15 Dec 2021 19:29:20 +0000 (19:29 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Wed, 15 Dec 2021 19:29:20 +0000 (19:29 +0000)

Trivial merge