partial cross-validation
merge devel (cross-validation)