Support for NUCCORE-1129