Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Fri, 14 Jan 2022 19:04:27 +0000 (19:04 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Fri, 14 Jan 2022 19:04:27 +0000 (19:04 +0000)

Trivial merge