Merge in TrainCV extensions