Support for NUCCORE-1171