Support NUCCORE-1123