Changes to support new partitioning that produces fewer output files
merged