Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Sat, 8 Jan 2022 20:17:42 +0000 (20:17 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Sat, 8 Jan 2022 20:17:42 +0000 (20:17 +0000)

Trivial merge