Support NUCCORE-1175 and NUCCORE-1177