Merge branch 'revert-a7ee733d' into 'morphemic-rc2.5'

add-edge-support

See merge request !287
20 jobs for morphemic-rc2.5 in 28 minutes and 21 seconds (queued for 2 seconds)