[NUCRDBMS-789] Support NUCCORE-1197