Merge branch alfroch-CADS-tfrecords with refs/heads/master into refs/merge-requests/436/train

42 jobs for !436 with alfroch-CADS-tfrecords into master in 17 minutes and 57 seconds (queued for 6 minutes and 23 seconds)
merge train