Merge branch merge-resampling-classes with refs/heads/master into refs/merge-requests/502/train

50 jobs for !502 with merge-resampling-classes into master in 15 minutes and 16 seconds (queued for 2 seconds)
merge train