Restore functionality lost when merging

I.e. `default_sample_subset`, `default_feature_subset`, etc