Merge branch 'carsten_optimization' into 'master'

Carsten optimization

See merge request !26
3 jobs for master in 8 minutes and 22 seconds (queued for 5 seconds)