update from master after fixing torus grid, scale_latency obsolete, etc