Fixed the inclusion of OT-specific fields (fake & generated) into the
new strategy for assigning field ids.
4 files changed