Merge branch 'migration_es7' into 'development'

migration es7

See merge request !16
2 jobs for development in 45 seconds (queued for 4 seconds)