Support NUCCORE-1124