Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Sat, 14 May 2022 00:51:06 +0000 (00:51 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Sat, 14 May 2022 00:51:06 +0000 (00:51 +0000)

Trivial merge