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
Resolve "Large number of small zones in `map` format cannot be loaded" See merge request !5398