Merge "Decrease default number of partitions from 64 to 10." into oc-dev