Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Mon, 16 May 2022 18:33:41 +0000 (18:33 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Mon, 16 May 2022 18:33:41 +0000 (18:33 +0000)

Trivial merge