cells ordered correctly
Merge branch 'dev/vision' into dev/scada