SHDP-334 Remove PartitionKey wrapper