Merge branch 'develop-2.4.0' into 'master'

Develop 2.4.0

See merge request !240
1 job for master
in 4 minutes and 39 seconds, using 0 compute credits, and was queued for 1 second
latest