Support NUCCORE-1127