Support NUCCORE-1215