Respect the element number in the inp file
Merge 'fix-inp-tree-num' into develop