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

Trivial merge