Support for NUCCORE-1229