Fork of spatial_adapter