FOP-3216: Add object number to struct elements for linearization
2 files changed