Merge branch 'main' into 'fix/misc'

# Conflicts:
#   frontend/src/app/app.module.ts
1 job for !66 with fix/misc
latest merge request