Merge "Limit the number of routes for performance" into pi-dev