Merge branch 'feature-a/docker-benchmark' into 'dev'

Feature a/docker benchmark

See merge request !678
6 jobs for dev in 7 minutes and 57 seconds (queued for 5 seconds)