Merge develop into master
Merge and revert
I accidentally misclicked and merged this PR. That is why I reverted it with #1407 and recreated it here #1408.
Test
Deployed at https://codabench-test.lri.fr/
Changes
- #1309
- #1351
- #1404
- #1403
- #1374
- #1372
- #1370