Merge remote-tracking branch 'origin/main'

# Conflicts:
#	frontend/package.json
#	frontend/pnpm-lock.yaml