[NUCRDBMS-756] Support NUCCORE-1112 refactoring