Merge branch 'develop-2.3.1' into 'master'

Develop 2.3.1

See merge request !229
1 job for master
in 1 minute and 54 seconds, using 0 compute credits, and was queued for 1 second