[NUCCASSANDRA-20] Support NUCCORE-1112 refactoring