Merge router_ad and router_api_proxy