Commit 9d5c50cd authored by Clara Dewarumez's avatar Clara Dewarumez

Merge branch 'develop' into 'master'

Merge branch develop into master (3.10.0)

Closes #1384 and #1388

See merge request !679
parents bb79510e bc62271b
Pipeline #7237 passed with stage
in 6 minutes and 21 seconds