Merge branch '1503-incorrect-behaviour-during-export-as-image' into 'master'

Resolve "incorrect behaviour during export as image"

Closes #1503

See merge request !1318
41 jobs for 1487-adding-advanced-map-root-map-is-loaded-as-submap in 18 minutes and 49 seconds (queued for 10 seconds)