Merge branch 'main' into 'feat/assignment-frontend'

# Conflicts:
#   frontend/src/app/app.component.html