Merge branch 'master' into 'production'

Merge master to production

See merge request !241
1 job for v2.4.0
in 3 minutes and 6 seconds, using 0 compute credits, and was queued for 3 minutes and 38 seconds
latest