Merge branch alfroch-improve-cads with refs/heads/master into refs/merge-requests/559/train

50 jobs for !559 with alfroch-improve-cads into master in 13 minutes and 25 seconds (queued for 2 seconds)
merge train