[NUCODF-57] Support NUCCORE-1197