Merge branch 'multiple_cds' into 'master'

Multiple cds

Closes #605

See merge request !955
6 jobs for master
in 10 minutes and 33 seconds and was queued for 2 seconds
Scheduled