Fixing the issue with Default Partitioner

The code in the 08 branch was forcing the use of the Default partitioner. Syncing this with the 07 branch.