Improvement/3.x/partitionkey