Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Thu, 7 Jul 2022 18:42:33 +0000 (18:42 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Thu, 7 Jul 2022 18:42:33 +0000 (18:42 +0000)

Trivial merge