Merge branch '684-overlay-order' into 'devel_12.2.x'

Resolve "For an archived map the default overlay is Empty"

See merge request !675
17 jobs for devel_12.2.x in 10 minutes and 2 seconds (queued for 2 seconds)