.
Merge branch 'dev/scada'
minor changes