Merge "BUG-979: reworked data schema nodes ordering"