Support NUCCORE-1192, limit use of SingleFieldId