[NUCHBASE-92] Support NUCCORE-1197