Merge branch 'develop-v2.3.0' into 'master'

Develop v2.3.0

See merge request !217
1 job for master
in 36 seconds, using 0 compute credits, and was queued for 2 seconds