Merge branch 'release-2-4-0' into 'master'

Release 2.4.0

See merge request !622
19 jobs for master
in 4 minutes and 50 seconds and was queued for 1 second
Scheduled