Merge branch '94_improve_complex_setup_handling' into 'master'

improve complex setup handling

See merge request !111
5 jobs for master in 17 minutes and 35 seconds (queued for 1 second)