Merge branch mguth-resampling-cleanup with refs/heads/master into refs/merge-requests/445/train

42 jobs for !445 with mguth-resampling-cleanup into master in 12 minutes and 33 seconds (queued for 2 seconds)
merge train