Support NUCCORE-1267