[NUCJPA-266] Support NUCCORE-1112 refactoring