Data section reorganized
Merge branch 'output' into dev