Support for NUCCORE-1238