ISPN-263 Handle cluster partitions

    * fixed reviews comments