Fixed branch for spatial_import