Merge branch 'v2.3' into 'master'

V2.3

See merge request !140
2 jobs for master in 2 minutes and 1 second (queued for 4 seconds)