Merge branch 'release/6.0' into merge/release/6.0-rc1-to-release/6.0
authorViktor Hofer <viktor.hofer@microsoft.com>
Mon, 23 Aug 2021 13:32:15 +0000 (15:32 +0200)
committerGitHub <noreply@github.com>
Mon, 23 Aug 2021 13:32:15 +0000 (15:32 +0200)

Trivial merge