making use of GeneralSpatialBinCollector instead of  MapBackedSpatialBinCollector
(cherry-picked from 7c857c5)