[NUCEXCEL-72] Support NUCCORE-1157