Merge branch 'main' into develop

* main: Badges

Seto Elkahfi committed Aug 15, 2023 at 15:40 UTC 8a16c99ebad7670b8ab9634de2bf732fad0f9f15

No changes.