8210606: Improved data set handling

Reviewed-by: serb, psadhukhan, mschoene, rhalade
1 file changed