[NUCODF-53] Support NUCCORE-1157