AI-576 : keep nodes order in Pivot table the same as in 'Data Entry' and Design page.
Merge remote-tracking branch 'origin/production2' into production2