Support NUCCORE-1261