[NUCCASSANDRA-46] Support NUCCORE-1157