Support NUCCORE-1146