Merge in 'release/6.0' changes
authordotnet-bot <dotnet-bot@microsoft.com>
Fri, 1 Oct 2021 19:55:52 +0000 (19:55 +0000)
committerdotnet-bot <dotnet-bot@microsoft.com>
Fri, 1 Oct 2021 19:55:52 +0000 (19:55 +0000)

Trivial merge