Merge branch '339-clean-up-editing-extension' into 'develop'

Resolve "Clean up editing extension"

Closes #339

See merge request t3o/ter!328
4 jobs for develop in 7 minutes and 32 seconds (queued for 2 seconds)