[NUCEXCEL-70] Support NUCCORE-1112 refactoring