Support NUCCORE-1141