SHDP-327 Improved support for partitioning