Support NUCCORE-1192