Merge branch 'cd-improvements' into 'master'

Try and make CD fails more clear

See merge request !3
2 jobs for master in 1 minute and 37 seconds (queued for 7 seconds)