Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Thu, 6 Jan 2022 18:50:52 +0000 (18:50 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Thu, 6 Jan 2022 18:50:52 +0000 (18:50 +0000)

Trivial merge