By: ValentinHirschi <valentin.hirschi@gmail.com>
Merge branch 'main' into claude/peaceful-dirac-a1bef7