Merge branch alfroch-fix-resampling-merge with refs/heads/master into refs/merge-requests/565/train

50 jobs for !565 with alfroch-fix-resampling-merge into master in 13 minutes and 37 seconds (queued for 3 seconds)
merge train