Support NUCCORE-1221