merging master

2 jobs for dev-test_CERISE
in 28 seconds, using 0 compute credits, and was queued for 0 seconds