Support NUCCORE-1265