Solve conflicts with master

2 jobs for dev-test_CERISE
in 10 minutes and 3 seconds, using 0 compute credits, and was queued for 10 minutes and 55 seconds