Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Mon, 3 Jan 2022 16:38:27 +0000 (16:38 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Mon, 3 Jan 2022 16:38:27 +0000 (16:38 +0000)

Trivial merge