diff --git a/cisco-ios-xr.sublime-syntax b/cisco-ios-xr.sublime-syntax
index ecdb3fe..c87c47a 100644
--- a/cisco-ios-xr.sublime-syntax
+++ b/cisco-ios-xr.sublime-syntax
@@ -933,6 +933,44 @@ variables:
         (?:vrf)
       )
     )
+  ctx_pop_interface: |
+    (?xi)
+    (?=
+      ^\s*
+      (?:
+        (?:cdp)|
+        (?:ipv4)|
+        (?:ipv6)|
+        (?:bundle)|
+        (?:flow)|
+        (?:load-interval)|
+        (?:path-option)|
+        (?:destination)|
+        (?:signalled-bandwidth)|
+        (?:vrf)|
+        (?:enable)|
+        (?:shutdown)|
+        (?:encapsulation)|
+        (?:address-family)|
+        (?:csnp-interval)|
+        (?:circuit-type)|
+        (?:mtu)|
+        (?:bandwidth)|
+        (?:lacp)|
+        (?:{{ctx_pop_configure_terminal}})
+      )
+    )
+  ctx_pop_interface_lldp: |
+    (?xi)
+    (?=
+      ^\s*
+      (?:
+        (?:receive)|
+        (?:transmit)|
+        (?:destination)|
+        (?:{{ctx_pop_interface}})
+      )
+    )
   ctx_pop_mpls_traffic_eng: |
     (?xi)
     (?=
@@ -2589,6 +2627,13 @@ contexts:
         3: support.constant
         4: string.unquoted
 
+  router_bgp_ignore_connected_check:
+    - match: |
+        (?xi)
+        ^\s*(ignore-connected-check)\s+
+      captures:
+        1: support.constant
+
   router_bgp_update_source:
     - match: '^\s*(update-source)\s+({{interface_names}})\s*({{interface_numbers}})'
       captures:
@@ -2622,12 +2667,76 @@ contexts:
         \s*$
       captures:
         1: support.constant
-        2: support.constant
+        2: constant.language
         3: support.constant
         4: constant.numeric
         5: support.constant
         6: string.unquoted
 
+  router_bgp_redistribute_static:
+    - match: |
+        (?xi)
+        ^\s*(redistribute)\s+(static)
+        (?:\s+(metric)\s+({{number_32_bit}}))?
+        (?:\s+(route-policy)\s+(\S+))?
+        \s*$
+      captures:
+        1: support.constant
+        2: constant.language
+        3: support.constant
+        4: constant.numeric
+        5: support.constant
+        6: string.unquoted
+
+  default_originate:
+    - match: |
+        (?xi)
+        ^\s*(default-originate)
+        (?:
+          \s+
+          (?:
+            (disable)|
+            (?:(route-policy)\s+(\S+))
+          )
+        )?
+      captures:
+        1: support.constant
+        2: keyword.other
+        3: support.constant
+        4: string.unquoted
+
+  router_bgp_send_community:
+    - match: |
+        (?xi)
+        ^\s*(send-community-ebgp)(\s+disable)?
+      captures:
+        1: support.constant
+        2: keyword.other
+
+  router_bgp_remove_private_as:
+    - match: |
+        (?xi)
+        ^\s*(remove-private-as)(\s+disable)?
+      captures:
+        1: support.constant
+        2: keyword.other
+
+  router_bgp_route_reflector_client:
+    - match: |
+        (?xi)
+        ^\s*(route-reflector-client)(\s+disable)?
+      captures:
+        1: support.constant
+        2: keyword.other
+
+  router_bgp_send_extended_community:
+    - match: |
+        (?xi)
+        ^\s*(send-extended-community-ebgp)(\s+disable)?
+      captures:
+        1: support.constant
+        2: keyword.other
+
   router_bgp_redistribute_eigrp:
     - match: |
         (?xi)
@@ -2647,7 +2756,7 @@ contexts:
         \s*$
       captures:
         1: support.constant
-        2: support.constant
+        2: constant.language
         3: constant.numeric
         4: string.unquoted
         5: support.constant
@@ -2663,7 +2772,7 @@ contexts:
         ^\s*(redistribute)\s+(ospf)\s+({{ospf_identifier}})\s*$
       captures:
         1: support.constant
-        2: support.constant
+        2: constant.language
         3: string.unquoted
 
   router_bgp_route_distinguisher:
@@ -2690,6 +2799,12 @@ contexts:
     - include: router_bgp_vrf_address_family_ipv6_unicast
     - include: router_bgp_vrf_address_family_ipv6_multicast
     - include: router_bgp_vrf_address_family_ipv6
+    - include: router_bgp_additional_paths
+    - include: default_originate
+    - include: router_bgp_send_community
+    - include: router_bgp_send_extended_community
+    - include: router_bgp_route_reflector_client
+    - include: router_bgp_remove_private_as
 
   router_bgp_address_family:
     - include: router_bgp_af_group
@@ -2703,6 +2818,12 @@ contexts:
     - include: router_bgp_address_family_vpnv6
     - include: router_bgp_address_family_l2vpn_vpls_vpws
     - include: router_bgp_address_family_link_state
+    - include: router_bgp_additional_paths
+    - include: default_originate
+    - include: router_bgp_send_community
+    - include: router_bgp_send_extended_community
+    - include: router_bgp_route_reflector_client
+    - include: router_bgp_remove_private_as
 
   router_bgp_neighbor_address_family_ipv4:
     - include: router_bgp_neighbor_address_family_ipv4_unicast
@@ -2731,67 +2852,166 @@ contexts:
     - include: router_bgp_af_group_ipv4_tunnel
     - include: router_bgp_af_group_vpnv4_unicast
     - include: router_bgp_af_group_ipv6_unicast
-
+    - include: router_bgp_additional_paths
+    - include: default_originate
+    - include: router_bgp_send_community
+    - include: router_bgp_send_extended_community
+    - include: router_bgp_route_reflector_client
+    - include: router_bgp_remove_private_as
 
   router_bgp_address_family_settings:
     - include: router_bgp_maximum_prefix
     - include: router_bgp_redistribute_connected
+    - include: router_bgp_redistribute_static
     - include: router_bgp_route_policy
     - include: router_bgp_soft_reconfiguration_inbound
+    - include: router_bgp_additional_paths
+    - include: default_originate
+    - include: router_bgp_send_community
+    - include: router_bgp_send_extended_community
+    - include: router_bgp_route_reflector_client
+    - include: router_bgp_remove_private_as
 
   router_bgp_address_family_ipv4_settings:
     - include: router_bgp_network_ipv4
+    - include: router_bgp_additional_paths
+    - include: default_originate
+    - include: router_bgp_send_community
+    - include: router_bgp_send_extended_community
+    - include: router_bgp_route_reflector_client
+    - include: router_bgp_remove_private_as
 
   router_bgp_address_family_ipv6_settings:
     - include: router_bgp_network_ipv6
+    - include: router_bgp_additional_paths
+    - include: default_originate
+    - include: router_bgp_send_community
+    - include: router_bgp_send_extended_community
+    - include: router_bgp_route_reflector_client
+    - include: router_bgp_remove_private_as
 
   router_bgp_vrf_address_family_settings:
     - include: router_bgp_maximum_prefix
     - include: router_bgp_redistribute_connected
+    - include: router_bgp_redistribute_static
     - include: router_bgp_route_policy
     - include: router_bgp_soft_reconfiguration_inbound
+    - include: router_bgp_additional_paths
+    - include: default_originate
+    - include: router_bgp_send_community
+    - include: router_bgp_send_extended_community
+    - include: router_bgp_route_reflector_client
+    - include: router_bgp_remove_private_as
 
   router_bgp_vrf_address_family_ipv4_settings:
     - include: router_bgp_network_ipv4
+    - include: router_bgp_additional_paths
+    - include: default_originate
+    - include: router_bgp_send_community
+    - include: router_bgp_send_extended_community
+    - include: router_bgp_route_reflector_client
+    - include: router_bgp_remove_private_as
 
   router_bgp_vrf_address_family_ipv6_settings:
     - include: router_bgp_network_ipv6
+    - include: router_bgp_additional_paths
+    - include: default_originate
+    - include: router_bgp_send_community
+    - include: router_bgp_send_extended_community
+    - include: router_bgp_route_reflector_client
+    - include: router_bgp_remove_private_as
 
   router_bgp_af_group_settings:
     - include: router_bgp_use_af_group
     - include: router_bgp_use_session_group
     - include: router_bgp_route_policy
     - include: router_bgp_soft_reconfiguration_inbound
+    - include: router_bgp_additional_paths
+    - include: default_originate
+    - include: router_bgp_send_community
+    - include: router_bgp_send_extended_community
+    - include: router_bgp_route_reflector_client
+    - include: router_bgp_remove_private_as
 
   router_bgp_af_group_ipv4_settings:
     - include: router_bgp_network_ipv4
+    - include: router_bgp_additional_paths
+    - include: default_originate
+    - include: router_bgp_send_community
+    - include: router_bgp_send_extended_community
+    - include: router_bgp_route_reflector_client
+    - include: router_bgp_remove_private_as
 
   router_bgp_af_group_ipv6_settings:
     - include: router_bgp_network_ipv6
+    - include: router_bgp_additional_paths
+    - include: default_originate
+    - include: router_bgp_send_community
+    - include: router_bgp_send_extended_community
+    - include: router_bgp_route_reflector_client
+    - include: router_bgp_remove_private_as
 
   router_bgp_neighbor_address_family_settings:
     - include: router_bgp_maximum_prefix
     - include: router_bgp_redistribute_connected
+    - include: router_bgp_redistribute_static
     - include: router_bgp_route_policy
     - include: router_bgp_soft_reconfiguration_inbound
+    - include: router_bgp_additional_paths
+    - include: default_originate
+    - include: router_bgp_send_community
+    - include: router_bgp_send_extended_community
+    - include: router_bgp_route_reflector_client
+    - include: router_bgp_remove_private_as
 
   router_bgp_neighbor_address_family_ipv4_settings:
     - include: router_bgp_network_ipv4
+    - include: router_bgp_additional_paths
+    - include: default_originate
+    - include: router_bgp_send_community
+    - include: router_bgp_send_extended_community
+    - include: router_bgp_route_reflector_client
+    - include: router_bgp_remove_private_as
 
   router_bgp_neighbor_address_family_ipv6_settings:
     - include: router_bgp_network_ipv6
+    - include: router_bgp_additional_paths
+    - include: default_originate
+    - include: router_bgp_send_community
+    - include: router_bgp_send_extended_community
+    - include: router_bgp_route_reflector_client
+    - include: router_bgp_remove_private_as
 
   router_bgp_neighbor_group_address_family_settings:
     - include: router_bgp_maximum_prefix
     - include: router_bgp_redistribute_connected
+    - include: router_bgp_redistribute_static
     - include: router_bgp_route_policy
     - include: router_bgp_soft_reconfiguration_inbound
+    - include: router_bgp_additional_paths
+    - include: default_originate
+    - include: router_bgp_send_community
+    - include: router_bgp_send_extended_community
+    - include: router_bgp_route_reflector_client
+    - include: router_bgp_remove_private_as
 
   router_bgp_neighbor_group_address_family_ipv4_settings:
     - include: router_bgp_network_ipv4
+    - include: router_bgp_additional_paths
+    - include: default_originate
+    - include: router_bgp_send_community
+    - include: router_bgp_send_extended_community
+    - include: router_bgp_route_reflector_client
+    - include: router_bgp_remove_private_as
 
   router_bgp_neighbor_group_address_family_ipv6_settings:
     - include: router_bgp_network_ipv6
+    - include: router_bgp_additional_paths
+    - include: default_originate
+    - include: router_bgp_send_community
+    - include: router_bgp_send_extended_community
+    - include: router_bgp_route_reflector_client
+    - include: router_bgp_remove_private_as
 
   router_bgp_af_group_ipv4_unicast:
     - match: |
@@ -2832,11 +3052,11 @@ contexts:
   router_bgp_route_policy:
     - match: |
         (?xi)
-        ^\s*(route-policy)\s+(\S+)\s+
+        ^\s*(route-policy)\s+(\S+)
         (?:
-          (\[)
-          (?:\s*(\S+)\s*(,)\s*){1,16}
-          (])
+          (\()
+          (?:\s*(\S+))(?:\s*(,)\s*(\S+)){1,15}
+          (\))
           \s+
         )?
         (
@@ -2847,10 +3067,11 @@ contexts:
         1: support.constant
         2: string.unquoted
         3: comment
-        4: string.unquoted
+        4: constant.language
         5: comment
-        6: comment
-        7: support.constant
+        6: constant.language
+        7: comment
+        8: support.constant
 
   router_bgp_soft_reconfiguration_inbound:
     - match: |
@@ -2865,6 +3086,34 @@ contexts:
         2: support.constant
         3: support.constant
 
+  router_bgp_additional_paths:
+    - match: |
+        (?xi)
+        ^\s*(additional-paths)\s+(selection)\s+
+        (?:
+          (?:(route-policy)\s+(\S+))|
+          (?:(disable))
+        )
+      captures:
+        1: support.constant
+        2: constant.language
+        3: support.constant
+        4: string.unquoted
+        5: keyword.other
+
+    - match: |
+        (?xi)
+        ^\s*(additional-paths)\s+
+        (
+          (?:receive)|
+          (?:send)|
+        )
+        \s+(disable)?\s*$
+      captures:
+        1: support.constant
+        2: constant.language
+        3: keyword.other
+
   router_bgp_network_ipv4:
     - match: |
         (?xi)
@@ -3546,6 +3795,7 @@ contexts:
         - include: router_bgp_neighbor_group_address_family
         - include: router_bgp_neighbor_group_setting
         - include: router_bgp_ebgp_multihop
+        - include: router_bgp_ignore_connected_check
         - match: '{{ctx_pop_router_bgp}}'
           pop: true
 
@@ -3562,6 +3812,7 @@ contexts:
         - include: router_bgp_neighbor_setting
         - include: router_bgp_neighbor_address_family_ipv4
         - include: router_bgp_ebgp_multihop
+        - include: router_bgp_ignore_connected_check
         - match: '{{ctx_pop_router_bgp}}'
           pop: true
 
@@ -3578,6 +3829,7 @@ contexts:
         - include: router_bgp_neighbor_setting
         - include: router_bgp_neighbor_address_family_ipv6
         - include: router_bgp_ebgp_multihop
+        - include: router_bgp_ignore_connected_check
         - match: '{{ctx_pop_router_bgp}}'
           pop: true
 
@@ -3647,6 +3899,7 @@ contexts:
     - include: router_bgp_remote_as
     - include: router_bgp_update_source
     - include: router_bgp_ebgp_multihop
+    - include: router_bgp_ignore_connected_check
     - include: router_bgp_password
     - include: description
 
@@ -7481,8 +7734,11 @@ contexts:
     - include: interface_bundle
     - include: description
     - include: interface_mtu
+    - include: interface_flow
+    - include: interface_load_interval
+    - include: interface_lldp
     - include: interface_access_group
-    - match: >
+    - match: |
         (?xi)
         ^\s*
         (?:
@@ -7784,6 +8040,61 @@ contexts:
         1: support.constant
         2: constant.numeric
 
+  interface_load_interval:
+    - match: |
+        (?xi)
+        ^\s*
+        (load-interval)
+        \s+
+        (
+          (?:300)|
+          (?:270)|
+          (?:240)|
+          (?:210)|
+          (?:180)|
+          (?:150)|
+          (?:120)|
+          (?:90)|
+          (?:60)|
+          (?:30)|
+          (?:0)
+        )
+      captures:
+        1: support.constant
+        2: constant.numeric
+
+  interface_flow:
+    - match: |
+        (?xi)
+        ^\s*
+        (flow)\s+
+        (
+          (?:ipv4)|
+          (?:ipv6)|
+          (?:mpls)
+        )
+        \s+
+        (monitor)
+        \s+
+        (\S+)
+        \s+
+        (sampler)
+        \s+
+        (\S+)
+        \s+
+        (
+          (?:egress)|
+          (?:ingress)
+        )
+      captures:
+        1: support.constant
+        2: constant.language
+        3: support.constant
+        4: string.unquoted
+        5: support.constant
+        6: string.unquoted
+        7: entity.other.attribute-name
+
   interface_bundle:
     - include: interface_bundle_id
     - include: interface_bundle_port_priority
@@ -7829,6 +8140,62 @@ contexts:
         1: support.constant
         2: constant.numeric.mtu
 
+  interface_lldp:
+    - match: |
+        (?xi)
+        ^\s*(lldp)
+      captures:
+        0: cisco.scope
+        1: variable.parameter
+      push:
+        - meta_content_scope: text.network.cisco.interface.lldp
+        - include: interface_lldp_receive_transmit_disable
+        - include: interface_lldp_destination_mac_address
+        - match: '{{ctx_pop_interface}}'
+          pop: true
+
+  interface_lldp_receive_transmit_disable:
+    - match: |
+        (?xi)
+        ^\s*
+        (
+          (?:receive)|
+          (?:transmit)
+        )
+        \s+(disable)
+      captures:
+        1: support.constant
+        2: keyword.other
+
+  interface_lldp_destination_mac_address:
+    - match: |
+        (?xi)
+        ^\s*(destination)\s+(mac-address)
+      captures:
+        0: cisco.scope
+        1: variable.parameter
+        2: support.constant
+      push:
+        - meta_content_scope: text.network.cisco.interface.lldp.destination.mac-address
+        - include: interface_lldp_destination_mac_address_iee_nearest_bridge
+        - include: interface_lldp_destination_mac_address_ieee_nearest_non_tmpr_bridge
+        - match: '{{ctx_pop_interface_lldp}}'
+          pop: true
+
+  interface_lldp_destination_mac_address_iee_nearest_bridge:
+    - match: |
+        (?xi)
+        ^\s*(ieee-nearest-bridge)
+      captures:
+        1: support.constant
+
+  interface_lldp_destination_mac_address_ieee_nearest_non_tmpr_bridge:
+    - match: |
+        (?xi)
+        ^\s*(ieee-nearest-non-tmpr-bridge)
+      captures:
+        1: support.constant
+
   interface_setting_te:
     - match: |
         (?xi)
diff --git a/cisco/ios_xr/ios-xr.interface.sublime-completions b/cisco/ios_xr/ios-xr.interface.sublime-completions
index a5cf753..511ee9b 100644
--- a/cisco/ios_xr/ios-xr.interface.sublime-completions
+++ b/cisco/ios_xr/ios-xr.interface.sublime-completions
@@ -149,6 +149,34 @@
             "trigger": "bundle\tport-priority",
             "contents": "bundle port-priority ${1:1}"
         },
+        { 
+            "trigger": "flow\tipv4 egress",
+            "contents": "flow ipv4 monitor ${1:NAME} sampler ${2:NAME} egress"
+        },
+        { 
+            "trigger": "flow\tipv4 ingress",
+            "contents": "flow ipv4 monitor ${1:NAME} sampler ${2:NAME} ingress"
+        },
+        { 
+            "trigger": "flow\tipv6 egress",
+            "contents": "flow ipv6 monitor ${1:NAME} sampler ${2:NAME} egress"
+        },
+        { 
+            "trigger": "flow\tipv6 ingress",
+            "contents": "flow ipv6 monitor ${1:NAME} sampler ${2:NAME} ingress"
+        },
+        { 
+            "trigger": "flow\tmpls ingress",
+            "contents": "flow mpls monitor ${1:NAME} sampler ${2:NAME} ingress"
+        },
+        { 
+            "trigger": "flow\tmpls egress",
+            "contents": "flow mpls monitor ${1:NAME} sampler ${2:NAME} egress"
+        },
+        { 
+            "trigger": "load-interval\t",
+            "contents": "load-interval ${1:30}"
+        },
         "cdp",
         "shutdown",
     ]
diff --git a/cisco/ios_xr/iox-xr.router.bgp.vrf.address-family.ipv4.sublime-completions b/cisco/ios_xr/iox-xr.router.bgp.vrf.address-family.ipv4.sublime-completions
index ac38c7e..11d44ff 100644
--- a/cisco/ios_xr/iox-xr.router.bgp.vrf.address-family.ipv4.sublime-completions
+++ b/cisco/ios_xr/iox-xr.router.bgp.vrf.address-family.ipv4.sublime-completions
@@ -5,5 +5,14 @@
             "trigger": "redistribute\tospf",
             "contents": "redistribute ospf ${1:INSTANCE_NAME}"
         },
+        { 
+            "trigger": "redistribute\tstatic route-policy",
+            "contents": "redistribute static route-policy ${1:NAME}"
+        },
+        { 
+            "trigger": "redistribute\tstatic metric",
+            "contents": "redistribute static metric ${1:1}"
+        },
+
   ]
 }
diff --git a/cisco/ios_xr/iox-xr.router.bgp.vrf.address-family.sublime-completions b/cisco/ios_xr/iox-xr.router.bgp.vrf.address-family.sublime-completions
index 7f9d396..fb9cb5d 100644
--- a/cisco/ios_xr/iox-xr.router.bgp.vrf.address-family.sublime-completions
+++ b/cisco/ios_xr/iox-xr.router.bgp.vrf.address-family.sublime-completions
@@ -21,5 +21,18 @@
             "trigger": "redistribute\teigrp external",
             "contents": "redistribute eigrp ${1:65535} match external"
         },
+        { 
+            "trigger": "redistribute\tstatic",
+            "contents": "redistribute static"
+        },
+        { 
+            "trigger": "redistribute\tstatic route-policy",
+            "contents": "redistribute static route-policy ${1:NAME}"
+        },
+        { 
+            "trigger": "redistribute\tstatic metric",
+            "contents": "redistribute static metric ${1:1}"
+        },
+        "ignore-connected-check"
   ]
 }
diff --git a/messages.json b/messages.json
index 9afdbb4..deca37a 100644
--- a/messages.json
+++ b/messages.json
@@ -46,5 +46,6 @@
     "2.40.0": "messages/2.40.0.md",
     "2.41.0": "messages/2.41.0.md",
     "2.42.0": "messages/2.42.0.md",
-    "2.43.0": "messages/2.43.0.md"
+    "2.43.0": "messages/2.43.0.md",
+    "2.44.0": "messages/2.44.0.md"
 }
\ No newline at end of file
diff --git a/messages/2.44.0.md b/messages/2.44.0.md
new file mode 100644
index 0000000..d6e07d5
--- /dev/null
+++ b/messages/2.44.0.md
@@ -0,0 +1,51 @@
+# [2.44.0] - 2020.06.08
+
+## Added
+
+### Cisco IOS XR
+
+* interface [#34](https://github.com/heyglen/network_tech/issues/34)
+
+    * flow ipv4 monitor NAME sampler NAME egress 
+
+    * load-interval
+
+    * lldp
+
+        * receive disable
+
+        * transmit disable
+
+        * destination mac-address
+
+            * ieee-nearest-bridge
+
+            * ieee-nearest-non-tmpr-bridge
+
+* router bgp [#34](https://github.com/heyglen/network_tech/issues/34)
+
+    * address family
+
+        * additional-paths receive
+
+        * additional-paths send
+
+        * additional-paths select
+
+        * ignore-connected-check
+        
+        * default-originate
+
+        * send-community-ebgp
+
+        * send-extended-community-ebgp
+
+## Fixed
+
+### Cisco IOS XR
+
+* router bgp [#34](https://github.com/heyglen/network_tech/issues/34)
+
+    * address family
+
+        * route-policy
\ No newline at end of file
diff --git a/tests/syntax_test_cisco_ios_xr.cisco-ios-xr b/tests/syntax_test_cisco_ios_xr.cisco-ios-xr
index 6a9f9ea..a0f8cc1 100644
--- a/tests/syntax_test_cisco_ios_xr.cisco-ios-xr
+++ b/tests/syntax_test_cisco_ios_xr.cisco-ios-xr
@@ -278,6 +278,32 @@ interface GigabitEthernet0/0/0/0
  bundle id 1 mode passive
  bundle id 1 mode on
  bundle port-priority 1
+ flow ipv4 monitor NAME sampler NAME egress
+ flow ipv4 monitor NAME sampler NAME ingress
+ flow ipv6 monitor NAME sampler NAME egress
+ flow ipv6 monitor NAME sampler NAME ingress
+ flow mpls monitor NAME sampler NAME egress
+ flow mpls monitor NAME sampler NAME ingress
+ load-interval 0
+ load-interval 30
+ load-interval 30
+ load-interval 60
+ load-interval 90
+ load-interval 120
+ load-interval 150
+ load-interval 180
+ load-interval 210
+ load-interval 240
+ load-interval 270
+ load-interval 300
+ lldp
+    receive disable
+    transmit disable
+    destination mac-address
+     ieee-nearest-bridge
+     ieee-nearest-non-tmpr-bridge
+
+  !
 !
 interface GigabitEthernet0/0/0/1
  cdp
@@ -1693,18 +1719,76 @@ router bgp 65000 instance INSTANCE_NAME
   update-source Loopback0
 
  af-group AF_GROUP_NAME address-family ipv4 unicast
+  additional-paths receive
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
+  additional-paths send
+  additional-paths send disable
+  additional-paths selection route-policy NAME
+  additional-paths selection disable
+
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
+  additional-paths send disable
+  additional-paths selection route-policy NAME
+
   use af-group AF_GROUP_NAME
   use session-group SESSION_GROUP_NAME
  af-group AF_GROUP_NAME address-family vpnv4 unicast
   use af-group AF_GROUP_NAME
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
  af-group AF_GROUP_NAME address-family ipv4 multicast
   use af-group AF_GROUP_NAME
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
  af-group AF_GROUP_NAME address-family ipv4 labeled-unicast
   use af-group AF_GROUP_NAME
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
  af-group AF_GROUP_NAME address-family ipv4 tunnel
   use af-group AF_GROUP_NAME
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
  af-group AF_GROUP_NAME address-family ipv6 unicast
   use af-group AF_GROUP_NAME
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
 
 
  address-family ipv4 unicast
@@ -1722,81 +1806,195 @@ router bgp 65000 instance INSTANCE_NAME
   
   maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535  
   soft-reconfiguration inbound always
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
+
 
  address-family ipv4 multicast
-   network 1.2.3.4/24 route-policy ROUTE_POLICY
-   maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
-   soft-reconfiguration inbound always
+  network 1.2.3.4/24 route-policy ROUTE_POLICY
+  maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
+  soft-reconfiguration inbound always
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
  
  address-family ipv4 labeled-unicast
-   network 1.2.3.4/24 route-policy ROUTE_POLICY
-   maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
-   soft-reconfiguration inbound always
+  network 1.2.3.4/24 route-policy ROUTE_POLICY
+  maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
+  soft-reconfiguration inbound always
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
  
  address-family ipv4 flowspec
-   network 1.2.3.4/24 route-policy ROUTE_POLICY
-   maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
-   soft-reconfiguration inbound always
+  network 1.2.3.4/24 route-policy ROUTE_POLICY
+  maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
+  soft-reconfiguration inbound always
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
  
  address-family ipv4 mvpn
-   network 1.2.3.4/24 route-policy ROUTE_POLICY
-   maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
-   soft-reconfiguration inbound always
+  network 1.2.3.4/24 route-policy ROUTE_POLICY
+  maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
+  soft-reconfiguration inbound always
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
  
  address-family ipv6 unicast
-   network 1::/24 route-policy ROUTE_POLICY
-   maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
-   soft-reconfiguration inbound always
+  network 1::/24 route-policy ROUTE_POLICY
+  maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
+  soft-reconfiguration inbound always
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
  
  address-family ipv6 flowspec
-   network 1::/24 route-policy ROUTE_POLICY
-   maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
-   soft-reconfiguration inbound always
+  network 1::/24 route-policy ROUTE_POLICY
+  maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
+  soft-reconfiguration inbound always
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
  
  address-family ipv6 mvpn
-   network 1::/24 route-policy ROUTE_POLICY
-   maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
-   soft-reconfiguration inbound always
+  network 1::/24 route-policy ROUTE_POLICY
+  maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
+  soft-reconfiguration inbound always
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
  
  address-family vpnv4 unicast
-   network 1.2.3.4/24 route-policy ROUTE_POLICY
-   maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
-   soft-reconfiguration inbound always
+  network 1.2.3.4/24 route-policy ROUTE_POLICY
+  maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
+  soft-reconfiguration inbound always
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
  
  address-family vpnv4 multicast
-   network 1.2.3.4/24 route-policy ROUTE_POLICY
+  network 1.2.3.4/24 route-policy ROUTE_POLICY
   maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
   soft-reconfiguration inbound always
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
  
  address-family vpnv4 flowspec
-   network 1.2.3.4/24 route-policy ROUTE_POLICY
-   maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
-   soft-reconfiguration inbound always
+  network 1.2.3.4/24 route-policy ROUTE_POLICY
+  maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
+  soft-reconfiguration inbound always
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
  
  address-family vpnv6 unicast
   network 1::/24 route-policy ROUTE_POLICY
   maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
   soft-reconfiguration inbound always
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
  
  address-family vpnv6 flowspec
   network 1::/24 route-policy ROUTE_POLICY
   maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
   soft-reconfiguration inbound always
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
  
  address-family l2vpn vpls-vpws
   maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
   soft-reconfiguration inbound always
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
  
  address-family l2vpn vpls-vpws
   maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
   soft-reconfiguration inbound always
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
  
  address-family link-state link-state
- maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
- soft-reconfiguration inbound always
+  maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
+  soft-reconfiguration inbound always
+  additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
 
  !
  neighbor 1.2.3.4
+  ignore-connected-check
   use af-group AF_GROUP_NAME
   use neighbor-group RR
   remote-as 65535
@@ -1812,6 +2010,7 @@ router bgp 65000 instance INSTANCE_NAME
  !
 
  neighbor 1::1
+  ignore-connected-check
   password encrypted 0123456789ABCDEF
   ebgp-multihop 255
   ebgp-multihop 255 mpls
@@ -1820,6 +2019,7 @@ router bgp 65000 instance INSTANCE_NAME
  !
 
  neighbor-group NEIGHBOR_GROUP
+  ignore-connected-check
   password encrypted 0123456789ABCDEF
   ebgp-multihop 255
   ebgp-multihop 255 mpls
@@ -1829,48 +2029,129 @@ router bgp 65000 instance INSTANCE_NAME
   address-family ipv4 unicast
    maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
    soft-reconfiguration inbound always
+   additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
+
 
   address-family ipv4 multicast
    maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
    soft-reconfiguration inbound always
+   additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
+
 
   address-family ipv6 unicast
    maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
    soft-reconfiguration inbound always
+   additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
+
 
   address-family ipv6 multicast
    maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
    soft-reconfiguration inbound always
+   additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
+
 
   address-family ipv6 flowspec
    maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
    soft-reconfiguration inbound always
+   additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
+
 
   address-family vpnv4 unicast
    maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
    soft-reconfiguration inbound always
+   additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
+
 
   address-family vpnv4 multicast
    maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
    soft-reconfiguration inbound always
+   additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
+
 
   address-family vpnv4 flowspec
    maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
    soft-reconfiguration inbound always
+   additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
+
 
   address-family vpnv6 unicast
    maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
    soft-reconfiguration inbound always
+   additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
+
 
   address-family vpnv6 flowspec
    maximum-prefix 4294967295 100 discard-extra-paths warning-only restart 65535
    soft-reconfiguration inbound always
+   additional-paths receive disable
+  default-originate
+  route-policy test(1234, 1234) out
+  send-community-ebgp
+  send-extended-community-ebgp
+  route-reflector-client
+  remove-private-AS
+
 
   !
  !
  vrf VRF_NAME
   rd 1:1
   neighbor 1.2.3.4
+    ignore-connected-check
     password encrypted 0123456789ABCDEF
     ebgp-multihop 255
     ebgp-multihop 255 mpls
@@ -1878,6 +2159,7 @@ router bgp 65000 instance INSTANCE_NAME
     remote-as 65535
     update-source Loopback0
   neighbor 1::1
+    ignore-connected-check
     ebgp-multihop 255
     ebgp-multihop 255 mpls
     use neighbor-group NEIGHBOR_GROUP
@@ -1886,6 +2168,7 @@ router bgp 65000 instance INSTANCE_NAME
   address-family ipv4 unicast
    redistribute connected
    redistribute ospf ospfCUST1
+   redistribute static route-policy NAME
   !
  !
  vrf VRF_NAME