Support NUCCORE-1249