Merge branch 'development' into 'development'

Release 1.2.3

See merge request !42
1 job for development in 39 seconds (queued for 2 seconds)