Support NUCCORE-1192, minimise use of OID