Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Mon, 10 Jan 2022 23:37:37 +0000 (23:37 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Mon, 10 Jan 2022 23:37:37 +0000 (23:37 +0000)

Trivial merge