Support NUCCORE-1266