Merge branch 'iccs-eshybrid' into 'morphemic-rc1.5'

Fixing stompy version

See merge request !194
17 jobs for morphemic-rc1.5 in 24 minutes and 24 seconds (queued for 10 seconds)