Support NUCCORE-1147