Merge "Make _get_router() non-private"