Merge branch 'dev' into 'main'

Fix various bugs on both front-end and back-end

Closes #264

See merge request !80