[NUCEXCEL-76] Support NUCCORE-1197