Merge branch '2901-large-number-of-small-zones-in-map-format-cannot-be-loaded' into 'v9_16'

Resolve "Large number of small zones in `map` format cannot be loaded"

See merge request !5398
96 jobs for v9_16 in 166 minutes and 47 seconds (queued for 6 seconds)