Support NUCCORE-1217