Support NUCCORE-1212