[NUCAPIJDO-69] Support NUCCORE-1112 refactoring