Support NUCCORE-1250