Merge branch weighting_class with refs/heads/master into refs/merge-requests/192/train

30 jobs for !192 with weighting_class into master in 9 minutes and 32 seconds (queued for 11 seconds)
merge train