OE-3603 - include element_type_eye changes into the consolidation code