Merge branch 'improve-roi-handling' into 'master'

Flint: Improve ROI display and edition

Closes #2667 and #2737

See merge request !3706
10 jobs for master in 120 minutes and 8 seconds (queued for 3 seconds)