Support NUCCORE-1253