Support NUCCORE-1222