Merge "Explicitly check RouteInfo type in InitialConfiguration"