[NUCREST-15] Support NUCCORE-1112 refactoring