untested EE changes for composite key partitioning