Merge branch 'main' into 'feat/country-list'

# Conflicts:
#   frontend/src/app/app-routing.module.ts
#   frontend/src/app/app.module.ts
1 job for !59 with feat/country-list
latest merge request