Merge "Fix BGP_router module"