[NUCHBASE-88] Support NUCCORE-1112