Merge branch 'build-solving_docker_issues' into 'develop'

Build solving docker issues

See merge request !50
12 jobs for develop in 22 minutes and 34 seconds (queued for 1 second)