Merge branch 'feat/core/9707-tertiary-reorder-epic-ldml' into fix/common/9138-struct-alignment-epic-ldml