Merge branch '1558-map-listing-performance' into 'devel_16.0.x'

Resolve "this query takes ~7.5second"

See merge request !1354
41 jobs for devel_16.0.x in 20 minutes and 48 seconds (queued for 9 seconds)