Merge branch 'master' into 'production'

Merge master to production

See merge request !241
1 job for v2.5.0
in 1 minute and 49 seconds, using 0 compute credits, and was queued for 35 seconds