optimized parsing
Merge branch 'toplayout' into dev