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

Trivial merge