Support NUCCORE-1121