Merge in Partitioner from master.