Match NUCCORE-1211 changes