Transition to ES done. Rest of glitches fixed.
Merge
Merge branch 'master' into devel