Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Thu, 11 Aug 2022 21:02:27 +0000 (21:02 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Thu, 11 Aug 2022 21:02:27 +0000 (21:02 +0000)

Trivial merge