By: ValentinHirschi <valentin.hirschi@gmail.com>
Merge remote-tracking branch 'origin/main' # Conflicts: # FIRST_PHASE_PLAN.md