Merge branch 'enh/improved_preproc_edit' into 'master'

Enh: Improved preproc edit

See merge request !40
3 jobs for master in 16 minutes and 51 seconds (queued for 7 seconds)