Merge branch '1573-export-issue' into 'devel_16.0.x'

Resolve "cannot export submap as image/map"

See merge request !1370
41 jobs for devel_16.0.x in 28 minutes (queued for 13 seconds)