Merge branch 'master' into 'production'

Merge master to production

See merge request !230
1 job for v2.3.1
in 1 minute and 48 seconds, using 0 compute credits, and was queued for 1 minute and 30 seconds
latest