Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Mon, 13 Jun 2022 18:27:08 +0000 (18:27 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Mon, 13 Jun 2022 18:27:08 +0000 (18:27 +0000)

Trivial merge