[NUCHBASE-90] Support NUCCORE-1157