[NUCODF-51] Support NUCCORE-1112 refactoring