diff --git a/data/templates/frr/babeld.frr.j2 b/data/templates/frr/babeld.frr.j2
new file mode 100644
index 000000000..344a5f988
--- /dev/null
+++ b/data/templates/frr/babeld.frr.j2
@@ -0,0 +1,85 @@
+{% from 'frr/distribute_list_macro.j2' import render_distribute_list %}
+{% from 'frr/ipv6_distribute_list_macro.j2' import render_ipv6_distribute_list %}
+!
+{# Interface specific configuration #}
+{% if interface is vyos_defined %}
+{%     for iface, iface_config in interface.items() %}
+interface {{ iface }}
+{%         if iface_config.type is vyos_defined('wired') or iface_config.type is vyos_defined('wireless') %}
+ babel {{ iface_config.type }}
+{%         endif %}
+{%         if iface_config.split_horizon is vyos_defined("enable") %}
+ babel split-horizon
+{%         elif iface_config.split_horizon is vyos_defined("disable") %}
+ no babel split-horizon
+{%         endif %}
+{%         if iface_config.hello_interval is vyos_defined %}
+ babel hello-interval {{ iface_config.hello_interval }}
+{%         endif %}
+{%         if iface_config.update_interval is vyos_defined %}
+ babel update-interval {{ iface_config.update_interval }}
+{%         endif %}
+{%         if iface_config.rxcost is vyos_defined %}
+ babel rxcost {{ iface_config.rxcost }}
+{%         endif %}
+{%         if iface_config.rtt_decay is vyos_defined %}
+ babel rtt-decay {{ iface_config.rtt_decay }}
+{%         endif %}
+{%         if iface_config.rtt_min is vyos_defined %}
+ babel rtt-min {{ iface_config.rtt_min }}
+{%         endif %}
+{%         if iface_config.rtt_max is vyos_defined %}
+ babel rtt-max {{ iface_config.rtt_max }}
+{%         endif %}
+{%         if iface_config.max_rtt_penalty is vyos_defined %}
+ babel max-rtt-penalty {{ iface_config.max_rtt_penalty }}
+{%         endif %}
+{%         if iface_config.enable_timestamps is vyos_defined %}
+ babel enable-timestamps
+{%         endif %}
+{%         if iface_config.channel is vyos_defined %}
+ babel channel {{ iface_config.channel | replace("non-interfering", "noninterfering") }}
+{%         endif %}
+exit
+!
+{%     endfor %}
+{% endif %}
+!
+{# Babel configuration #}
+router babel
+{% if parameters.diversity is vyos_defined %}
+ babel diversity
+{% endif %}
+{% if parameters.diversity_factor is vyos_defined %}
+ babel diversity-factor {{ parameters.diversity_factor }}
+{% endif %}
+{% if parameters.resend_delay is vyos_defined %}
+ babel resend-delay {{ parameters.resend_delay }}
+{% endif %}
+{% if parameters.smoothing_half_life is vyos_defined %}
+ babel smoothing-half-life {{ parameters.smoothing_half_life }}
+{% endif %}
+{% if interface is vyos_defined %}
+{%     for iface, iface_config in interface.items() %}
+ network {{ iface }}
+{%     endfor %}
+{% endif %}
+{% if redistribute is vyos_defined %}
+{%     for address_family in redistribute %}
+{%         for protocol, protocol_config in redistribute[address_family].items() %}
+{%             if protocol is vyos_defined('ospfv3') %}
+{%                 set protocol = 'ospf6' %}
+{%             endif %}
+ redistribute {{ address_family }} {{ protocol }}
+{%         endfor %}
+{%     endfor %}
+{% endif %}
+{% if distribute_list.ipv4 is vyos_defined %}
+{{ render_distribute_list(distribute_list.ipv4) }}
+{% endif %}
+{% if distribute_list.ipv6 is vyos_defined %}
+{{ render_ipv6_distribute_list(distribute_list.ipv6) }}
+{% endif %}
+exit
+!
+end
diff --git a/data/templates/frr/daemons.frr.tmpl b/data/templates/frr/daemons.frr.tmpl
index df98e74d6..fdff9772a 100644
--- a/data/templates/frr/daemons.frr.tmpl
+++ b/data/templates/frr/daemons.frr.tmpl
@@ -1,54 +1,53 @@
 zebra=yes
 bgpd=yes
 ospfd=yes
 ospf6d=yes
 ripd=yes
 ripngd=yes
 isisd=yes
 pimd=no
 ldpd=yes
 nhrpd=no
 eigrpd=yes
-babeld=no
+babeld=yes
 sharpd=no
 pbrd=no
 bfdd=yes
 staticd=yes
 
 vtysh_enable=yes
 zebra_options="  -s 90000000 --daemon -A 127.0.0.1
 {%- if irdp is defined %} -M irdp{% endif -%}
 {%- if snmp is defined and snmp.zebra is defined %} -M snmp{% endif -%}
 "
 bgpd_options="   --daemon -A 127.0.0.1
 {%- if bmp is defined %} -M bmp{% endif -%}
 {%- if snmp is defined and snmp.bgpd is defined %} -M snmp{% endif -%}
 "
 ospfd_options="  --daemon -A 127.0.0.1
 {%- if snmp is defined and snmp.ospfd is defined %} -M snmp{% endif -%}
 "
 ospf6d_options=" --daemon -A ::1
 {%- if snmp is defined and snmp.ospf6d is defined %} -M snmp{% endif -%}
 "
 ripd_options="   --daemon -A 127.0.0.1
 {%- if snmp is defined and snmp.ripd is defined %} -M snmp{% endif -%}
 "
 ripngd_options=" --daemon -A ::1"
 isisd_options="  --daemon -A 127.0.0.1
 {%- if snmp is defined and snmp.isisd is defined %} -M snmp{% endif -%}
 "
 pimd_options="  --daemon -A 127.0.0.1"
 ldpd_options="  --daemon -A 127.0.0.1
 {%- if snmp is defined and snmp.ldpd is defined %} -M snmp{% endif -%}
 "
 nhrpd_options="  --daemon -A 127.0.0.1"
 eigrpd_options="  --daemon -A 127.0.0.1"
 babeld_options="  --daemon -A 127.0.0.1"
 sharpd_options="  --daemon -A 127.0.0.1"
 pbrd_options="  --daemon -A 127.0.0.1"
 staticd_options="  --daemon -A 127.0.0.1"
 bfdd_options="  --daemon -A 127.0.0.1"
 
 watchfrr_enable=no
 valgrind_enable=no
-
diff --git a/data/templates/frr/distribute_list_macro.j2 b/data/templates/frr/distribute_list_macro.j2
new file mode 100644
index 000000000..c10bf732d
--- /dev/null
+++ b/data/templates/frr/distribute_list_macro.j2
@@ -0,0 +1,30 @@
+{% macro render_distribute_list(distribute_list) %}
+{% if distribute_list.access_list.in is vyos_defined %}
+ distribute-list {{ distribute_list.access_list.in }} in
+{% endif %}
+{% if distribute_list.access_list.out is vyos_defined %}
+ distribute-list {{ distribute_list.access_list.out }} out
+{% endif %}
+{% if distribute_list.interface is vyos_defined %}
+{%     for interface, interface_config in distribute_list.interface.items() %}
+{%         if interface_config.access_list.in is vyos_defined %}
+ distribute-list {{ interface_config.access_list.in }} in {{ interface }}
+{%         endif %}
+{%         if interface_config.access_list.out is vyos_defined %}
+ distribute-list {{ interface_config.access_list.out }} out {{ interface }}
+{%         endif %}
+{%         if interface_config.prefix_list.in is vyos_defined %}
+ distribute-list prefix {{ interface_config.prefix_list.in }} in {{ interface }}
+{%         endif %}
+{%         if interface_config.prefix_list.out is vyos_defined %}
+ distribute-list prefix {{ interface_config.prefix_list.out }} out {{ interface }}
+{%         endif %}
+{%     endfor %}
+{% endif %}
+{% if distribute_list.prefix_list.in is vyos_defined %}
+ distribute-list prefix {{ distribute_list.prefix_list.in }} in
+{% endif %}
+{% if distribute_list.prefix_list.out is vyos_defined %}
+ distribute-list prefix {{ distribute_list.prefix_list.out }} out
+{% endif %}
+{% endmacro %}
diff --git a/data/templates/frr/ipv6_distribute_list_macro.j2 b/data/templates/frr/ipv6_distribute_list_macro.j2
new file mode 100644
index 000000000..c365fbdae
--- /dev/null
+++ b/data/templates/frr/ipv6_distribute_list_macro.j2
@@ -0,0 +1,30 @@
+{% macro render_ipv6_distribute_list(distribute_list) %}
+{% if distribute_list.access_list.in is vyos_defined %}
+ ipv6 distribute-list {{ distribute_list.access_list.in }} in
+{% endif %}
+{% if distribute_list.access_list.out is vyos_defined %}
+ ipv6 distribute-list {{ distribute_list.access_list.out }} out
+{% endif %}
+{% if distribute_list.interface is vyos_defined %}
+{%     for interface, interface_config in distribute_list.interface.items() %}
+{%         if interface_config.access_list.in is vyos_defined %}
+ ipv6 distribute-list {{ interface_config.access_list.in }} in {{ interface }}
+{%         endif %}
+{%         if interface_config.access_list.out is vyos_defined %}
+ ipv6 distribute-list {{ interface_config.access_list.out }} out {{ interface }}
+{%         endif %}
+{%         if interface_config.prefix_list.in is vyos_defined %}
+ ipv6 distribute-list prefix {{ interface_config.prefix_list.in }} in {{ interface }}
+{%         endif %}
+{%         if interface_config.prefix_list.out is vyos_defined %}
+ ipv6 distribute-list prefix {{ interface_config.prefix_list.out }} out {{ interface }}
+{%         endif %}
+{%     endfor %}
+{% endif %}
+{% if distribute_list.prefix_list.in is vyos_defined %}
+ ipv6 distribute-list prefix {{ distribute_list.prefix_list.in }} in
+{% endif %}
+{% if distribute_list.prefix_list.out is vyos_defined %}
+ ipv6 distribute-list prefix {{ distribute_list.prefix_list.out }} out
+{% endif %}
+{% endmacro %}
diff --git a/data/templates/frr/ripd.frr.j2 b/data/templates/frr/ripd.frr.j2
index e9e484cc2..1445bf97f 100644
--- a/data/templates/frr/ripd.frr.j2
+++ b/data/templates/frr/ripd.frr.j2
@@ -1,101 +1,75 @@
+{% from 'frr/distribute_list_macro.j2' import render_distribute_list %}
 {# RIP key-chain definition #}
 {% if interface is vyos_defined %}
 {%     for iface, iface_config in interface.items() %}
 {%         if iface_config.authentication.md5 is vyos_defined %}
 key chain {{ iface }}-rip
 {%             for key_id, key_options in iface_config.authentication.md5.items() %}
  key {{ key_id }}
 {%                 if key_options.password is vyos_defined %}
   key-string {{ key_options.password }}
 {%                 endif %}
  exit
 {%             endfor %}
 exit
 {%         endif %}
 {%     endfor %}
 {% endif %}
 !
 {# Interface specific configuration #}
 {% if interface is vyos_defined %}
 {%     for iface, iface_config in interface.items() %}
 interface {{ iface }}
 {%         if iface_config.authentication.plaintext_password is vyos_defined %}
  ip rip authentication mode text
  ip rip authentication string {{ iface_config.authentication.plaintext_password }}
 {%         elif iface_config.authentication.md5 is vyos_defined %}
  ip rip authentication key-chain {{ iface }}-rip
  ip rip authentication mode md5
 {%         endif %}
 {%         if iface_config.split_horizon.disable is vyos_defined %}
  no ip rip split-horizon
 {%         endif %}
 {%         if iface_config.split_horizon.poison_reverse is vyos_defined %}
  ip rip split-horizon poisoned-reverse
 {%         endif %}
 {%         if iface_config.receive.version is vyos_defined %}
  ip rip receive version {{ iface_config.receive.version }}
 {%         endif %}
 {%         if iface_config.send.version is vyos_defined %}
  ip rip send version {{ iface_config.send.version }}
 {%         endif %}
 exit
 !
 {%     endfor %}
 {% endif %}
 !
 router rip
 {% if default_distance is vyos_defined %}
  distance {{ default_distance }}
 {% endif %}
 {% if network_distance is vyos_defined %}
 {%     for network, network_config in network_distance.items() %}
 {%         if network_config.distance is vyos_defined %}
  distance {{ network_config.distance }} {{ network }}
 {%         endif %}
 {%     endfor %}
 {% endif %}
 {% if neighbor is vyos_defined %}
 {%     for address in neighbor %}
  neighbor {{ address }}
 {%     endfor %}
 {% endif %}
 {% if distribute_list is vyos_defined %}
-{%     if distribute_list.access_list.in is vyos_defined %}
- distribute-list {{ distribute_list.access_list.in }} in
-{%     endif %}
-{%     if distribute_list.access_list.out is vyos_defined %}
- distribute-list {{ distribute_list.access_list.out }} out
-{%     endif %}
-{%     if distribute_list.interface is vyos_defined %}
-{%         for interface, interface_config in distribute_list.interface.items() %}
-{%             if interface_config.access_list.in is vyos_defined %}
- distribute-list {{ interface_config.access_list.in }} in {{ interface }}
-{%             endif %}
-{%             if interface_config.access_list.out is vyos_defined %}
- distribute-list {{ interface_config.access_list.out }} out {{ interface }}
-{%             endif %}
-{%             if interface_config.prefix_list.in is vyos_defined %}
- distribute-list prefix {{ interface_config.prefix_list.in }} in {{ interface }}
-{%             endif %}
-{%             if interface_config.prefix_list.out is vyos_defined %}
- distribute-list prefix {{ interface_config.prefix_list.out }} out {{ interface }}
-{%             endif %}
-{%         endfor %}
-{%     endif %}
-{%     if distribute_list.prefix_list.in is vyos_defined %}
- distribute-list prefix {{ distribute_list.prefix_list.in }} in
-{%     endif %}
-{%     if distribute_list.prefix_list.out is vyos_defined %}
- distribute-list prefix {{ distribute_list.prefix_list.out }} out
-{%     endif %}
+{{ render_distribute_list(distribute_list) }}
 {% endif %}
 {% include 'frr/rip_ripng.frr.j2' %}
 {% if version is vyos_defined %}
  version {{ version }}
 {% endif %}
 exit
 !
 {% if route_map is vyos_defined %}
 ip protocol rip route-map {{ route_map }}
 {% endif %}
 !
diff --git a/data/templates/frr/ripngd.frr.j2 b/data/templates/frr/ripngd.frr.j2
index 7919b1bad..e857e9481 100644
--- a/data/templates/frr/ripngd.frr.j2
+++ b/data/templates/frr/ripngd.frr.j2
@@ -1,57 +1,31 @@
+{% from 'frr/ipv6_distribute_list_macro.j2' import render_ipv6_distribute_list %}
 {# Interface specific configuration #}
 {% if interface is vyos_defined %}
 {%     for iface, iface_config in interface.items() %}
 interface {{ iface }}
 {%         if iface_config.split_horizon.disable is vyos_defined %}
  no ipv6 rip split-horizon
 {%         endif %}
 {%         if iface_config.split_horizon.poison_reverse is vyos_defined %}
  ipv6 rip split-horizon poisoned-reverse
 {%         endif %}
 exit
 {%     endfor %}
 {% endif %}
 !
 router ripng
 {% if aggregate_address is vyos_defined %}
 {%     for prefix in aggregate_address %}
  aggregate-address {{ prefix }}
 {%     endfor %}
 {% endif %}
 {% if distribute_list is vyos_defined %}
-{%     if distribute_list.access_list.in is vyos_defined %}
- ipv6 distribute-list {{ distribute_list.access_list.in }} in
-{%     endif %}
-{%     if distribute_list.access_list.out is vyos_defined %}
- ipv6 distribute-list {{ distribute_list.access_list.out }} out
-{%     endif %}
-{%     if distribute_list.interface is vyos_defined %}
-{%         for interface, interface_config in distribute_list.interface.items() %}
-{%             if interface_config.access_list.in is vyos_defined %}
- ipv6 distribute-list {{ interface_config.access_list.in }} in {{ interface }}
-{%             endif %}
-{%             if interface_config.access_list.out is vyos_defined %}
- ipv6 distribute-list {{ interface_config.access_list.out }} out {{ interface }}
-{%             endif %}
-{%             if interface_config.prefix_list.in is vyos_defined %}
- ipv6 distribute-list prefix {{ interface_config.prefix_list.in }} in {{ interface }}
-{%             endif %}
-{%             if interface_config.prefix_list.out is vyos_defined %}
- ipv6 distribute-list prefix {{ interface_config.prefix_list.out }} out {{ interface }}
-{%             endif %}
-{%         endfor %}
-{%     endif %}
-{%     if distribute_list.prefix_list.in is vyos_defined %}
- ipv6 distribute-list prefix {{ distribute_list.prefix_list.in }} in
-{%     endif %}
-{%     if distribute_list.prefix_list.out is vyos_defined %}
- ipv6 distribute-list prefix {{ distribute_list.prefix_list.out }} out
-{%     endif %}
+{{ render_ipv6_distribute_list(distribute_list) }}
 {% endif %}
 {% include 'frr/rip_ripng.frr.j2' %}
 exit
 !
 {% if route_map is vyos_defined %}
 ipv6 protocol ripng route-map {{ route_map }}
 {% endif %}
 !
diff --git a/interface-definitions/include/babel/interface.xml.i b/interface-definitions/include/babel/interface.xml.i
new file mode 100644
index 000000000..549e4909d
--- /dev/null
+++ b/interface-definitions/include/babel/interface.xml.i
@@ -0,0 +1,187 @@
+<!-- include start from babel/interface.xml.i -->
+<tagNode name="interface">
+  <properties>
+    <help>Interface name</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_interfaces.py</script>
+    </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Interface name</description>
+    </valueHelp>
+    <constraint>
+      #include <include/constraint/interface-name.xml.in>
+    </constraint>
+  </properties>
+  <children>
+    <leafNode name="type">
+      <properties>
+        <help>Interface type</help>
+        <completionHelp>
+          <list>auto wired wireless</list>
+        </completionHelp>
+        <valueHelp>
+          <format>auto</format>
+          <description>Automatically detect interface type</description>
+        </valueHelp>
+        <valueHelp>
+          <format>wired</format>
+          <description>Wired interface</description>
+        </valueHelp>
+        <valueHelp>
+          <format>wireless</format>
+          <description>Wireless interface</description>
+        </valueHelp>
+        <constraint>
+          <regex>(auto|wired|wireless)</regex>
+        </constraint>
+      </properties>
+      <defaultValue>auto</defaultValue>
+    </leafNode>
+    <leafNode name="split-horizon">
+      <properties>
+        <help>Split horizon parameters</help>
+        <completionHelp>
+          <list>default enable disable</list>
+        </completionHelp>
+        <valueHelp>
+          <format>default</format>
+          <description>Enable on wired interfaces, and disable on wireless interfaces</description>
+        </valueHelp>
+        <valueHelp>
+          <format>enable</format>
+          <description>Enable split horizon processing</description>
+        </valueHelp>
+        <valueHelp>
+          <format>disable</format>
+          <description>Disable split horizon processing</description>
+        </valueHelp>
+        <constraint>
+          <regex>(default|enable|disable)</regex>
+        </constraint>
+      </properties>
+      <defaultValue>default</defaultValue>
+    </leafNode>
+    <leafNode name="hello-interval">
+      <properties>
+        <help>Time between scheduled hellos</help>
+        <valueHelp>
+          <format>u32:20-655340</format>
+          <description>Milliseconds</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 20-655340"/>
+        </constraint>
+      </properties>
+      <defaultValue>4000</defaultValue>
+    </leafNode>
+    <leafNode name="update-interval">
+      <properties>
+        <help>Time between scheduled updates</help>
+        <valueHelp>
+          <format>u32:20-655340</format>
+          <description>Milliseconds</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 20-655340"/>
+        </constraint>
+      </properties>
+      <defaultValue>20000</defaultValue>
+    </leafNode>
+    <leafNode name="rxcost">
+      <properties>
+        <help>Base receive cost for this interface</help>
+        <valueHelp>
+          <format>u32:1-65534</format>
+          <description>Base receive cost</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-65534"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="rtt-decay">
+      <properties>
+        <help>Decay factor for exponential moving average of RTT samples</help>
+        <valueHelp>
+          <format>u32:1-256</format>
+          <description>Decay factor, in units of 1/256</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-256"/>
+        </constraint>
+      </properties>
+      <defaultValue>42</defaultValue>
+    </leafNode>
+    <leafNode name="rtt-min">
+      <properties>
+        <help>Minimum RTT</help>
+        <valueHelp>
+          <format>u32:1-65535</format>
+          <description>Milliseconds</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-65535"/>
+        </constraint>
+      </properties>
+      <defaultValue>10</defaultValue>
+    </leafNode>
+    <leafNode name="rtt-max">
+      <properties>
+        <help>Maximum RTT</help>
+        <valueHelp>
+          <format>u32:1-65535</format>
+          <description>Milliseconds</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-65535"/>
+        </constraint>
+      </properties>
+      <defaultValue>120</defaultValue>
+    </leafNode>
+    <leafNode name="max-rtt-penalty">
+      <properties>
+        <help>Maximum additional cost due to RTT</help>
+        <valueHelp>
+          <format>u32:0-65535</format>
+          <description>Milliseconds (0 to disable the use of RTT-based cost)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-65535"/>
+        </constraint>
+      </properties>
+      <defaultValue>150</defaultValue>
+    </leafNode>
+    <leafNode name="enable-timestamps">
+      <properties>
+        <help>Enable timestamps with each Hello and IHU message in order to compute RTT values</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="channel">
+      <properties>
+        <help>Channel number for diversity routing</help>
+        <completionHelp>
+          <list>interfering non-interfering</list>
+        </completionHelp>
+        <valueHelp>
+          <format>u32:1-254</format>
+          <description>Interfaces with a channel number interfere with interfering interfaces and interfaces with the same channel number</description>
+        </valueHelp>
+        <valueHelp>
+          <format>interfering</format>
+          <description>Interfering interfaces are assumed to interfere with all other channels except non-interfering channels</description>
+        </valueHelp>
+        <valueHelp>
+          <format>non-interfering</format>
+          <description>Non-interfering interfaces only interfere with themselves</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-254"/>
+          <regex>(interfering|non-interfering)</regex>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</tagNode>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index ec065347c..0d88c7b25 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -1,1527 +1,1543 @@
 <!-- include start from bgp/protocol-common-config.xml.i -->
 <node name="address-family">
   <properties>
     <help>BGP address-family parameters</help>
   </properties>
   <children>
     <node name="ipv4-unicast">
       <properties>
         <help>IPv4 BGP settings</help>
       </properties>
       <children>
         <tagNode name="aggregate-address">
           <properties>
             <help>BGP aggregate network</help>
             <valueHelp>
               <format>ipv4net</format>
               <description>BGP aggregate network</description>
             </valueHelp>
             <constraint>
               <validator name="ipv4-prefix"/>
             </constraint>
           </properties>
           <children>
             #include <include/bgp/afi-aggregate-address.xml.i>
           </children>
         </tagNode>
         <node name="distance">
           <properties>
             <help>Administrative distances for BGP routes</help>
           </properties>
           <children>
             <leafNode name="external">
               <properties>
                 <help>eBGP routes administrative distance</help>
                 <valueHelp>
                   <format>u32:1-255</format>
                   <description>eBGP routes administrative distance</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 1-255"/>
                 </constraint>
               </properties>
             </leafNode>
             <leafNode name="internal">
               <properties>
                 <help>iBGP routes administrative distance</help>
                 <valueHelp>
                   <format>u32:1-255</format>
                   <description>iBGP routes administrative distance</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 1-255"/>
                 </constraint>
               </properties>
             </leafNode>
             <leafNode name="local">
               <properties>
                 <help>Locally originated BGP routes administrative distance</help>
                 <valueHelp>
                   <format>u32:1-255</format>
                   <description>Locally originated BGP routes administrative distance</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 1-255"/>
                 </constraint>
               </properties>
             </leafNode>
             <tagNode name="prefix">
               <properties>
                 <help>Administrative distance for a specific BGP prefix</help>
                 <valueHelp>
                   <format>ipv4net</format>
                   <description>Administrative distance for a specific BGP prefix</description>
                 </valueHelp>
                 <constraint>
                   <validator name="ipv4-prefix"/>
                 </constraint>
               </properties>
               <children>
                 <leafNode name="distance">
                   <properties>
                     <help>Administrative distance for prefix</help>
                     <valueHelp>
                       <format>u32:1-255</format>
                       <description>Administrative distance for external BGP routes</description>
                     </valueHelp>
                     <constraint>
                       <validator name="numeric" argument="--range 1-255"/>
                     </constraint>
                   </properties>
                 </leafNode>
               </children>
             </tagNode>
           </children>
         </node>
         #include <include/bgp/afi-export-import.xml.i>
         #include <include/bgp/afi-label.xml.i>
         #include <include/bgp/afi-maximum-paths.xml.i>
         <tagNode name="network">
           <properties>
             <help>BGP network</help>
             <valueHelp>
               <format>ipv4net</format>
               <description>BGP network</description>
             </valueHelp>
             <constraint>
               <validator name="ipv4-prefix"/>
             </constraint>
           </properties>
           <children>
             <leafNode name="backdoor">
               <properties>
                 <help>Network as a backdoor route</help>
                 <valueless/>
               </properties>
             </leafNode>
             #include <include/route-map.xml.i>
           </children>
         </tagNode>
         #include <include/bgp/afi-rd.xml.i>
         #include <include/bgp/afi-route-map-vpn.xml.i>
         #include <include/bgp/afi-route-target-vpn.xml.i>
         <node name="redistribute">
           <properties>
             <help>Redistribute routes from other protocols into BGP</help>
           </properties>
           <children>
             <node name="connected">
               <properties>
                 <help>Redistribute connected routes into BGP</help>
               </properties>
               <children>
                 #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
             <node name="isis">
               <properties>
                 <help>Redistribute IS-IS routes into BGP</help>
               </properties>
               <children>
                 #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
             <node name="kernel">
               <properties>
                 <help>Redistribute kernel routes into BGP</help>
               </properties>
               <children>
                 #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
             <node name="ospf">
               <properties>
                 <help>Redistribute OSPF routes into BGP</help>
               </properties>
               <children>
                 #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
             <node name="rip">
               <properties>
                 <help>Redistribute RIP routes into BGP</help>
               </properties>
               <children>
                 #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
+            <node name="babel">
+              <properties>
+                <help>Redistribute Babel routes into BGP</help>
+              </properties>
+              <children>
+                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
+              </children>
+            </node>
             <node name="static">
               <properties>
                 <help>Redistribute static routes into BGP</help>
               </properties>
               <children>
                 #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
             <leafNode name="table">
               <properties>
                 <help>Redistribute non-main Kernel Routing Table</help>
               </properties>
             </leafNode>
           </children>
         </node>
       </children>
     </node>
     <node name="ipv4-multicast">
       <properties>
         <help>Multicast IPv4 BGP settings</help>
       </properties>
       <children>
         <tagNode name="aggregate-address">
           <properties>
             <help>BGP aggregate network/prefix</help>
             <valueHelp>
               <format>ipv4net</format>
               <description>BGP aggregate network/prefix</description>
             </valueHelp>
             <constraint>
               <validator name="ipv4-prefix"/>
             </constraint>
           </properties>
           <children>
             #include <include/bgp/afi-aggregate-address.xml.i>
           </children>
         </tagNode>
         <node name="distance">
           <properties>
             <help>Administrative distances for BGP routes</help>
           </properties>
           <children>
             <leafNode name="external">
               <properties>
                 <help>eBGP routes administrative distance</help>
                 <valueHelp>
                   <format>u32:1-255</format>
                   <description>eBGP routes administrative distance</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 1-255"/>
                 </constraint>
               </properties>
             </leafNode>
             <leafNode name="internal">
               <properties>
                 <help>iBGP routes administrative distance</help>
                 <valueHelp>
                   <format>u32:1-255</format>
                   <description>iBGP routes administrative distance</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 1-255"/>
                 </constraint>
               </properties>
             </leafNode>
             <leafNode name="local">
               <properties>
                 <help>Locally originated BGP routes administrative distance</help>
                 <valueHelp>
                   <format>u32:1-255</format>
                   <description>Locally originated BGP routes administrative distance</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 1-255"/>
                 </constraint>
               </properties>
             </leafNode>
             <tagNode name="prefix">
               <properties>
                 <help>Administrative distance for a specific BGP prefix</help>
                 <valueHelp>
                   <format>ipv4net</format>
                   <description>Administrative distance for a specific BGP prefix</description>
                 </valueHelp>
                 <constraint>
                   <validator name="ipv4-prefix"/>
                 </constraint>
               </properties>
               <children>
                 <leafNode name="distance">
                   <properties>
                     <help>Administrative distance for prefix</help>
                     <valueHelp>
                       <format>u32:1-255</format>
                       <description>Administrative distance for external BGP routes</description>
                     </valueHelp>
                     <constraint>
                       <validator name="numeric" argument="--range 1-255"/>
                     </constraint>
                   </properties>
                 </leafNode>
               </children>
             </tagNode>
           </children>
         </node>
         <tagNode name="network">
           <properties>
             <help>Import BGP network/prefix into multicast IPv4 RIB</help>
             <valueHelp>
               <format>ipv4net</format>
               <description>Multicast IPv4 BGP network/prefix</description>
             </valueHelp>
             <constraint>
               <validator name="ipv4-prefix"/>
             </constraint>
           </properties>
           <children>
             <leafNode name="backdoor">
               <properties>
                 <help>Use BGP network/prefix as a backdoor route</help>
                 <valueless/>
               </properties>
             </leafNode>
             #include <include/route-map.xml.i>
           </children>
         </tagNode>
       </children>
     </node>
     <node name="ipv4-labeled-unicast">
       <properties>
         <help>Labeled Unicast IPv4 BGP settings</help>
       </properties>
       <children>
         <tagNode name="aggregate-address">
           <properties>
             <help>BGP aggregate network/prefix</help>
             <valueHelp>
               <format>ipv4net</format>
               <description>BGP aggregate network/prefix</description>
             </valueHelp>
             <constraint>
               <validator name="ipv4-prefix"/>
             </constraint>
           </properties>
           <children>
             #include <include/bgp/afi-aggregate-address.xml.i>
           </children>
         </tagNode>
         <tagNode name="network">
           <properties>
             <help>Import BGP network/prefix into labeled unicast IPv4 RIB</help>
             <valueHelp>
               <format>ipv4net</format>
               <description>Labeled Unicast IPv4 BGP network/prefix</description>
             </valueHelp>
             <constraint>
               <validator name="ipv4-prefix"/>
             </constraint>
           </properties>
           <children>
             <leafNode name="backdoor">
               <properties>
                 <help>Use BGP network/prefix as a backdoor route</help>
                 <valueless/>
               </properties>
             </leafNode>
             #include <include/route-map.xml.i>
           </children>
         </tagNode>
       </children>
     </node>
     <node name="ipv4-flowspec">
       <properties>
         <help>Flowspec IPv4 BGP settings</help>
       </properties>
       <children>
         <node name="local-install">
           <properties>
             <help>Apply local policy routing to interface</help>
           </properties>
           <children>
             <leafNode name="interface">
               <properties>
                 <help>Interface</help>
                 <completionHelp>
                   <script>${vyos_completion_dir}/list_interfaces.py</script>
                 </completionHelp>
                 <multi/>
               </properties>
             </leafNode>
           </children>
         </node>
       </children>
     </node>
     <node name="ipv4-vpn">
       <properties>
         <help>Unicast VPN IPv4 BGP settings</help>
       </properties>
       <children>
         <tagNode name="network">
           <properties>
             <help>Import BGP network/prefix into unicast VPN IPv4 RIB</help>
             <valueHelp>
               <format>ipv4net</format>
               <description>Unicast VPN IPv4 BGP network/prefix</description>
             </valueHelp>
             <constraint>
               <validator name="ipv4-prefix"/>
             </constraint>
           </properties>
           <children>
             #include <include/bgp/route-distinguisher.xml.i>
             <leafNode name="label">
               <properties>
                 <help>MPLS label value assigned to route</help>
                 <valueHelp>
                   <format>u32:0-1048575</format>
                   <description>MPLS label value</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 0-1048575"/>
                 </constraint>
               </properties>
             </leafNode>
           </children>
         </tagNode>
       </children>
     </node>
     <node name="ipv6-unicast">
       <properties>
         <help>IPv6 BGP settings</help>
       </properties>
       <children>
         <tagNode name="aggregate-address">
           <properties>
             <help>BGP aggregate network</help>
             <valueHelp>
               <format>ipv6net</format>
               <description>Aggregate network</description>
             </valueHelp>
             <constraint>
               <validator name="ipv6-prefix"/>
             </constraint>
           </properties>
           <children>
             #include <include/bgp/afi-aggregate-address.xml.i>
           </children>
         </tagNode>
         <node name="distance">
           <properties>
             <help>Administrative distances for BGP routes</help>
           </properties>
           <children>
             <leafNode name="external">
               <properties>
                 <help>eBGP routes administrative distance</help>
                 <valueHelp>
                   <format>u32:1-255</format>
                   <description>eBGP routes administrative distance</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 1-255"/>
                 </constraint>
               </properties>
             </leafNode>
             <leafNode name="internal">
               <properties>
                 <help>iBGP routes administrative distance</help>
                 <valueHelp>
                   <format>u32:1-255</format>
                   <description>iBGP routes administrative distance</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 1-255"/>
                 </constraint>
               </properties>
             </leafNode>
             <leafNode name="local">
               <properties>
                 <help>Locally originated BGP routes administrative distance</help>
                 <valueHelp>
                   <format>u32:1-255</format>
                   <description>Locally originated BGP routes administrative distance</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 1-255"/>
                 </constraint>
               </properties>
             </leafNode>
             <tagNode name="prefix">
               <properties>
                 <help>Administrative distance for a specific BGP prefix</help>
                 <valueHelp>
                   <format>ipv6net</format>
                   <description>Administrative distance for a specific BGP prefix</description>
                 </valueHelp>
                 <constraint>
                   <validator name="ipv6-prefix"/>
                 </constraint>
               </properties>
               <children>
                 <leafNode name="distance">
                   <properties>
                     <help>Administrative distance for prefix</help>
                     <valueHelp>
                       <format>u32:1-255</format>
                       <description>Administrative distance for external BGP routes</description>
                     </valueHelp>
                     <constraint>
                       <validator name="numeric" argument="--range 1-255"/>
                     </constraint>
                   </properties>
                 </leafNode>
               </children>
             </tagNode>
           </children>
         </node>
         #include <include/bgp/afi-export-import.xml.i>
         #include <include/bgp/afi-label.xml.i>
         #include <include/bgp/afi-maximum-paths.xml.i>
         <tagNode name="network">
           <properties>
             <help>BGP network</help>
             <valueHelp>
               <format>ipv6net</format>
               <description>Aggregate network</description>
             </valueHelp>
             <constraint>
               <validator name="ipv6-prefix"/>
             </constraint>
           </properties>
           <children>
             #include <include/bgp/afi-path-limit.xml.i>
             #include <include/route-map.xml.i>
           </children>
         </tagNode>
         #include <include/bgp/afi-rd.xml.i>
         #include <include/bgp/afi-route-map-vpn.xml.i>
         #include <include/bgp/afi-route-target-vpn.xml.i>
         <node name="redistribute">
           <properties>
             <help>Redistribute routes from other protocols into BGP</help>
           </properties>
           <children>
             <node name="connected">
               <properties>
                 <help>Redistribute connected routes into BGP</help>
               </properties>
               <children>
                 #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
             <node name="kernel">
               <properties>
                 <help>Redistribute kernel routes into BGP</help>
               </properties>
               <children>
                 #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
             <node name="ospfv3">
               <properties>
                 <help>Redistribute OSPFv3 routes into BGP</help>
               </properties>
               <children>
                 #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
             <node name="ripng">
               <properties>
                 <help>Redistribute RIPng routes into BGP</help>
               </properties>
               <children>
                 #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
+            <node name="babel">
+              <properties>
+                <help>Redistribute Babel routes into BGP</help>
+              </properties>
+              <children>
+                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
+              </children>
+            </node>
             <node name="static">
               <properties>
                 <help>Redistribute static routes into BGP</help>
               </properties>
               <children>
                 #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
             <leafNode name="table">
               <properties>
                 <help>Redistribute non-main Kernel Routing Table</help>
               </properties>
             </leafNode>
           </children>
         </node>
       </children>
     </node>
     <node name="ipv6-multicast">
       <properties>
         <help>Multicast IPv6 BGP settings</help>
       </properties>
       <children>
         <tagNode name="aggregate-address">
           <properties>
             <help>BGP aggregate network/prefix</help>
             <valueHelp>
               <format>ipv6net</format>
               <description>BGP aggregate network/prefix</description>
             </valueHelp>
             <constraint>
               <validator name="ipv6-prefix"/>
             </constraint>
           </properties>
           <children>
             #include <include/bgp/afi-aggregate-address.xml.i>
           </children>
         </tagNode>
         <node name="distance">
           <properties>
             <help>Administrative distances for BGP routes</help>
           </properties>
           <children>
             <leafNode name="external">
               <properties>
                 <help>eBGP routes administrative distance</help>
                 <valueHelp>
                   <format>u32:1-255</format>
                   <description>eBGP routes administrative distance</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 1-255"/>
                 </constraint>
               </properties>
             </leafNode>
             <leafNode name="internal">
               <properties>
                 <help>iBGP routes administrative distance</help>
                 <valueHelp>
                   <format>u32:1-255</format>
                   <description>iBGP routes administrative distance</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 1-255"/>
                 </constraint>
               </properties>
             </leafNode>
             <leafNode name="local">
               <properties>
                 <help>Locally originated BGP routes administrative distance</help>
                 <valueHelp>
                   <format>u32:1-255</format>
                   <description>Locally originated BGP routes administrative distance</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 1-255"/>
                 </constraint>
               </properties>
             </leafNode>
             <tagNode name="prefix">
               <properties>
                 <help>Administrative distance for a specific BGP prefix</help>
                 <valueHelp>
                   <format>ipv6net</format>
                   <description>Administrative distance for a specific BGP prefix</description>
                 </valueHelp>
                 <constraint>
                   <validator name="ipv6-prefix"/>
                 </constraint>
               </properties>
               <children>
                 <leafNode name="distance">
                   <properties>
                     <help>Administrative distance for prefix</help>
                     <valueHelp>
                       <format>u32:1-255</format>
                       <description>Administrative distance for external BGP routes</description>
                     </valueHelp>
                     <constraint>
                       <validator name="numeric" argument="--range 1-255"/>
                     </constraint>
                   </properties>
                 </leafNode>
               </children>
             </tagNode>
           </children>
         </node>
         <tagNode name="network">
           <properties>
             <help>Import BGP network/prefix into multicast IPv6 RIB</help>
             <valueHelp>
               <format>ipv6net</format>
               <description>Multicast IPv6 BGP network/prefix</description>
             </valueHelp>
             <constraint>
               <validator name="ipv6-prefix"/>
             </constraint>
           </properties>
           <children>
             #include <include/bgp/afi-path-limit.xml.i>
             #include <include/route-map.xml.i>
           </children>
         </tagNode>
       </children>
     </node>
     <node name="ipv6-labeled-unicast">
       <properties>
         <help>Labeled Unicast IPv6 BGP settings</help>
       </properties>
       <children>
         <tagNode name="aggregate-address">
           <properties>
             <help>BGP aggregate network/prefix</help>
             <valueHelp>
               <format>ipv6net</format>
               <description>BGP aggregate network/prefix</description>
             </valueHelp>
             <constraint>
               <validator name="ipv6-prefix"/>
             </constraint>
           </properties>
           <children>
             #include <include/bgp/afi-aggregate-address.xml.i>
           </children>
         </tagNode>
         <tagNode name="network">
           <properties>
             <help>Import BGP network/prefix into labeled unicast IPv6 RIB</help>
             <valueHelp>
               <format>ipv6net</format>
               <description>Labeled Unicast IPv6 BGP network/prefix</description>
             </valueHelp>
             <constraint>
               <validator name="ipv6-prefix"/>
             </constraint>
           </properties>
           <children>
             <leafNode name="backdoor">
               <properties>
                 <help>Use BGP network/prefix as a backdoor route</help>
                 <valueless/>
               </properties>
             </leafNode>
             #include <include/route-map.xml.i>
           </children>
         </tagNode>
       </children>
     </node>
     <node name="ipv6-flowspec">
       <properties>
         <help>Flowspec IPv6 BGP settings</help>
       </properties>
       <children>
         <node name="local-install">
           <properties>
             <help>Apply local policy routing to interface</help>
           </properties>
           <children>
             <leafNode name="interface">
               <properties>
                 <help>Interface</help>
                 <completionHelp>
                   <script>${vyos_completion_dir}/list_interfaces.py</script>
                 </completionHelp>
                 <multi/>
               </properties>
             </leafNode>
           </children>
         </node>
       </children>
     </node>
     <node name="ipv6-vpn">
       <properties>
         <help>Unicast VPN IPv6 BGP settings</help>
       </properties>
       <children>
         <tagNode name="network">
           <properties>
             <help>Import BGP network/prefix into unicast VPN IPv6 RIB</help>
             <valueHelp>
               <format>ipv6net</format>
               <description>Unicast VPN IPv6 BGP network/prefix</description>
             </valueHelp>
             <constraint>
               <validator name="ipv6-prefix"/>
             </constraint>
           </properties>
           <children>
             #include <include/bgp/route-distinguisher.xml.i>
             <leafNode name="label">
               <properties>
                 <help>MPLS label value assigned to route</help>
                 <valueHelp>
                   <format>u32:0-1048575</format>
                   <description>MPLS label value</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 0-1048575"/>
                 </constraint>
               </properties>
             </leafNode>
           </children>
         </tagNode>
       </children>
     </node>
     <node name="l2vpn-evpn">
       <properties>
         <help>L2VPN EVPN BGP settings</help>
       </properties>
       <children>
         <node name="advertise">
           <properties>
             <help>Advertise prefix routes</help>
           </properties>
           <children>
             <node name="ipv4">
               <properties>
                 <help>IPv4 address family</help>
               </properties>
               <children>
                 #include <include/bgp/afi-l2vpn-advertise.xml.i>
               </children>
             </node>
             <node name="ipv6">
               <properties>
                 <help>IPv6 address family</help>
               </properties>
               <children>
                 #include <include/bgp/afi-l2vpn-advertise.xml.i>
               </children>
             </node>
           </children>
         </node>
         <leafNode name="advertise-all-vni">
           <properties>
             <help>Advertise All local VNIs</help>
             <valueless/>
           </properties>
         </leafNode>
         #include <include/bgp/afi-l2vpn-common.xml.i>
         <leafNode name="advertise-pip">
           <properties>
             <help>EVPN system primary IP</help>
             <valueHelp>
               <format>ipv4</format>
               <description>IP address</description>
             </valueHelp>
             <constraint>
               <validator name="ipv4-address"/>
             </constraint>
           </properties>
         </leafNode>
         <leafNode name="rt-auto-derive">
           <properties>
             <help>Auto derivation of Route Target (RFC8365)</help>
             <valueless/>
           </properties>
         </leafNode>
         <node name="flooding">
           <properties>
             <help>Specify handling for BUM packets</help>
           </properties>
           <children>
             <leafNode name="disable">
               <properties>
                 <help>Do not flood any BUM packets</help>
                 <valueless/>
               </properties>
             </leafNode>
             <leafNode name="head-end-replication">
               <properties>
                 <help>Flood BUM packets using head-end replication</help>
                 <valueless/>
               </properties>
             </leafNode>
           </children>
         </node>
         <tagNode name="vni">
           <properties>
             <help>VXLAN Network Identifier</help>
             <valueHelp>
               <format>u32:1-16777215</format>
               <description>VNI number</description>
             </valueHelp>
             <constraint>
               <validator name="numeric" argument="--range 1-16777215"/>
             </constraint>
           </properties>
           <children>
             #include <include/bgp/afi-l2vpn-common.xml.i>
           </children>
         </tagNode>
       </children>
     </node>
   </children>
 </node>
 <node name="listen">
   <properties>
     <help>Listen for and accept BGP dynamic neighbors from range</help>
   </properties>
   <children>
     <leafNode name="limit">
       <properties>
         <help>Maximum number of dynamic neighbors that can be created</help>
         <valueHelp>
           <format>u32:1-5000</format>
           <description>BGP neighbor limit</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 1-5000"/>
         </constraint>
       </properties>
     </leafNode>
     <tagNode name="range">
       <properties>
         <help>BGP dynamic neighbors listen range</help>
         <valueHelp>
           <format>ipv4net</format>
           <description>IPv4 dynamic neighbors listen range</description>
         </valueHelp>
         <valueHelp>
           <format>ipv6net</format>
           <description>IPv6 dynamic neighbors listen range</description>
         </valueHelp>
         <constraint>
           <validator name="ipv4-prefix"/>
           <validator name="ipv6-prefix"/>
         </constraint>
       </properties>
       <children>
         #include <include/bgp/peer-group.xml.i>
       </children>
     </tagNode>
   </children>
 </node>
 <leafNode name="system-as">
   <properties>
     <help>Autonomous System Number (ASN)</help>
     <valueHelp>
       <format>u32:1-4294967294</format>
       <description>Autonomous System Number</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 1-4294967294"/>
     </constraint>
   </properties>
 </leafNode>
 <tagNode name="neighbor">
   <properties>
     <help>BGP neighbor</help>
     <valueHelp>
       <format>ipv4</format>
       <description>BGP neighbor IP address</description>
     </valueHelp>
     <valueHelp>
       <format>ipv6</format>
       <description>BGP neighbor IPv6 address</description>
     </valueHelp>
     <valueHelp>
       <format>txt</format>
       <description>Interface name</description>
     </valueHelp>
     <constraint>
       <validator name="ipv4-address"/>
       <validator name="ipv6-address"/>
       #include <include/constraint/interface-name.xml.in>
     </constraint>
   </properties>
   <children>
     <node name="address-family">
       <properties>
         <help>Address-family parameters</help>
       </properties>
       <children>
         #include <include/bgp/neighbor-afi-ipv4-unicast.xml.i>
         #include <include/bgp/neighbor-afi-ipv6-unicast.xml.i>
         #include <include/bgp/neighbor-afi-ipv4-labeled-unicast.xml.i>
         #include <include/bgp/neighbor-afi-ipv6-labeled-unicast.xml.i>
         #include <include/bgp/neighbor-afi-ipv4-vpn.xml.i>
         #include <include/bgp/neighbor-afi-ipv6-vpn.xml.i>
         #include <include/bgp/neighbor-afi-ipv4-flowspec.xml.i>
         #include <include/bgp/neighbor-afi-ipv6-flowspec.xml.i>
         #include <include/bgp/neighbor-afi-ipv4-multicast.xml.i>
         #include <include/bgp/neighbor-afi-ipv6-multicast.xml.i>
         #include <include/bgp/neighbor-afi-l2vpn-evpn.xml.i>
       </children>
     </node>
     <leafNode name="advertisement-interval">
       <properties>
         <help>Minimum interval for sending routing updates</help>
         <valueHelp>
           <format>u32:0-600</format>
           <description>Advertisement interval in seconds</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-600"/>
         </constraint>
       </properties>
     </leafNode>
     #include <include/generic-description.xml.i>
     #include <include/bgp/neighbor-bfd.xml.i>
     #include <include/bgp/neighbor-capability.xml.i>
     #include <include/bgp/neighbor-disable-capability-negotiation.xml.i>
     #include <include/bgp/neighbor-disable-connected-check.xml.i>
     #include <include/bgp/neighbor-ebgp-multihop.xml.i>
     #include <include/bgp/neighbor-graceful-restart.xml.i>
     <node name="interface">
       <properties>
         <help>Interface parameters</help>
       </properties>
       <children>
         #include <include/bgp/peer-group.xml.i>
         #include <include/bgp/remote-as.xml.i>
         #include <include/source-interface.xml.i>
         <node name="v6only">
           <properties>
             <help>Enable BGP with v6 link-local only</help>
           </properties>
           <children>
             #include <include/bgp/peer-group.xml.i>
             #include <include/bgp/remote-as.xml.i>
           </children>
         </node>
       </children>
     </node>
     #include <include/bgp/neighbor-local-as.xml.i>
     #include <include/bgp/neighbor-local-role.xml.i>
     #include <include/bgp/neighbor-override-capability.xml.i>
     #include <include/bgp/neighbor-passive.xml.i>
     #include <include/bgp/neighbor-password.xml.i>
     #include <include/bgp/peer-group.xml.i>
     <leafNode name="port">
       <properties>
         <help>Neighbor BGP port</help>
         <valueHelp>
           <format>u32:1-65535</format>
           <description>Neighbor BGP port number</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 1-65535"/>
         </constraint>
       </properties>
     </leafNode>
     #include <include/bgp/remote-as.xml.i>
     #include <include/bgp/neighbor-shutdown.xml.i>
     <leafNode name="solo">
       <properties>
         <help>Do not send back prefixes learned from the neighbor</help>
         <valueless/>
       </properties>
     </leafNode>
     <leafNode name="strict-capability-match">
       <properties>
         <help>Enable strict capability negotiation</help>
         <valueless/>
       </properties>
     </leafNode>
     <node name="timers">
       <properties>
         <help>Neighbor timers</help>
       </properties>
       <children>
         <leafNode name="connect">
           <properties>
             <help>BGP connect timer for this neighbor</help>
             <valueHelp>
               <format>u32:1-65535</format>
               <description>Connect timer in seconds</description>
             </valueHelp>
             <valueHelp>
               <format>0</format>
               <description>Disable connect timer</description>
             </valueHelp>
             <constraint>
               <validator name="numeric" argument="--range 0-65535"/>
             </constraint>
           </properties>
         </leafNode>
         #include <include/bgp/timers-holdtime.xml.i>
         #include <include/bgp/timers-keepalive.xml.i>
       </children>
     </node>
     #include <include/bgp/neighbor-ttl-security.xml.i>
     #include <include/bgp/neighbor-update-source.xml.i>
   </children>
 </tagNode>
 <node name="parameters">
   <properties>
     <help>BGP parameters</help>
   </properties>
   <children>
     <leafNode name="always-compare-med">
       <properties>
         <help>Always compare MEDs from different neighbors</help>
         <valueless/>
       </properties>
     </leafNode>
     <node name="bestpath">
       <properties>
         <help>Default bestpath selection mechanism</help>
       </properties>
       <children>
         <node name="as-path">
           <properties>
             <help>AS-path attribute comparison parameters</help>
           </properties>
           <children>
             <leafNode name="confed">
               <properties>
                 <help>Compare AS-path lengths including confederation sets and sequences</help>
                 <valueless/>
               </properties>
             </leafNode>
             <leafNode name="ignore">
               <properties>
                 <help>Ignore AS-path length in selecting a route</help>
                 <valueless/>
               </properties>
             </leafNode>
             <leafNode name="multipath-relax">
               <properties>
                 <help>Allow load sharing across routes that have different AS paths (but same length)</help>
                 <valueless/>
               </properties>
             </leafNode>
           </children>
         </node>
         <leafNode name="bandwidth">
           <properties>
             <help>Link Bandwidth attribute</help>
             <completionHelp>
               <list>default-weight-for-missing ignore skip-missing</list>
             </completionHelp>
             <valueHelp>
               <format>default-weight-for-missing</format>
               <description>Assign low default weight (1) to paths not having link bandwidth</description>
             </valueHelp>
             <valueHelp>
               <format>ignore</format>
               <description>Ignore link bandwidth (do regular ECMP, not weighted)</description>
             </valueHelp>
             <valueHelp>
               <format>skip-missing</format>
               <description>Ignore paths without link bandwidth for ECMP (if other paths have it)</description>
             </valueHelp>
             <constraint>
               <regex>(default-weight-for-missing|ignore|skip-missing)</regex>
             </constraint>
           </properties>
         </leafNode>
         <leafNode name="compare-routerid">
           <properties>
             <help>Compare the router-id for identical EBGP paths</help>
             <valueless/>
           </properties>
         </leafNode>
         <node name="med">
           <properties>
             <help>MED attribute comparison parameters</help>
           </properties>
           <children>
             <leafNode name="confed">
               <properties>
                 <help>Compare MEDs among confederation paths</help>
                 <valueless/>
               </properties>
             </leafNode>
             <leafNode name="missing-as-worst">
               <properties>
                 <help>Treat missing route as a MED as the least preferred one</help>
                 <valueless/>
               </properties>
             </leafNode>
           </children>
         </node>
         <node name="peer-type">
           <properties>
             <help>Peer type</help>
           </properties>
           <children>
             <leafNode name="multipath-relax">
               <properties>
                 <help>Allow load sharing across routes learned from different peer types</help>
                 <valueless/>
               </properties>
             </leafNode>
           </children>
         </node>
       </children>
     </node>
     <leafNode name="cluster-id">
       <properties>
         <help>Route-reflector cluster-id</help>
         <valueHelp>
           <format>ipv4</format>
           <description>Route-reflector cluster-id</description>
         </valueHelp>
         <constraint>
           <validator name="ipv4-address"/>
         </constraint>
       </properties>
     </leafNode>
     <node name="confederation">
       <properties>
         <help>AS confederation parameters</help>
       </properties>
       <children>
         <leafNode name="identifier">
           <properties>
             <help>Confederation AS identifier</help>
             <valueHelp>
               <format>u32:1-4294967294</format>
               <description>Confederation AS id</description>
             </valueHelp>
             <constraint>
               <validator name="numeric" argument="--range 1-4294967294"/>
             </constraint>
           </properties>
         </leafNode>
         <leafNode name="peers">
           <properties>
             <help>Peer ASs in the BGP confederation</help>
             <valueHelp>
               <format>u32:1-4294967294</format>
               <description>Peer AS number</description>
             </valueHelp>
             <constraint>
               <validator name="numeric" argument="--range 1-4294967294"/>
             </constraint>
             <multi/>
           </properties>
         </leafNode>
       </children>
     </node>
     <node name="conditional-advertisement">
       <properties>
         <help>Conditional advertisement settings</help>
       </properties>
       <children>
         <leafNode name="timer">
           <properties>
             <help>Set period to rescan BGP table to check if condition is met</help>
             <valueHelp>
               <format>u32:5-240</format>
               <description>Period to rerun the conditional advertisement scanner process</description>
             </valueHelp>
             <constraint>
               <validator name="numeric" argument="--range 5-240"/>
             </constraint>
           </properties>
           <defaultValue>60</defaultValue>
         </leafNode>
       </children>
     </node>
     <node name="dampening">
       <properties>
         <help>Enable route-flap dampening</help>
       </properties>
       <children>
         <leafNode name="half-life">
           <properties>
             <help>Half-life time for dampening</help>
             <valueHelp>
               <format>u32:1-45</format>
               <description>Half-life penalty in minutes</description>
             </valueHelp>
             <constraint>
               <validator name="numeric" argument="--range 1-45"/>
             </constraint>
           </properties>
         </leafNode>
         <leafNode name="max-suppress-time">
           <properties>
             <help>Maximum duration to suppress a stable route</help>
             <valueHelp>
               <format>u32:1-255</format>
               <description>Maximum suppress duration in minutes</description>
             </valueHelp>
             <constraint>
               <validator name="numeric" argument="--range 1-255"/>
             </constraint>
           </properties>
         </leafNode>
         <leafNode name="re-use">
           <properties>
             <help>Threshold to start reusing a route</help>
             <valueHelp>
               <format>u32:1-20000</format>
               <description>Re-use penalty points</description>
             </valueHelp>
             <constraint>
               <validator name="numeric" argument="--range 1-20000"/>
             </constraint>
           </properties>
         </leafNode>
         <leafNode name="start-suppress-time">
           <properties>
             <help>When to start suppressing a route</help>
             <valueHelp>
               <format>u32:1-20000</format>
               <description>Start-suppress penalty points</description>
             </valueHelp>
             <constraint>
               <validator name="numeric" argument="--range 1-20000"/>
             </constraint>
           </properties>
         </leafNode>
       </children>
     </node>
     <node name="default">
       <properties>
         <help>BGP defaults</help>
       </properties>
       <children>
         <leafNode name="local-pref">
           <properties>
             <help>Default local preference</help>
             <valueHelp>
               <format>u32</format>
               <description>Local preference</description>
             </valueHelp>
             <constraint>
               <validator name="numeric" argument="--range 0-4294967295"/>
             </constraint>
           </properties>
         </leafNode>
       </children>
     </node>
     <leafNode name="deterministic-med">
       <properties>
         <help>Compare MEDs between different peers in the same AS</help>
         <valueless/>
       </properties>
     </leafNode>
     <node name="distance">
       <properties>
         <help>Administratives distances for BGP routes</help>
       </properties>
       <children>
         <node name="global">
           <properties>
             <help>Global administratives distances for BGP routes</help>
           </properties>
           <children>
             <leafNode name="external">
               <properties>
                 <help>Administrative distance for external BGP routes</help>
                 <valueHelp>
                   <format>u32:1-255</format>
                   <description>Administrative distance for external BGP routes</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 1-255"/>
                 </constraint>
               </properties>
             </leafNode>
             <leafNode name="internal">
               <properties>
                 <help>Administrative distance for internal BGP routes</help>
                 <valueHelp>
                   <format>u32:1-255</format>
                   <description>Administrative distance for internal BGP routes</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 1-255"/>
                 </constraint>
               </properties>
             </leafNode>
             <leafNode name="local">
               <properties>
                 <help>Administrative distance for local BGP routes</help>
                 <valueHelp>
                   <format>u32:1-255</format>
                   <description>Administrative distance for internal BGP routes</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 1-255"/>
                 </constraint>
               </properties>
             </leafNode>
           </children>
         </node>
         <tagNode name="prefix">
           <properties>
             <help>Administrative distance for a specific BGP prefix</help>
             <valueHelp>
               <format>ipv4net</format>
               <description>Administrative distance for a specific BGP prefix</description>
             </valueHelp>
             <constraint>
               <validator name="ipv4-prefix"/>
             </constraint>
           </properties>
           <children>
             <leafNode name="distance">
               <properties>
                 <help>Administrative distance for prefix</help>
                 <valueHelp>
                   <format>u32:1-255</format>
                   <description>Administrative distance for external BGP routes</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 1-255"/>
                 </constraint>
               </properties>
             </leafNode>
           </children>
         </tagNode>
       </children>
     </node>
     <leafNode name="ebgp-requires-policy">
       <properties>
         <help>Require in and out policy for eBGP peers (RFC8212)</help>
         <valueless/>
       </properties>
     </leafNode>
     <leafNode name="fast-convergence">
       <properties>
         <help>Teardown sessions immediately whenever peer becomes unreachable</help>
         <valueless/>
       </properties>
     </leafNode>
     <node name="graceful-restart">
       <properties>
         <help>Graceful restart capability parameters</help>
       </properties>
       <children>
         <leafNode name="stalepath-time">
           <properties>
             <help>Maximum time to hold onto restarting neighbors stale paths</help>
             <valueHelp>
               <format>u32:1-3600</format>
               <description>Hold time in seconds</description>
             </valueHelp>
             <constraint>
               <validator name="numeric" argument="--range 1-3600"/>
             </constraint>
           </properties>
         </leafNode>
       </children>
     </node>
     <leafNode name="graceful-shutdown">
       <properties>
         <help>Graceful shutdown</help>
         <valueless/>
       </properties>
     </leafNode>
     <leafNode name="log-neighbor-changes">
       <properties>
         <help>Log neighbor up/down changes and reset reason</help>
         <valueless/>
       </properties>
     </leafNode>
     <leafNode name="minimum-holdtime">
       <properties>
         <help>BGP minimum holdtime</help>
         <valueHelp>
           <format>u32:1-65535</format>
           <description>Minimum holdtime in seconds</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 1-65535"/>
         </constraint>
       </properties>
     </leafNode>
     <leafNode name="network-import-check">
       <properties>
         <help>Enable IGP route check for network statements</help>
         <valueless/>
       </properties>
     </leafNode>
     <leafNode name="route-reflector-allow-outbound-policy">
       <properties>
         <help>Route reflector client allow policy outbound</help>
         <valueless/>
       </properties>
     </leafNode>
     <leafNode name="no-client-to-client-reflection">
       <properties>
         <help>Disable client to client route reflection</help>
         <valueless/>
       </properties>
     </leafNode>
     <leafNode name="no-fast-external-failover">
       <properties>
         <help>Disable immediate session reset on peer link down event</help>
         <valueless/>
       </properties>
     </leafNode>
     <leafNode name="no-suppress-duplicates">
       <properties>
         <help>Disable suppress duplicate updates if the route actually not changed</help>
         <valueless/>
       </properties>
     </leafNode>
     <leafNode name="reject-as-sets">
       <properties>
         <help>Reject routes with AS_SET or AS_CONFED_SET flag</help>
         <valueless/>
       </properties>
     </leafNode>
     <leafNode name="shutdown">
       <properties>
         <help>Administrative shutdown of the BGP instance</help>
         <valueless/>
       </properties>
     </leafNode>
     <leafNode name="suppress-fib-pending">
       <properties>
         <help>Advertise only routes that are programmed in kernel to peers</help>
         <valueless/>
       </properties>
     </leafNode>
     #include <include/router-id.xml.i>
   </children>
 </node>
 <tagNode name="peer-group">
   <properties>
     <help>Name of peer-group</help>
     <constraint>
       <regex>[-_a-zA-Z0-9]+</regex>
     </constraint>
   </properties>
   <children>
     <node name="address-family">
       <properties>
         <help>Address-family parameters</help>
       </properties>
       <children>
         #include <include/bgp/neighbor-afi-ipv4-unicast.xml.i>
         #include <include/bgp/neighbor-afi-ipv6-unicast.xml.i>
         #include <include/bgp/neighbor-afi-l2vpn-evpn.xml.i>
       </children>
     </node>
     #include <include/generic-description.xml.i>
     #include <include/bgp/neighbor-bfd.xml.i>
     #include <include/bgp/neighbor-capability.xml.i>
     #include <include/bgp/neighbor-disable-capability-negotiation.xml.i>
     #include <include/bgp/neighbor-disable-connected-check.xml.i>
     #include <include/bgp/neighbor-ebgp-multihop.xml.i>
     #include <include/bgp/neighbor-graceful-restart.xml.i>
     #include <include/bgp/neighbor-graceful-restart.xml.i>
     #include <include/bgp/neighbor-local-as.xml.i>
     #include <include/bgp/neighbor-local-role.xml.i>
     #include <include/bgp/neighbor-override-capability.xml.i>
     #include <include/bgp/neighbor-passive.xml.i>
     #include <include/bgp/neighbor-password.xml.i>
     #include <include/bgp/remote-as.xml.i>
     #include <include/bgp/neighbor-shutdown.xml.i>
     #include <include/bgp/neighbor-ttl-security.xml.i>
     #include <include/bgp/neighbor-update-source.xml.i>
   </children>
 </tagNode>
 #include <include/route-map.xml.i>
 <node name="timers">
   <properties>
     <help>BGP protocol timers</help>
   </properties>
   <children>
     #include <include/bgp/timers-holdtime.xml.i>
     #include <include/bgp/timers-keepalive.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/eigrp/protocol-common-config.xml.i b/interface-definitions/include/eigrp/protocol-common-config.xml.i
index 147277102..30ddc5d11 100644
--- a/interface-definitions/include/eigrp/protocol-common-config.xml.i
+++ b/interface-definitions/include/eigrp/protocol-common-config.xml.i
@@ -1,121 +1,125 @@
 <!-- include start from eigrp/protocol-common-config.xml.i -->
 <leafNode name="local-as">
   <properties>
     <help>Autonomous System Number (ASN)</help>
     <valueHelp>
       <format>u32:1-65535</format>
       <description>Autonomous System Number</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 1-65535"/>
     </constraint>
   </properties>
 </leafNode>
 <leafNode name="maximum-paths">
   <properties>
     <help>Forward packets over multiple paths</help>
     <valueHelp>
       <format>u32:1-32</format>
       <description>Number of paths</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 1-32"/>
     </constraint>
   </properties>
 </leafNode>
 <node name="metric">
   <properties>
     <help>Modify metrics and parameters for advertisement</help>
   </properties>
   <children>
     <leafNode name="weights">
       <properties>
         <help>Modify metric coefficients</help>
         <valueHelp>
           <format>u32:0-255</format>
           <description>K1</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-255"/>
         </constraint>
       </properties>
     </leafNode>
   </children>
 </node>
 <leafNode name="network">
   <properties>
     <help>Enable routing on an IP network</help>
     <valueHelp>
       <format>ipv4net</format>
       <description>EIGRP network prefix</description>
     </valueHelp>
     <constraint>
       <validator name="ip-prefix"/>
     </constraint>
     <multi/>
   </properties>
 </leafNode>
 <leafNode name="passive-interface">
   <properties>
     <help>Suppress routing updates on an interface</help>
     <completionHelp>
       <script>${vyos_completion_dir}/list_interfaces.py</script>
     </completionHelp>
   </properties>
 </leafNode>
 <leafNode name="redistribute">
   <properties>
     <help>Redistribute information from another routing protocol</help>
     <valueHelp>
       <format>bgp</format>
       <description>Border Gateway Protocol (BGP)</description>
     </valueHelp>
     <valueHelp>
       <format>connected</format>
       <description>Connected routes</description>
     </valueHelp>
     <valueHelp>
       <format>nhrp</format>
       <description>Next Hop Resolution Protocol (NHRP)</description>
     </valueHelp>
     <valueHelp>
       <format>ospf</format>
       <description>Open Shortest Path First (OSPFv2)</description>
     </valueHelp>
     <valueHelp>
       <format>rip</format>
       <description>Routing Information Protocol (RIP)</description>
     </valueHelp>
+    <valueHelp>
+      <format>babel</format>
+      <description>Babel routing protocol (Babel)</description>
+    </valueHelp>
     <valueHelp>
       <format>static</format>
       <description>Statically configured routes</description>
     </valueHelp>
     <valueHelp>
       <format>vnc</format>
       <description>Virtual Network Control (VNC)</description>
     </valueHelp>
     <completionHelp>
       <list>bgp connected nhrp ospf rip static vnc</list>
     </completionHelp>
     <constraint>
-      <regex>(bgp|connected|nhrp|ospf|rip|static|vnc)</regex>
+      <regex>(bgp|connected|nhrp|ospf|rip|babel|static|vnc)</regex>
     </constraint>
     <multi/>
   </properties>
 </leafNode>
 #include <include/route-map.xml.i>
 #include <include/router-id.xml.i>
 <!-- FRR timers not implemented yet -->
 <leafNode name="variance">
   <properties>
     <help>Control load balancing variance</help>
     <valueHelp>
       <format>u32:1-128</format>
       <description>Metric variance multiplier</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 1-128"/>
     </constraint>
   </properties>
 </leafNode>
 <!-- include end -->
diff --git a/interface-definitions/include/isis/protocol-common-config.xml.i b/interface-definitions/include/isis/protocol-common-config.xml.i
index 42bda7a80..c44939528 100644
--- a/interface-definitions/include/isis/protocol-common-config.xml.i
+++ b/interface-definitions/include/isis/protocol-common-config.xml.i
@@ -1,673 +1,689 @@
 <!-- include start from isis/protocol-common-config.xml.i -->
 <node name="area-password">
   <properties>
     <help>Configure the authentication password for an area</help>
   </properties>
   <children>
     #include <include/isis/password.xml.i>
   </children>
 </node>
 <node name="default-information">
   <properties>
     <help>Control distribution of default information</help>
   </properties>
   <children>
     <node name="originate">
       <properties>
         <help>Distribute a default route</help>
       </properties>
       <children>
         <node name="ipv4">
           <properties>
             <help>Distribute default route for IPv4</help>
           </properties>
           <children>
             #include <include/isis/default-information-level.xml.i>
           </children>
         </node>
         <node name="ipv6">
           <properties>
             <help>Distribute default route for IPv6</help>
           </properties>
           <children>
             #include <include/isis/default-information-level.xml.i>
           </children>
         </node>
       </children>
     </node>
   </children>
 </node>
 <node name="domain-password">
   <properties>
     <help>Set the authentication password for a routing domain</help>
   </properties>
   <children>
     #include <include/isis/password.xml.i>
   </children>
 </node>
 <leafNode name="dynamic-hostname">
   <properties>
     <help>Dynamic hostname for IS-IS</help>
     <valueless/>
   </properties>
 </leafNode>
 <leafNode name="level">
   <properties>
     <help>IS-IS level number</help>
     <completionHelp>
       <list>level-1 level-1-2 level-2</list>
     </completionHelp>
     <valueHelp>
       <format>level-1</format>
       <description>Act as a station router</description>
     </valueHelp>
     <valueHelp>
       <format>level-1-2</format>
       <description>Act as both a station and an area router</description>
     </valueHelp>
     <valueHelp>
       <format>level-2</format>
       <description>Act as an area router</description>
     </valueHelp>
     <constraint>
       <regex>(level-1|level-1-2|level-2)</regex>
     </constraint>
   </properties>
 </leafNode>
 <leafNode name="log-adjacency-changes">
   <properties>
     <help>Log adjacency state changes</help>
     <valueless/>
   </properties>
 </leafNode>
 <leafNode name="lsp-gen-interval">
   <properties>
     <help>Minimum interval between regenerating same LSP</help>
     <valueHelp>
       <format>u32:1-120</format>
       <description>Minimum interval in seconds</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 1-120"/>
     </constraint>
   </properties>
 </leafNode>
 <leafNode name="lsp-mtu">
   <properties>
     <help>Configure the maximum size of generated LSPs</help>
     <valueHelp>
       <format>u32:128-4352</format>
       <description>Maximum size of generated LSPs</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 128-4352"/>
     </constraint>
   </properties>
   <defaultValue>1497</defaultValue>
 </leafNode>
 <leafNode name="lsp-refresh-interval">
   <properties>
     <help>LSP refresh interval</help>
     <valueHelp>
       <format>u32:1-65235</format>
       <description>LSP refresh interval in seconds</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 1-65235"/>
     </constraint>
   </properties>
 </leafNode>
 <leafNode name="max-lsp-lifetime">
   <properties>
     <help>Maximum LSP lifetime</help>
     <valueHelp>
       <format>u32:350-65535</format>
       <description>LSP lifetime in seconds</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 1-65535"/>
     </constraint>
   </properties>
 </leafNode>
 <leafNode name="metric-style">
   <properties>
     <help>Use old-style (ISO 10589) or new-style packet formats</help>
     <completionHelp>
       <list>narrow transition wide</list>
     </completionHelp>
     <valueHelp>
       <format>narrow</format>
       <description>Use old style of TLVs with narrow metric</description>
     </valueHelp>
     <valueHelp>
       <format>transition</format>
       <description>Send and accept both styles of TLVs during transition</description>
     </valueHelp>
     <valueHelp>
       <format>wide</format>
       <description>Use new style of TLVs to carry wider metric</description>
     </valueHelp>
     <constraint>
       <regex>(narrow|transition|wide)</regex>
     </constraint>
   </properties>
 </leafNode>
 <leafNode name="net">
   <properties>
     <help>A Network Entity Title for this process (ISO only)</help>
     <valueHelp>
       <format>XX.XXXX. ... .XXX.XX</format>
       <description>Network entity title (NET)</description>
     </valueHelp>
     <constraint>
       <regex>[a-fA-F0-9]{2}(\.[a-fA-F0-9]{4}){3,9}\.[a-fA-F0-9]{2}</regex>
     </constraint>
   </properties>
 </leafNode>
 <leafNode name="purge-originator">
   <properties>
     <help>Use the RFC 6232 purge-originator</help>
     <valueless/>
   </properties>
 </leafNode>
 <node name="traffic-engineering">
   <properties>
     <help>Show IS-IS neighbor adjacencies</help>
   </properties>
   <children>
     <leafNode name="enable">
       <properties>
         <help>Enable MPLS traffic engineering extensions</help>
         <valueless/>
       </properties>
     </leafNode>
 <!--
     <node name="inter-as">
       <properties>
         <help>MPLS traffic engineering inter-AS support</help>
       </properties>
       <children>
         <leafNode name="level-1">
           <properties>
             <help>Area native mode self originate inter-AS LSP with L1 only flooding scope</help>
             <valueless/>
           </properties>
         </leafNode>
         <leafNode name="level-1-2">
           <properties>
             <help>Area native mode self originate inter-AS LSP with L1 and L2 flooding scope</help>
             <valueless/>
           </properties>
         </leafNode>
         <leafNode name="level-2">
           <properties>
             <help>Area native mode self originate inter-AS LSP with L2 only flooding scope</help>
             <valueless/>
           </properties>
         </leafNode>
       </children>
     </node>
     <leafNode name="inter-as">
       <properties>
         <help>MPLS traffic engineering inter-AS support</help>
         <valueless/>
       </properties>
     </leafNode>
 -->
     <leafNode name="address">
       <properties>
         <help>MPLS traffic engineering router ID</help>
         <valueHelp>
           <format>ipv4</format>
           <description>IPv4 address</description>
         </valueHelp>
         <constraint>
           <validator name="ipv4-address"/>
         </constraint>
       </properties>
     </leafNode>
   </children>
 </node>
 <node name="segment-routing">
   <properties>
     <help>Segment-Routing (SPRING) settings</help>
   </properties>
   <children>
     <node name="global-block">
       <properties>
         <help>Segment Routing Global Block label range</help>
       </properties>
       <children>
         #include <include/segment-routing-label-value.xml.i>
       </children>
     </node>
     <node name="local-block">
       <properties>
         <help>Segment Routing Local Block label range</help>
       </properties>
       <children>
         #include <include/segment-routing-label-value.xml.i>
       </children>
     </node>
     <leafNode name="maximum-label-depth">
       <properties>
         <help>Maximum MPLS labels allowed for this router</help>
         <valueHelp>
           <format>u32:1-16</format>
             <description>MPLS label depth</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 1-16"/>
         </constraint>
       </properties>
     </leafNode>
     <tagNode name="prefix">
       <properties>
         <help>Static IPv4/IPv6 prefix segment/label mapping</help>
         <valueHelp>
           <format>ipv4net</format>
           <description>IPv4 prefix segment</description>
         </valueHelp>
         <valueHelp>
           <format>ipv6net</format>
           <description>IPv6 prefix segment</description>
         </valueHelp>
         <constraint>
           <validator name="ipv4-prefix"/>
           <validator name="ipv6-prefix"/>
         </constraint>
       </properties>
       <children>
         <node name="absolute">
           <properties>
             <help>Specify the absolute value of prefix segment/label ID</help>
           </properties>
           <children>
             <leafNode name="value">
               <properties>
                 <help>Specify the absolute value of prefix segment/label ID</help>
                 <valueHelp>
                   <format>u32:16-1048575</format>
                     <description>The absolute segment/label ID value</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 16-1048575"/>
                 </constraint>
               </properties>
             </leafNode>
             <leafNode name="explicit-null">
               <properties>
                 <help>Request upstream neighbor to replace segment/label with explicit null label</help>
                 <valueless/>
               </properties>
             </leafNode>
             <leafNode name="no-php-flag">
               <properties>
                 <help>Do not request penultimate hop popping for segment/label</help>
                 <valueless/>
               </properties>
             </leafNode>
           </children>
         </node>
         <node name="index">
           <properties>
             <help>Specify the index value of prefix segment/label ID</help>
           </properties>
           <children>
             <leafNode name="value">
               <properties>
                 <help>Specify the index value of prefix segment/label ID</help>
                 <valueHelp>
                   <format>u32:0-65535</format>
                     <description>The index segment/label ID value</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 0-65535"/>
                 </constraint>
               </properties>
             </leafNode>
             <leafNode name="explicit-null">
               <properties>
                 <help>Request upstream neighbor to replace segment/label with explicit null label</help>
                 <valueless/>
               </properties>
             </leafNode>
             <leafNode name="no-php-flag">
               <properties>
                 <help>Do not request penultimate hop popping for segment/label</help>
                 <valueless/>
               </properties>
             </leafNode>
           </children>
         </node>
       </children>
     </tagNode>
   </children>
 </node>
 <node name="redistribute">
   <properties>
     <help>Redistribute information from another routing protocol</help>
   </properties>
   <children>
     <node name="ipv4">
       <properties>
         <help>Redistribute IPv4 routes</help>
       </properties>
       <children>
         <node name="bgp">
           <properties>
             <help>Border Gateway Protocol (BGP)</help>
           </properties>
           <children>
             #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
         <node name="connected">
           <properties>
             <help>Redistribute connected routes into IS-IS</help>
           </properties>
           <children>
             #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
         <node name="kernel">
           <properties>
             <help>Redistribute kernel routes into IS-IS</help>
           </properties>
           <children>
             #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
         <node name="ospf">
           <properties>
             <help>Redistribute OSPF routes into IS-IS</help>
           </properties>
           <children>
             #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
         <node name="rip">
           <properties>
             <help>Redistribute RIP routes into IS-IS</help>
           </properties>
           <children>
             #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
+        <node name="babel">
+          <properties>
+            <help>Redistribute Babel routes into IS-IS</help>
+          </properties>
+          <children>
+            #include <include/isis/redistribute-level-1-2.xml.i>
+          </children>
+        </node>
         <node name="static">
           <properties>
             <help>Redistribute static routes into IS-IS</help>
           </properties>
           <children>
             #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
       </children>
     </node>
     <node name="ipv6">
       <properties>
         <help>Redistribute IPv6 routes</help>
       </properties>
       <children>
         <node name="bgp">
           <properties>
             <help>Redistribute BGP routes into IS-IS</help>
           </properties>
           <children>
             #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
         <node name="connected">
           <properties>
             <help>Redistribute connected routes into IS-IS</help>
           </properties>
           <children>
             #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
         <node name="kernel">
           <properties>
             <help>Redistribute kernel routes into IS-IS</help>
           </properties>
           <children>
             #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
         <node name="ospf6">
           <properties>
             <help>Redistribute OSPFv3 routes into IS-IS</help>
           </properties>
           <children>
             #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
         <node name="ripng">
           <properties>
             <help>Redistribute RIPng routes into IS-IS</help>
           </properties>
           <children>
             #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
+        <node name="babel">
+          <properties>
+            <help>Redistribute Babel routes into IS-IS</help>
+          </properties>
+          <children>
+            #include <include/isis/redistribute-level-1-2.xml.i>
+          </children>
+        </node>
         <node name="static">
           <properties>
             <help>Redistribute static routes into IS-IS</help>
           </properties>
           <children>
             #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
       </children>
     </node>
   </children>
 </node>
 <leafNode name="set-attached-bit">
   <properties>
     <help>Set attached bit to identify as L1/L2 router for inter-area traffic</help>
     <valueless/>
   </properties>
 </leafNode>
 <leafNode name="set-overload-bit">
   <properties>
     <help>Set overload bit to avoid any transit traffic</help>
     <valueless/>
   </properties>
 </leafNode>
 <node name="spf-delay-ietf">
   <properties>
     <help>IETF SPF delay algorithm</help>
   </properties>
   <children>
     <leafNode name="init-delay">
       <properties>
         <help>Delay used while in QUIET state</help>
         <valueHelp>
           <format>u32:0-60000</format>
           <description>Delay used while in QUIET state (in ms)</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-60000"/>
         </constraint>
       </properties>
     </leafNode>
     <leafNode name="short-delay">
       <properties>
         <help>Delay used while in SHORT_WAIT state</help>
         <valueHelp>
           <format>u32:0-60000</format>
           <description>Delay used while in SHORT_WAIT state (in ms)</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-60000"/>
         </constraint>
       </properties>
     </leafNode>
     <leafNode name="long-delay">
       <properties>
         <help>Delay used while in LONG_WAIT</help>
         <valueHelp>
           <format>u32:0-60000</format>
           <description>Delay used while in LONG_WAIT state in ms</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-60000"/>
         </constraint>
       </properties>
     </leafNode>
     <leafNode name="holddown">
       <properties>
         <help>Time with no received IGP events before considering IGP stable</help>
         <valueHelp>
           <format>u32:0-60000</format>
           <description>Time with no received IGP events before considering IGP stable in ms</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-60000"/>
         </constraint>
       </properties>
     </leafNode>
     <leafNode name="time-to-learn">
       <properties>
         <help>Maximum duration needed to learn all the events related to a single failure</help>
         <valueHelp>
           <format>u32:0-60000</format>
           <description>Maximum duration needed to learn all the events related to a single failure in ms</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-60000"/>
         </constraint>
       </properties>
     </leafNode>
   </children>
 </node>
 <leafNode name="spf-interval">
   <properties>
     <help>Minimum interval between SPF calculations</help>
     <valueHelp>
       <format>u32:1-120</format>
       <description>Interval in seconds</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 1-120"/>
     </constraint>
   </properties>
 </leafNode>
 <tagNode name="interface">
   <properties>
     <help>Interface params</help>
     <completionHelp>
       <script>${vyos_completion_dir}/list_interfaces.py</script>
     </completionHelp>
   </properties>
   <children>
     #include <include/bfd/bfd.xml.i>
     <leafNode name="circuit-type">
       <properties>
         <help>Configure circuit type for interface</help>
         <completionHelp>
           <list>level-1 level-1-2 level-2-only</list>
         </completionHelp>
         <valueHelp>
           <format>level-1</format>
           <description>Level-1 only adjacencies are formed</description>
         </valueHelp>
         <valueHelp>
           <format>level-1-2</format>
           <description>Level-1-2 adjacencies are formed</description>
         </valueHelp>
         <valueHelp>
           <format>level-2-only</format>
           <description>Level-2 only adjacencies are formed</description>
         </valueHelp>
         <constraint>
           <regex>(level-1|level-1-2|level-2-only)</regex>
         </constraint>
       </properties>
     </leafNode>
     <leafNode name="hello-padding">
       <properties>
         <help>Add padding to IS-IS hello packets</help>
         <valueless/>
       </properties>
     </leafNode>
     <leafNode name="hello-interval">
       <properties>
         <help>Set Hello interval</help>
         <valueHelp>
           <format>u32:1-600</format>
           <description>Set Hello interval</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 1-600"/>
         </constraint>
       </properties>
     </leafNode>
     <leafNode name="hello-multiplier">
       <properties>
         <help>Set Hello interval</help>
         <valueHelp>
           <format>u32:2-100</format>
           <description>Set multiplier for Hello holding time</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 2-100"/>
         </constraint>
       </properties>
     </leafNode>
     #include <include/isis/metric.xml.i>
     <node name="network">
       <properties>
         <help>Set network type</help>
       </properties>
       <children>
         <leafNode name="point-to-point">
           <properties>
             <help>point-to-point network type</help>
             <valueless/>
           </properties>
         </leafNode>
       </children>
     </node>
     #include <include/isis/passive.xml.i>
     <node name="password">
       <properties>
         <help>Configure the authentication password for a circuit</help>
       </properties>
       <children>
         #include <include/isis/password.xml.i>
       </children>
     </node>
     <leafNode name="priority">
       <properties>
         <help>Set priority for Designated Router election</help>
         <valueHelp>
           <format>u32:0-127</format>
           <description>Priority value</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-127"/>
         </constraint>
       </properties>
     </leafNode>
     <leafNode name="psnp-interval">
       <properties>
         <help>Set PSNP interval</help>
         <valueHelp>
           <format>u32:0-127</format>
           <description>PSNP interval in seconds</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-127"/>
         </constraint>
       </properties>
     </leafNode>
     <leafNode name="no-three-way-handshake">
       <properties>
         <help>Disable three-way handshake</help>
         <valueless/>
       </properties>
     </leafNode>
   </children>
 </tagNode>
 #include <include/route-map.xml.i>
-<!-- include end -->
\ No newline at end of file
+<!-- include end -->
diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i
index 06609c10e..16b346131 100644
--- a/interface-definitions/include/ospf/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospf/protocol-common-config.xml.i
@@ -1,868 +1,878 @@
 <!-- include start from ospf/protocol-common-config.xml.i -->
 <tagNode name="access-list">
   <properties>
     <help>Access list to filter networks in routing updates</help>
     <completionHelp>
       <path>policy access-list</path>
     </completionHelp>
     <valueHelp>
       <format>u32</format>
       <description>Access-list number</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 0-4294967295"/>
     </constraint>
   </properties>
   <children>
     <leafNode name="export">
       <properties>
         <help>Filter for outgoing routing update</help>
         <completionHelp>
           <list>bgp connected kernel rip static</list>
         </completionHelp>
         <valueHelp>
           <format>bgp</format>
           <description>Filter BGP routes</description>
         </valueHelp>
         <valueHelp>
           <format>connected</format>
           <description>Filter connected routes</description>
         </valueHelp>
         <valueHelp>
           <format>isis</format>
           <description>Filter IS-IS routes</description>
         </valueHelp>
         <valueHelp>
           <format>kernel</format>
           <description>Filter Kernel routes</description>
         </valueHelp>
         <valueHelp>
           <format>rip</format>
           <description>Filter RIP routes</description>
         </valueHelp>
         <valueHelp>
           <format>static</format>
           <description>Filter static routes</description>
         </valueHelp>
         <constraint>
           <regex>(bgp|connected|isis|kernel|rip|static)</regex>
         </constraint>
         <constraintErrorMessage>Must be bgp, connected, kernel, rip, or static</constraintErrorMessage>
         <multi/>
       </properties>
     </leafNode>
   </children>
 </tagNode>
 <tagNode name="area">
   <properties>
     <help>OSPF area settings</help>
     <valueHelp>
       <format>u32</format>
       <description>OSPF area number in decimal notation</description>
     </valueHelp>
     <valueHelp>
       <format>ipv4</format>
       <description>OSPF area number in dotted decimal notation</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 0-4294967295"/>
       <validator name="ip-address"/>
     </constraint>
   </properties>
   <children>
     <node name="area-type">
       <properties>
         <help>Area type</help>
       </properties>
       <children>
         <leafNode name="normal">
           <properties>
             <help>Normal OSPF area</help>
             <valueless/>
           </properties>
         </leafNode>
         <node name="nssa">
           <properties>
             <help>Not-So-Stubby OSPF area</help>
           </properties>
           <children>
             <leafNode name="default-cost">
               <properties>
                 <help>Summary-default cost of an NSSA area</help>
                 <valueHelp>
                   <format>u32:0-16777215</format>
                   <description>Summary default cost</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 0-16777215"/>
                 </constraint>
               </properties>
             </leafNode>
             <leafNode name="no-summary">
               <properties>
                 <help>Do not inject inter-area routes into stub</help>
                 <valueless/>
               </properties>
             </leafNode>
             <leafNode name="translate">
               <properties>
                 <help>Configure NSSA-ABR</help>
                 <completionHelp>
                   <list>always candidate never</list>
                 </completionHelp>
                 <valueHelp>
                   <format>always</format>
                   <description>Always translate LSA types</description>
                 </valueHelp>
                 <valueHelp>
                   <format>candidate</format>
                   <description>Translate for election</description>
                 </valueHelp>
                 <valueHelp>
                   <format>never</format>
                   <description>Never translate LSA types</description>
                 </valueHelp>
                 <constraint>
                   <regex>(always|candidate|never)</regex>
                 </constraint>
               </properties>
               <defaultValue>candidate</defaultValue>
             </leafNode>
           </children>
         </node>
         <node name="stub">
           <properties>
             <help>Stub OSPF area</help>
           </properties>
           <children>
             <leafNode name="default-cost">
               <properties>
                 <help>Summary-default cost</help>
                 <valueHelp>
                   <format>u32:0-16777215</format>
                   <description>Summary default cost</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 0-16777215"/>
                 </constraint>
               </properties>
             </leafNode>
             <leafNode name="no-summary">
               <properties>
                 <help>Do not inject inter-area routes into the stub</help>
                 <valueless/>
               </properties>
             </leafNode>
           </children>
         </node>
       </children>
     </node>
     <leafNode name="authentication">
       <properties>
         <help>OSPF area authentication type</help>
         <completionHelp>
           <list>plaintext-password md5</list>
         </completionHelp>
         <valueHelp>
           <format>plaintext-password</format>
           <description>Use plain-text authentication</description>
         </valueHelp>
         <valueHelp>
           <format>md5</format>
           <description>Use MD5 authentication</description>
         </valueHelp>
         <constraint>
           <regex>(plaintext-password|md5)</regex>
         </constraint>
       </properties>
     </leafNode>
     <leafNode name="network">
       <properties>
         <help>OSPF network</help>
         <valueHelp>
           <format>ipv4net</format>
           <description>OSPF network</description>
         </valueHelp>
         <constraint>
           <validator name="ipv4-prefix"/>
         </constraint>
         <multi/>
       </properties>
     </leafNode>
     <tagNode name="range">
       <properties>
         <help>Summarize routes matching a prefix (border routers only)</help>
         <valueHelp>
           <format>ipv4net</format>
           <description>Area range prefix</description>
         </valueHelp>
         <constraint>
           <validator name="ipv4-prefix"/>
         </constraint>
       </properties>
       <children>
         <leafNode name="cost">
           <properties>
             <help>Metric for this range</help>
             <valueHelp>
               <format>u32:0-16777215</format>
               <description>Metric for this range</description>
             </valueHelp>
             <constraint>
               <validator name="numeric" argument="--range 0-16777215"/>
             </constraint>
           </properties>
         </leafNode>
         <leafNode name="not-advertise">
           <properties>
             <help>Do not advertise this range</help>
             <valueless/>
           </properties>
         </leafNode>
         <leafNode name="substitute">
           <properties>
             <help>Advertise area range as another prefix</help>
             <valueHelp>
               <format>ipv4net</format>
               <description>Advertise area range as another prefix</description>
             </valueHelp>
             <constraint>
               <validator name="ipv4-prefix"/>
             </constraint>
           </properties>
         </leafNode>
       </children>
     </tagNode>
     <leafNode name="shortcut">
       <properties>
         <help>Area shortcut mode</help>
         <completionHelp>
           <list>default disable enable</list>
         </completionHelp>
         <valueHelp>
           <format>default</format>
           <description>Set default</description>
         </valueHelp>
         <valueHelp>
           <format>disable</format>
           <description>Disable shortcutting mode</description>
         </valueHelp>
         <valueHelp>
           <format>enable</format>
           <description>Enable shortcutting mode</description>
         </valueHelp>
         <constraint>
           <regex>(default|disable|enable)</regex>
         </constraint>
       </properties>
     </leafNode>
     <leafNode name="export-list">
       <properties>
         <help>Set the filter for networks announced to other areas</help>
         <completionHelp>
           <path>policy access-list</path>
         </completionHelp>
         <valueHelp>
           <format>u32</format>
           <description>Access-list number</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-4294967295"/>
         </constraint>
       </properties>
     </leafNode>
     <leafNode name="import-list">
       <properties>
         <help>Set the filter for networks from other areas announced</help>
         <completionHelp>
           <path>policy access-list</path>
         </completionHelp>
         <valueHelp>
           <format>u32</format>
           <description>Access-list number</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-4294967295"/>
         </constraint>
       </properties>
     </leafNode>
     <tagNode name="virtual-link">
       <properties>
         <help>Virtual link</help>
         <valueHelp>
           <format>ipv4</format>
           <description>OSPF area in dotted decimal notation</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-4294967295"/>
           <validator name="ip-address"/>
         </constraint>
       </properties>
       <children>
         #include <include/ospf/authentication.xml.i>
         #include <include/ospf/intervals.xml.i>
       </children>
     </tagNode>
   </children>
 </tagNode>
 #include <include/ospf/auto-cost.xml.i>
 #include <include/ospf/default-information.xml.i>
 <leafNode name="default-metric">
   <properties>
     <help>Metric of redistributed routes</help>
     <valueHelp>
       <format>u32:0-16777214</format>
       <description>Metric of redistributed routes</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 0-16777214"/>
     </constraint>
   </properties>
 </leafNode>
 <leafNode name="maximum-paths">
   <properties>
     <help>Maximum multiple paths (ECMP)</help>
     <valueHelp>
       <format>u32:1-64</format>
       <description>Maximum multiple paths (ECMP)</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 1-64"/>
     </constraint>
   </properties>
 </leafNode>
 <node name="distance">
   <properties>
     <help>Administrative distance</help>
   </properties>
   <children>
     #include <include/ospf/distance-global.xml.i>
     <node name="ospf">
       <properties>
         <help>OSPF administrative distance</help>
       </properties>
       <children>
         #include <include/ospf/distance-per-protocol.xml.i>
       </children>
     </node>
   </children>
 </node>
 <tagNode name="interface">
   <properties>
     <help>Interface configuration</help>
     <completionHelp>
       <script>${vyos_completion_dir}/list_interfaces.py</script>
     </completionHelp>
     <valueHelp>
       <format>txt</format>
       <description>Interface name</description>
     </valueHelp>
     <constraint>
       #include <include/constraint/interface-name.xml.in>
     </constraint>
   </properties>
   <children>
     <leafNode name="area">
       <properties>
         <help>Enable OSPF on this interface</help>
         <completionHelp>
           <path>protocols ospf area</path>
         </completionHelp>
         <valueHelp>
           <format>u32</format>
           <description>OSPF area ID as decimal notation</description>
         </valueHelp>
         <valueHelp>
           <format>ipv4</format>
           <description>OSPF area ID in IP address notation</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-4294967295"/>
           <validator name="ip-address"/>
         </constraint>
       </properties>
     </leafNode>
     #include <include/ospf/authentication.xml.i>
     #include <include/ospf/intervals.xml.i>
     #include <include/ospf/interface-common.xml.i>
     <leafNode name="bandwidth">
       <properties>
         <help>Interface bandwidth (Mbit/s)</help>
         <valueHelp>
           <format>u32:1-100000</format>
           <description>Bandwidth in Megabit/sec (for calculating OSPF cost)</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 1-100000"/>
         </constraint>
       </properties>
     </leafNode>
     <leafNode name="hello-multiplier">
       <properties>
         <help>Hello multiplier factor</help>
         <valueHelp>
           <format>u32:1-10</format>
           <description>Number of Hellos to send each second</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 1-10"/>
         </constraint>
       </properties>
     </leafNode>
     <leafNode name="network">
       <properties>
         <help>Network type</help>
         <completionHelp>
           <list>broadcast non-broadcast point-to-multipoint point-to-point</list>
         </completionHelp>
         <valueHelp>
           <format>broadcast</format>
           <description>Broadcast network type</description>
         </valueHelp>
         <valueHelp>
           <format>non-broadcast</format>
           <description>Non-broadcast network type</description>
         </valueHelp>
         <valueHelp>
           <format>point-to-multipoint</format>
           <description>Point-to-multipoint network type</description>
         </valueHelp>
         <valueHelp>
           <format>point-to-point</format>
           <description>Point-to-point network type</description>
         </valueHelp>
         <constraint>
           <regex>(broadcast|non-broadcast|point-to-multipoint|point-to-point)</regex>
         </constraint>
         <constraintErrorMessage>Must be broadcast, non-broadcast, point-to-multipoint or point-to-point</constraintErrorMessage>
       </properties>
     </leafNode>
     <node name="passive">
       <properties>
         <help>Suppress routing updates on an interface</help>
       </properties>
       <children>
         #include <include/generic-disable-node.xml.i>
       </children>
     </node>
   </children>
 </tagNode>
 #include <include/ospf/log-adjacency-changes.xml.i>
 <node name="max-metric">
   <properties>
     <help>OSPF maximum and infinite-distance metric</help>
   </properties>
   <children>
     <node name="router-lsa">
       <properties>
         <help>Advertise own Router-LSA with infinite distance (stub router)</help>
       </properties>
       <children>
         <leafNode name="administrative">
           <properties>
             <help>Administratively apply, for an indefinite period</help>
             <valueless/>
           </properties>
         </leafNode>
         <leafNode name="on-shutdown">
           <properties>
             <help>Advertise stub-router prior to full shutdown of OSPF</help>
             <valueHelp>
               <format>u32:5-100</format>
               <description>Time (seconds) to advertise self as stub-router</description>
             </valueHelp>
             <constraint>
               <validator name="numeric" argument="--range 5-100"/>
             </constraint>
           </properties>
         </leafNode>
         <leafNode name="on-startup">
           <properties>
             <help>Automatically advertise stub Router-LSA on startup of OSPF</help>
             <valueHelp>
               <format>u32:5-86400</format>
               <description>Time (seconds) to advertise self as stub-router</description>
             </valueHelp>
             <constraint>
               <validator name="numeric" argument="--range 5-86400"/>
             </constraint>
           </properties>
         </leafNode>
       </children>
     </node>
   </children>
 </node>
 <node name="mpls-te">
   <properties>
     <help>MultiProtocol Label Switching-Traffic Engineering (MPLS-TE) parameters</help>
   </properties>
   <children>
     <leafNode name="enable">
       <properties>
         <help>Enable MPLS-TE functionality</help>
         <valueless/>
       </properties>
     </leafNode>
     <leafNode name="router-address">
       <properties>
         <help>Stable IP address of the advertising router</help>
         <valueHelp>
           <format>ipv4</format>
           <description>Stable IP address of the advertising router</description>
         </valueHelp>
         <constraint>
           <validator name="ipv4-address"/>
         </constraint>
       </properties>
       <defaultValue>0.0.0.0</defaultValue>
     </leafNode>
   </children>
 </node>
 <tagNode name="neighbor">
   <properties>
     <help>Specify neighbor router</help>
     <valueHelp>
       <format>ipv4</format>
       <description>Neighbor IP address</description>
     </valueHelp>
     <constraint>
       <validator name="ipv4-address"/>
     </constraint>
   </properties>
   <children>
     <leafNode name="poll-interval">
       <properties>
         <help>Dead neighbor polling interval</help>
         <valueHelp>
           <format>u32:1-65535</format>
           <description>Seconds between dead neighbor polling interval</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 1-65535"/>
         </constraint>
       </properties>
       <defaultValue>60</defaultValue>
     </leafNode>
     <leafNode name="priority">
       <properties>
         <help>Neighbor priority in seconds</help>
         <valueHelp>
           <format>u32:0-255</format>
           <description>Neighbor priority</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-255"/>
         </constraint>
       </properties>
       <defaultValue>0</defaultValue>
     </leafNode>
   </children>
 </tagNode>
 <node name="parameters">
   <properties>
     <help>OSPF specific parameters</help>
   </properties>
   <children>
     <leafNode name="abr-type">
       <properties>
         <help>OSPF ABR type</help>
         <completionHelp>
           <list>cisco ibm shortcut standard</list>
         </completionHelp>
         <valueHelp>
           <format>cisco</format>
           <description>Cisco ABR type</description>
         </valueHelp>
         <valueHelp>
           <format>ibm</format>
           <description>IBM ABR type</description>
         </valueHelp>
         <valueHelp>
           <format>shortcut</format>
           <description>Shortcut ABR type</description>
         </valueHelp>
         <valueHelp>
           <format>standard</format>
           <description>Standard ABR type</description>
         </valueHelp>
         <constraint>
           <regex>(cisco|ibm|shortcut|standard)</regex>
         </constraint>
       </properties>
       <defaultValue>cisco</defaultValue>
     </leafNode>
     <leafNode name="opaque-lsa">
       <properties>
         <help>Enable the Opaque-LSA capability (rfc2370)</help>
         <valueless/>
       </properties>
     </leafNode>
     <leafNode name="rfc1583-compatibility">
       <properties>
         <help>Enable RFC1583 criteria for handling AS external routes</help>
         <valueless/>
       </properties>
     </leafNode>
     #include <include/router-id.xml.i>
   </children>
 </node>
 <leafNode name="passive-interface">
   <properties>
     <help>Suppress routing updates on an interface</help>
     <completionHelp>
       <list>default</list>
     </completionHelp>
     <valueHelp>
       <format>default</format>
       <description>Default to suppress routing updates on all interfaces</description>
     </valueHelp>
     <constraint>
       <regex>(default)</regex>
     </constraint>
   </properties>
 </leafNode>
 <node name="segment-routing">
   <properties>
     <help>Segment-Routing (SPRING) settings</help>
   </properties>
   <children>
     <node name="global-block">
       <properties>
         <help>Segment Routing Global Block label range</help>
       </properties>
       <children>
         #include <include/segment-routing-label-value.xml.i>
       </children>
     </node>
     <node name="local-block">
       <properties>
         <help>Segment Routing Local Block label range</help>
       </properties>
       <children>
         #include <include/segment-routing-label-value.xml.i>
       </children>
     </node>
     <leafNode name="maximum-label-depth">
       <properties>
         <help>Maximum MPLS labels allowed for this router</help>
         <valueHelp>
           <format>u32:1-16</format>
             <description>MPLS label depth</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 1-16"/>
         </constraint>
       </properties>
     </leafNode>
     <tagNode name="prefix">
       <properties>
         <help>Static IPv4 prefix segment/label mapping</help>
         <valueHelp>
           <format>ipv4net</format>
           <description>IPv4 prefix segment</description>
         </valueHelp>
         <constraint>
           <validator name="ipv4-prefix"/>
         </constraint>
       </properties>
       <children>
         <node name="index">
           <properties>
             <help>Specify the index value of prefix segment/label ID</help>
           </properties>
           <children>
             <leafNode name="value">
               <properties>
                 <help>Specify the index value of prefix segment/label ID</help>
                 <valueHelp>
                   <format>u32:0-65535</format>
                     <description>The index segment/label ID value</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 0-65535"/>
                 </constraint>
               </properties>
             </leafNode>
             <leafNode name="explicit-null">
               <properties>
                 <help>Request upstream neighbor to replace segment/label with explicit null label</help>
                 <valueless/>
               </properties>
             </leafNode>
             <leafNode name="no-php-flag">
               <properties>
                 <help>Do not request penultimate hop popping for segment/label</help>
                 <valueless/>
               </properties>
             </leafNode>
           </children>
         </node>
       </children>
     </tagNode>
   </children>
 </node>
 <node name="redistribute">
   <properties>
     <help>Redistribute information from another routing protocol</help>
   </properties>
   <children>
     <node name="bgp">
       <properties>
         <help>Redistribute BGP routes</help>
       </properties>
       <children>
         #include <include/ospf/metric.xml.i>
         #include <include/ospf/metric-type.xml.i>
         #include <include/route-map.xml.i>
       </children>
     </node>
     <node name="connected">
       <properties>
         <help>Redistribute connected routes</help>
       </properties>
       <children>
         #include <include/ospf/metric.xml.i>
         #include <include/ospf/metric-type.xml.i>
         #include <include/route-map.xml.i>
       </children>
     </node>
     <node name="isis">
       <properties>
         <help>Redistribute IS-IS routes</help>
       </properties>
       <children>
         #include <include/ospf/metric.xml.i>
         #include <include/ospf/metric-type.xml.i>
         #include <include/route-map.xml.i>
       </children>
     </node>
     <node name="kernel">
       <properties>
         <help>Redistribute Kernel routes</help>
       </properties>
       <children>
         #include <include/ospf/metric.xml.i>
         #include <include/ospf/metric-type.xml.i>
         #include <include/route-map.xml.i>
       </children>
     </node>
     <node name="rip">
       <properties>
         <help>Redistribute RIP routes</help>
       </properties>
       <children>
         #include <include/ospf/metric.xml.i>
         #include <include/ospf/metric-type.xml.i>
         #include <include/route-map.xml.i>
       </children>
     </node>
+    <node name="babel">
+      <properties>
+        <help>Redistribute Babel routes</help>
+      </properties>
+      <children>
+        #include <include/ospf/metric.xml.i>
+        #include <include/ospf/metric-type.xml.i>
+        #include <include/route-map.xml.i>
+      </children>
+    </node>
     <node name="static">
       <properties>
         <help>Redistribute statically configured routes</help>
       </properties>
       <children>
         #include <include/ospf/metric.xml.i>
         #include <include/ospf/metric-type.xml.i>
         #include <include/route-map.xml.i>
       </children>
     </node>
     <tagNode name="table">
       <properties>
         <help>Redistribute non-main Kernel Routing Table</help>
         <completionHelp>
           <path>protocols static table</path>
         </completionHelp>
         <valueHelp>
           <format>u32:1-200</format>
           <description>Policy route table number</description>
         </valueHelp>
       </properties>
       <children>
         #include <include/ospf/metric.xml.i>
         #include <include/ospf/metric-type.xml.i>
         #include <include/route-map.xml.i>
       </children>
     </tagNode>
   </children>
 </node>
 <node name="refresh">
   <properties>
     <help>Adjust refresh parameters</help>
   </properties>
   <children>
     <leafNode name="timers">
       <properties>
         <help>Refresh timer</help>
         <valueHelp>
           <format>u32:10-1800</format>
           <description>Timer value in seconds</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 10-1800"/>
         </constraint>
       </properties>
     </leafNode>
   </children>
 </node>
 #include <include/route-map.xml.i>
 <node name="timers">
   <properties>
     <help>Adjust routing timers</help>
   </properties>
   <children>
     <node name="throttle">
       <properties>
         <help>Throttling adaptive timers</help>
       </properties>
       <children>
         <node name="spf">
           <properties>
             <help>OSPF SPF timers</help>
           </properties>
           <children>
             <leafNode name="delay">
               <properties>
                 <help>Delay from the first change received to SPF calculation</help>
                 <valueHelp>
                   <format>u32:0-600000</format>
                   <description>Delay in milliseconds</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 0-600000"/>
                 </constraint>
               </properties>
               <defaultValue>200</defaultValue>
             </leafNode>
             <leafNode name="initial-holdtime">
               <properties>
                 <help>Initial hold time between consecutive SPF calculations</help>
                 <valueHelp>
                   <format>u32:0-600000</format>
                   <description>Initial hold time in milliseconds</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 0-600000"/>
                 </constraint>
               </properties>
               <defaultValue>1000</defaultValue>
             </leafNode>
             <leafNode name="max-holdtime">
               <properties>
                 <help>Maximum hold time</help>
                 <valueHelp>
                   <format>u32:0-600000</format>
                   <description>Max hold time in milliseconds</description>
                 </valueHelp>
                 <constraint>
                   <validator name="numeric" argument="--range 0-600000"/>
                 </constraint>
               </properties>
               <defaultValue>10000</defaultValue>
             </leafNode>
           </children>
         </node>
       </children>
     </node>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/ospfv3/protocol-common-config.xml.i b/interface-definitions/include/ospfv3/protocol-common-config.xml.i
index c0aab912d..fd00af95e 100644
--- a/interface-definitions/include/ospfv3/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospfv3/protocol-common-config.xml.i
@@ -1,252 +1,260 @@
 <!-- include start from ospfv3/protocol-common-config.xml.i -->
 <tagNode name="area">
   <properties>
     <help>OSPFv3 Area</help>
     <valueHelp>
       <format>u32</format>
       <description>Area ID as a decimal value</description>
     </valueHelp>
     <valueHelp>
       <format>ipv4</format>
       <description>Area ID in IP address forma</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 0-4294967295"/>
       <validator name="ip-address"/>
     </constraint>
   </properties>
   <children>
     <node name="area-type">
       <properties>
         <help>OSPFv3 Area type</help>
       </properties>
       <children>
         <node name="nssa">
           <properties>
             <help>NSSA OSPFv3 area</help>
           </properties>
           <children>
             <leafNode name="default-information-originate">
               <properties>
                 <help>Originate Type 7 default into NSSA area</help>
                 <valueless/>
               </properties>
             </leafNode>
             #include <include/ospfv3/no-summary.xml.i>
           </children>
         </node>
         <node name="stub">
           <properties>
             <help>Stub OSPFv3 area</help>
           </properties>
           <children>
             #include <include/ospfv3/no-summary.xml.i>
           </children>
         </node>
       </children>
     </node>
     <leafNode name="export-list">
       <properties>
         <help>Name of export-list</help>
         <completionHelp>
           <path>policy access-list6</path>
         </completionHelp>
       </properties>
     </leafNode>
     <leafNode name="import-list">
       <properties>
         <help>Name of import-list</help>
         <completionHelp>
           <path>policy access-list6</path>
         </completionHelp>
       </properties>
     </leafNode>
     <tagNode name="range">
       <properties>
         <help>Specify IPv6 prefix (border routers only)</help>
         <valueHelp>
           <format>ipv6net</format>
           <description>Specify IPv6 prefix (border routers only)</description>
         </valueHelp>
         <constraint>
           <validator name="ipv6-prefix"/>
         </constraint>
       </properties>
       <children>
         <leafNode name="advertise">
           <properties>
             <help>Advertise this range</help>
             <valueless/>
           </properties>
         </leafNode>
         <leafNode name="not-advertise">
           <properties>
             <help>Do not advertise this range</help>
             <valueless/>
           </properties>
         </leafNode>
       </children>
     </tagNode>
   </children>
 </tagNode>
 #include <include/ospf/auto-cost.xml.i>
 #include <include/ospf/default-information.xml.i>
 <node name="distance">
   <properties>
     <help>Administrative distance</help>
   </properties>
   <children>
     #include <include/ospf/distance-global.xml.i>
     <node name="ospfv3">
       <properties>
         <help>OSPFv3 administrative distance</help>
       </properties>
       <children>
         #include <include/ospf/distance-per-protocol.xml.i>
       </children>
     </node>
   </children>
 </node>
 <tagNode name="interface">
   <properties>
     <help>Enable routing on an IPv6 interface</help>
     <completionHelp>
       <script>${vyos_completion_dir}/list_interfaces.py</script>
     </completionHelp>
     <valueHelp>
       <format>txt</format>
       <description>Interface used for routing information exchange</description>
     </valueHelp>
     <constraint>
       #include <include/constraint/interface-name.xml.in>
     </constraint>
   </properties>
   <children>
     <leafNode name="area">
       <properties>
         <help>Enable OSPF on this interface</help>
         <completionHelp>
           <path>protocols ospfv3 area</path>
         </completionHelp>
         <valueHelp>
           <format>u32</format>
           <description>OSPF area ID as decimal notation</description>
         </valueHelp>
         <valueHelp>
           <format>ipv4</format>
           <description>OSPF area ID in IP address notation</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-4294967295"/>
           <validator name="ip-address"/>
         </constraint>
       </properties>
     </leafNode>
     #include <include/ospf/intervals.xml.i>
     #include <include/ospf/interface-common.xml.i>
     <leafNode name="ifmtu">
       <properties>
         <help>Interface MTU</help>
         <valueHelp>
           <format>u32:1-65535</format>
           <description>Interface MTU</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 1-65535"/>
         </constraint>
       </properties>
     </leafNode>
     <leafNode name="instance-id">
       <properties>
         <help>Instance ID</help>
         <valueHelp>
           <format>u32:0-255</format>
           <description>Instance Id</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-255"/>
         </constraint>
       </properties>
       <defaultValue>0</defaultValue>
     </leafNode>
     <leafNode name="network">
       <properties>
         <help>Network type</help>
         <completionHelp>
           <list>broadcast point-to-point</list>
         </completionHelp>
         <valueHelp>
           <format>broadcast</format>
           <description>Broadcast network type</description>
         </valueHelp>
         <valueHelp>
           <format>point-to-point</format>
           <description>Point-to-point network type</description>
         </valueHelp>
         <constraint>
           <regex>(broadcast|point-to-point)</regex>
         </constraint>
         <constraintErrorMessage>Must be broadcast or point-to-point</constraintErrorMessage>
       </properties>
     </leafNode>
     #include <include/isis/passive.xml.i>
   </children>
 </tagNode>
 #include <include/ospf/log-adjacency-changes.xml.i>
 <node name="parameters">
   <properties>
     <help>OSPFv3 specific parameters</help>
   </properties>
   <children>
     #include <include/router-id.xml.i>
   </children>
 </node>
 <node name="redistribute">
   <properties>
     <help>Redistribute information from another routing protocol</help>
   </properties>
   <children>
     <node name="bgp">
       <properties>
         <help>Redistribute BGP routes</help>
       </properties>
       <children>
         #include <include/route-map.xml.i>
       </children>
     </node>
     <node name="connected">
       <properties>
         <help>Redistribute connected routes</help>
       </properties>
       <children>
         #include <include/route-map.xml.i>
       </children>
     </node>
     <node name="kernel">
       <properties>
         <help>Redistribute kernel routes</help>
       </properties>
       <children>
         #include <include/route-map.xml.i>
       </children>
     </node>
     <node name="ripng">
       <properties>
         <help>Redistribute RIPNG routes</help>
       </properties>
       <children>
         #include <include/route-map.xml.i>
       </children>
     </node>
+    <node name="babel">
+      <properties>
+        <help>Redistribute Babel routes</help>
+      </properties>
+      <children>
+        #include <include/route-map.xml.i>
+      </children>
+    </node>
     <node name="static">
       <properties>
         <help>Redistribute static routes</help>
       </properties>
       <children>
         #include <include/route-map.xml.i>
       </children>
     </node>
   </children>
 </node>
 #include <include/route-map.xml.i>
 <!-- include end -->
diff --git a/interface-definitions/protocols-babel.xml.in b/interface-definitions/protocols-babel.xml.in
new file mode 100644
index 000000000..0ef833077
--- /dev/null
+++ b/interface-definitions/protocols-babel.xml.in
@@ -0,0 +1,254 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="protocols">
+    <children>
+      <node name="babel" owner="${vyos_conf_scripts_dir}/protocols_babel.py">
+        <properties>
+          <help>Babel Routing Protocol</help>
+          <priority>650</priority>
+        </properties>
+        <children>
+          <node name="parameters">
+            <properties>
+              <help>Babel-specific parameters</help>
+            </properties>
+            <children>
+              <leafNode name="diversity">
+                <properties>
+                  <help>Enable diversity-aware routing</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+              <leafNode name="diversity-factor">
+                <properties>
+                  <help>Multiplicative factor used for diversity routing</help>
+                  <valueHelp>
+                    <format>u32:1-256</format>
+                    <description>Multiplicative factor, in units of 1/256</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 1-256"/>
+                  </constraint>
+                </properties>
+                <defaultValue>256</defaultValue>
+              </leafNode>
+              <leafNode name="resend-delay">
+                <properties>
+                  <help>Time before resending a message</help>
+                  <valueHelp>
+                    <format>u32:20-655340</format>
+                    <description>Milliseconds</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 20-655340"/>
+                  </constraint>
+                </properties>
+                <defaultValue>2000</defaultValue>
+              </leafNode>
+              <leafNode name="smoothing-half-life">
+                <properties>
+                  <help>Smoothing half-life</help>
+                  <valueHelp>
+                    <format>u32:0-65534</format>
+                    <description>Seconds</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 0-65534"/>
+                  </constraint>
+                </properties>
+                <defaultValue>4</defaultValue>
+              </leafNode>
+            </children>
+          </node>
+          #include <include/babel/interface.xml.i>
+          <node name="redistribute">
+            <properties>
+              <help>Redistribute information from another routing protocol</help>
+            </properties>
+            <children>
+              <node name="ipv4">
+                <properties>
+                  <help>Redistribute IPv4 routes</help>
+                </properties>
+                <children>
+                  <leafNode name="bgp">
+                    <properties>
+                      <help>Redistribute BGP routes</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="connected">
+                    <properties>
+                      <help>Redistribute connected routes</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="eigrp">
+                    <properties>
+                      <help>Redistribute EIGRP routes</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="isis">
+                    <properties>
+                      <help>Redistribute IS-IS routes</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="kernel">
+                    <properties>
+                      <help>Redistribute kernel routes</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="nhrp">
+                    <properties>
+                      <help>Redistribute NHRP routes</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="ospf">
+                    <properties>
+                      <help>Redistribute OSPF routes</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="rip">
+                    <properties>
+                      <help>Redistribute RIP routes</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="static">
+                    <properties>
+                      <help>Redistribute static routes</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+              <node name="ipv6">
+                <properties>
+                  <help>Redistribute IPv6 routes</help>
+                </properties>
+                <children>
+                  <leafNode name="bgp">
+                    <properties>
+                      <help>Redistribute BGP routes</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="connected">
+                    <properties>
+                      <help>Redistribute connected routes</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="isis">
+                    <properties>
+                      <help>Redistribute IS-IS routes</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="kernel">
+                    <properties>
+                      <help>Redistribute kernel routes</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="nhrp">
+                    <properties>
+                      <help>Redistribute NHRP routes</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="ospfv3">
+                    <properties>
+                      <help>Redistribute OSPFv3 routes</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="ripng">
+                    <properties>
+                      <help>Redistribute RIPng routes</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="static">
+                    <properties>
+                      <help>Redistribute static routes</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+            </children>
+          </node>
+          <node name="distribute-list">
+            <properties>
+              <help>Filter networks in routing updates</help>
+            </properties>
+            <children>
+              <node name="ipv4">
+                <properties>
+                  <help>Filter IPv4 routes</help>
+                </properties>
+                <children>
+                  #include <include/rip/access-list.xml.i>
+                  <tagNode name="interface">
+                    <properties>
+                      <help>Apply filtering to an interface</help>
+                      <valueHelp>
+                        <format>txt</format>
+                        <description>Apply filtering to an interface</description>
+                      </valueHelp>
+                      <completionHelp>
+                        <script>${vyos_completion_dir}/list_interfaces.py</script>
+                      </completionHelp>
+                      <constraint>
+                        #include <include/constraint/interface-name.xml.in>
+                      </constraint>
+                    </properties>
+                    <children>
+                      #include <include/rip/access-list.xml.i>
+                      #include <include/rip/prefix-list.xml.i>
+                    </children>
+                  </tagNode>
+                  #include <include/rip/prefix-list.xml.i>
+                </children>
+              </node>
+              <node name="ipv6">
+                <properties>
+                  <help>Filter IPv6 routes</help>
+                </properties>
+                <children>
+                  #include <include/rip/access-list6.xml.i>
+                  <tagNode name="interface">
+                    <properties>
+                      <help>Apply filtering to an interface</help>
+                      <valueHelp>
+                        <format>txt</format>
+                        <description>Apply filtering to an interface</description>
+                      </valueHelp>
+                      <completionHelp>
+                        <script>${vyos_completion_dir}/list_interfaces.py</script>
+                      </completionHelp>
+                      <constraint>
+                        #include <include/constraint/interface-name.xml.in>
+                      </constraint>
+                    </properties>
+                    <children>
+                      #include <include/rip/access-list6.xml.i>
+                      #include <include/rip/prefix-list6.xml.i>
+                    </children>
+                  </tagNode>
+                  #include <include/rip/prefix-list6.xml.i>
+                </children>
+              </node>
+            </children>
+          </node>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/interface-definitions/protocols-rip.xml.in b/interface-definitions/protocols-rip.xml.in
index 33aae5015..b5d48090a 100644
--- a/interface-definitions/protocols-rip.xml.in
+++ b/interface-definitions/protocols-rip.xml.in
@@ -1,251 +1,258 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="protocols">
     <children>
       <node name="rip" owner="${vyos_conf_scripts_dir}/protocols_rip.py">
         <properties>
           <help>Routing Information Protocol (RIP) parameters</help>
           <priority>650</priority>
         </properties>
         <children>
           <leafNode name="default-distance">
             <properties>
               <help>Administrative distance</help>
               <valueHelp>
                 <format>u32:1-255</format>
                 <description>Administrative distance</description>
               </valueHelp>
               <constraint>
                 <validator name="numeric" argument="--range 1-255"/>
               </constraint>
             </properties>
           </leafNode>
           #include <include/rip/default-information.xml.i>
           #include <include/rip/default-metric.xml.i>
           <node name="distribute-list">
             <properties>
               <help>Filter networks in routing updates</help>
             </properties>
             <children>
               #include <include/rip/access-list.xml.i>
               <tagNode name="interface">
                 <properties>
                   <help>Apply filtering to an interface</help>
                   <valueHelp>
                     <format>txt</format>
                     <description>Apply filtering to an interface</description>
                   </valueHelp>
                   <completionHelp>
                     <script>${vyos_completion_dir}/list_interfaces.py</script>
                   </completionHelp>
                   <constraint>
                     #include <include/constraint/interface-name.xml.in>
                   </constraint>
                 </properties>
                 <children>
                   #include <include/rip/access-list.xml.i>
                   #include <include/rip/prefix-list.xml.i>
                 </children>
               </tagNode>
               #include <include/rip/prefix-list.xml.i>
             </children>
           </node>
           #include <include/rip/interface.xml.i>
           <tagNode name="interface">
             <children>
               <node name="authentication">
                 <properties>
                   <help>Authentication</help>
                 </properties>
                 <children>
                   <tagNode name="md5">
                     <properties>
                       <help>MD5 key id</help>
                       <valueHelp>
                         <format>u32:1-255</format>
                         <description>OSPF key id</description>
                       </valueHelp>
                       <constraint>
                         <validator name="numeric" argument="--range 1-255"/>
                       </constraint>
                     </properties>
                     <children>
                       <leafNode name="password">
                         <properties>
                           <help>Authentication password</help>
                           <valueHelp>
                             <format>txt</format>
                             <description>MD5 Key (16 characters or less)</description>
                           </valueHelp>
                           <constraint>
                             <regex>[^[:space:]]{1,16}</regex>
                           </constraint>
                           <constraintErrorMessage>Password must be 16 characters or less</constraintErrorMessage>
                         </properties>
                       </leafNode>
                     </children>
                   </tagNode>
                   <leafNode name="plaintext-password">
                     <properties>
                       <help>Plain text password</help>
                       <valueHelp>
                         <format>txt</format>
                         <description>Plain text password (16 characters or less)</description>
                       </valueHelp>
                       <constraint>
                         <regex>[^[:space:]]{1,16}</regex>
                       </constraint>
                       <constraintErrorMessage>Password must be 16 characters or less</constraintErrorMessage>
                     </properties>
                   </leafNode>
                   </children>
               </node>
               <node name="receive">
                 <properties>
                   <help>Advertisement reception</help>
                 </properties>
                 <children>
                   #include <include/rip/version.xml.i>
                 </children>
               </node>
               <node name="send">
                 <properties>
                   <help>Advertisement transmission</help>
                 </properties>
                 <children>
                   #include <include/rip/version.xml.i>
                 </children>
               </node>
             </children>
           </tagNode>
           <leafNode name="neighbor">
             <properties>
               <help>Neighbor router</help>
               <valueHelp>
                 <format>ipv4</format>
                 <description>Neighbor router</description>
               </valueHelp>
               <constraint>
                 <validator name="ipv4-address"/>
               </constraint>
               <multi/>
             </properties>
           </leafNode>
           <leafNode name="network">
             <properties>
               <help>RIP network</help>
               <valueHelp>
                 <format>ipv4net</format>
                 <description>RIP network</description>
               </valueHelp>
               <constraint>
                 <validator name="ipv4-prefix"/>
               </constraint>
               <multi/>
             </properties>
           </leafNode>
           <tagNode name="network-distance">
             <properties>
               <help>Source network</help>
               <valueHelp>
                 <format>ipv4net</format>
                 <description>Source network</description>
               </valueHelp>
               <constraint>
                 <validator name="ipv4-prefix"/>
               </constraint>
             </properties>
             <children>
               <leafNode name="access-list">
                 <properties>
                   <help>Access list</help>
                   <valueHelp>
                     <format>txt</format>
                     <description>Access list</description>
                   </valueHelp>
                   <completionHelp>
                     <path>policy access-list</path>
                   </completionHelp>
                 </properties>
               </leafNode>
               #include <include/static/static-route-distance.xml.i>
             </children>
           </tagNode>
           #include <include/routing-passive-interface.xml.i>
           <node name="redistribute">
             <properties>
               <help>Redistribute information from another routing protocol</help>
             </properties>
             <children>
               <node name="bgp">
                 <properties>
                   <help>Redistribute BGP routes</help>
                 </properties>
                 <children>
                   #include <include/rip/redistribute.xml.i>
                 </children>
               </node>
               <node name="connected">
                 <properties>
                   <help>Redistribute connected routes</help>
                 </properties>
                 <children>
                   #include <include/rip/redistribute.xml.i>
                 </children>
               </node>
               <node name="isis">
                 <properties>
                   <help>Redistribute IS-IS routes</help>
                 </properties>
                 <children>
                   #include <include/rip/redistribute.xml.i>
                 </children>
               </node>
               <node name="kernel">
                 <properties>
                   <help>Redistribute kernel routes</help>
                 </properties>
                 <children>
                   #include <include/rip/redistribute.xml.i>
                 </children>
               </node>
               <node name="ospf">
                 <properties>
                   <help>Redistribute OSPF routes</help>
                 </properties>
                 <children>
                   #include <include/rip/redistribute.xml.i>
                 </children>
               </node>
               <node name="static">
                 <properties>
                   <help>Redistribute static routes</help>
                 </properties>
                 <children>
                   #include <include/rip/redistribute.xml.i>
                 </children>
               </node>
+              <node name="babel">
+                <properties>
+                  <help>Redistribute Babel routes</help>
+                </properties>
+                <children>
+                  #include <include/rip/redistribute.xml.i>
+                </children>
+              </node>
             </children>
           </node>
           <leafNode name="route">
             <properties>
               <help>RIP static route</help>
               <valueHelp>
                 <format>ipv4net</format>
                 <description>RIP static route</description>
               </valueHelp>
               <constraint>
                 <validator name="ipv4-prefix"/>
               </constraint>
               <multi/>
             </properties>
           </leafNode>
           #include <include/rip/timers.xml.i>
           #include <include/route-map.xml.i>
           #include <include/rip/version.xml.i>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
-
diff --git a/interface-definitions/protocols-ripng.xml.in b/interface-definitions/protocols-ripng.xml.in
index cd35dbf53..cf000b824 100644
--- a/interface-definitions/protocols-ripng.xml.in
+++ b/interface-definitions/protocols-ripng.xml.in
@@ -1,147 +1,155 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="protocols">
     <children>
       <node name="ripng" owner="${vyos_conf_scripts_dir}/protocols_ripng.py">
         <properties>
           <help>Routing Information Protocol (RIPng) parameters</help>
           <priority>660</priority>
         </properties>
         <children>
           <leafNode name="aggregate-address">
             <properties>
               <help>Aggregate RIPng route announcement</help>
               <valueHelp>
                 <format>ipv6net</format>
                 <description>Aggregate RIPng route announcement</description>
               </valueHelp>
               <constraint>
                 <validator name="ipv6-prefix"/>
               </constraint>
               <multi/>
             </properties>
           </leafNode>
           #include <include/rip/default-information.xml.i>
           #include <include/rip/default-metric.xml.i>
           <node name="distribute-list">
             <properties>
               <help>Filter networks in routing updates</help>
             </properties>
             <children>
               #include <include/rip/access-list6.xml.i>
               <tagNode name="interface">
                 <properties>
                   <help>Apply filtering to an interface</help>
                   <valueHelp>
                     <format>txt</format>
                     <description>Apply filtering to an interface</description>
                   </valueHelp>
                   <completionHelp>
                     <script>${vyos_completion_dir}/list_interfaces.py</script>
                   </completionHelp>
                   <constraint>
                     #include <include/constraint/interface-name.xml.in>
                   </constraint>
                 </properties>
                 <children>
                   #include <include/rip/access-list6.xml.i>
                   #include <include/rip/prefix-list6.xml.i>
                 </children>
               </tagNode>
               #include <include/rip/prefix-list6.xml.i>
             </children>
           </node>
           #include <include/rip/interface.xml.i>
           <leafNode name="network">
             <properties>
               <help>RIPng network</help>
               <valueHelp>
                 <format>ipv6net</format>
                 <description>RIPng network</description>
               </valueHelp>
               <constraint>
                 <validator name="ipv6-prefix"/>
               </constraint>
               <multi/>
             </properties>
           </leafNode>
           <leafNode name="passive-interface">
             <properties>
               <help>Passive interface</help>
               <valueHelp>
                 <format>txt</format>
                 <description>Suppress routing updates on interface</description>
               </valueHelp>
               <completionHelp>
                 <script>${vyos_completion_dir}/list_interfaces.py</script>
               </completionHelp>
               <multi/>
             </properties>
           </leafNode>
           <node name="redistribute">
             <properties>
               <help>Redistribute information from another routing protocol</help>
             </properties>
             <children>
               <node name="bgp">
                 <properties>
                   <help>Redistribute BGP routes</help>
                 </properties>
                 <children>
                   #include <include/rip/redistribute.xml.i>
                 </children>
               </node>
               <node name="connected">
                 <properties>
                   <help>Redistribute connected routes</help>
                 </properties>
                 <children>
                   #include <include/rip/redistribute.xml.i>
                 </children>
               </node>
               <node name="kernel">
                 <properties>
                   <help>Redistribute kernel routes</help>
                 </properties>
                 <children>
                   #include <include/rip/redistribute.xml.i>
                 </children>
               </node>
               <node name="ospfv3">
                 <properties>
                   <help>Redistribute OSPFv3 routes</help>
                 </properties>
                 <children>
                   #include <include/rip/redistribute.xml.i>
                 </children>
               </node>
               <node name="static">
                 <properties>
                   <help>Redistribute static routes</help>
                 </properties>
                 <children>
                   #include <include/rip/redistribute.xml.i>
                 </children>
               </node>
+              <node name="babel">
+                <properties>
+                  <help>Redistribute Babel routes</help>
+                </properties>
+                <children>
+                  #include <include/rip/redistribute.xml.i>
+                </children>
+              </node>
             </children>
           </node>
           <leafNode name="route">
             <properties>
               <help>RIPng static route</help>
               <valueHelp>
                 <format>ipv6net</format>
                 <description>RIPng static route</description>
               </valueHelp>
               <constraint>
                 <validator name="ipv6-prefix"/>
               </constraint>
               <multi/>
             </properties>
           </leafNode>
           #include <include/route-map.xml.i>
           #include <include/rip/timers.xml.i>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/restart-frr.xml.in b/op-mode-definitions/restart-frr.xml.in
index 4e2be1bf2..4572858b5 100644
--- a/op-mode-definitions/restart-frr.xml.in
+++ b/op-mode-definitions/restart-frr.xml.in
@@ -1,73 +1,79 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="restart">
     <children>
       <leafNode name="all">
         <properties>
           <help>Restart all routing daemons</help>
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart</command>
       </leafNode>
       <leafNode name="bfd">
         <properties>
           <help>Restart Bidirectional Forwarding Detection (BFD) daemon</help>
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon bfdd</command>
       </leafNode>
       <leafNode name="bgp">
         <properties>
           <help>Restart Border Gateway Protocol (BGP) routing daemon</help>
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon bgpd</command>
       </leafNode>
       <leafNode name="isis">
         <properties>
           <help>Restart Intermediate System to Intermediate System (IS-IS) routing daemon</help>
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon isisd</command>
       </leafNode>
       <leafNode name="ldp">
         <properties>
           <help>Restart the Label Distribution Protocol (LDP) daemon</help>
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon ldpd</command>
       </leafNode>
       <leafNode name="ospf">
         <properties>
           <help>Restart Open Shortest Path First (OSPF) routing daemon</help>
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon ospfd</command>
       </leafNode>
       <leafNode name="ospfv3">
         <properties>
           <help>Restart IPv6 Open Shortest Path First (OSPFv3) routing daemon</help>
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon ospf6d</command>
       </leafNode>
       <leafNode name="rip">
         <properties>
           <help>Restart Routing Information Protocol (RIP) routing daemon</help>
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon ripd</command>
       </leafNode>
       <leafNode name="ripng">
         <properties>
           <help>Restart Routing Information Protocol NG (RIPng) routing daemon</help>
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon ripngd</command>
       </leafNode>
       <leafNode name="static">
         <properties>
           <help>Restart static routing daemon</help>
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon staticd</command>
       </leafNode>
       <leafNode name="zebra">
         <properties>
           <help>Restart Routing Information Base (RIB) manager daemon</help>
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon zebra</command>
       </leafNode>
+      <leafNode name="babel">
+        <properties>
+          <help>Restart Babel routing daemon</help>
+        </properties>
+        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon babeld</command>
+      </leafNode>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-babel.xml.in b/op-mode-definitions/show-babel.xml.in
new file mode 100644
index 000000000..3aac3764e
--- /dev/null
+++ b/op-mode-definitions/show-babel.xml.in
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="show">
+    <children>
+      <node name="babel">
+        <properties>
+          <help>Show Babel routing protocol information</help>
+        </properties>
+        <children>
+          <leafNode name="interface">
+            <properties>
+              <help>Show Babel Interface information</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+          </leafNode>
+          <leafNode name="neighbor">
+            <properties>
+              <help>Show Babel neighbor information</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+          </leafNode>
+          <tagNode name="neighbor">
+            <properties>
+              <help>Show Babel neighbor information for specified interface</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_interfaces.py</script>
+              </completionHelp>
+            </properties>
+            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+          </tagNode>
+          <leafNode name="route">
+            <properties>
+              <help>Show Babel route information</help>
+            </properties>
+            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+          </leafNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/python/vyos/frr.py b/python/vyos/frr.py
index ccb132dd5..a84f183ef 100644
--- a/python/vyos/frr.py
+++ b/python/vyos/frr.py
@@ -1,544 +1,544 @@
 # Copyright 2020 VyOS maintainers and contributors <maintainers@vyos.io>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 r"""
 A Library for interracting with the FRR daemon suite.
 It supports simple configuration manipulation and loading using the official tools
 supplied with FRR (vtysh and frr-reload)
 
 All configuration management and manipulation is done using strings and regex.
 
 
 Example Usage
 #####
 
 # Reading configuration from frr:
 ```
 >>> original_config = get_configuration()
 >>> repr(original_config)
 '!\nfrr version 7.3.1\nfrr defaults traditional\nhostname debian\n......
 ```
 
 
 # Modify a configuration section:
 ```
 >>> new_bgp_section = 'router bgp 65000\n neighbor 192.0.2.1 remote-as 65000\n'
 >>> modified_config = replace_section(original_config, new_bgp_section, replace_re=r'router bgp \d+')
 >>> repr(modified_config)
 '............router bgp 65000\n neighbor 192.0.2.1 remote-as 65000\n...........'
 ```
 
 Remove a configuration section:
 ```
 >>> modified_config = remove_section(original_config, r'router ospf')
 ```
 
 Test the new configuration:
 ```
 >>> try:
 >>>     mark_configuration(modified configuration)
 >>> except ConfigurationNotValid as e:
 >>>     print('resulting configuration is not valid')
 >>>     sys.exit(1)
 ```
 
 Apply the new configuration:
 ```
 >>> try:
 >>>     replace_configuration(modified_config)
 >>> except CommitError as e:
 >>>     print('Exception while commiting the supplied configuration')
 >>>     print(e)
 >>>     exit(1)
 ```
 """
 
 import tempfile
 import re
 from vyos import util
 from vyos.util import chown
 from vyos.util import cmd
 import logging
 from logging.handlers import SysLogHandler
 import os
 import sys
 
 LOG = logging.getLogger(__name__)
 DEBUG = False
 
 ch = SysLogHandler(address='/dev/log')
 ch2 = logging.StreamHandler(stream=sys.stdout)
 LOG.addHandler(ch)
 LOG.addHandler(ch2)
 
 _frr_daemons = ['zebra', 'bgpd', 'fabricd', 'isisd', 'ospf6d', 'ospfd', 'pbrd',
                 'pimd', 'ripd', 'ripngd', 'sharpd', 'staticd', 'vrrpd', 'ldpd',
-                'bfdd', 'eigrpd']
+                'bfdd', 'eigrpd', 'babeld']
 
 path_vtysh = '/usr/bin/vtysh'
 path_frr_reload = '/usr/lib/frr/frr-reload.py'
 path_config = '/run/frr'
 
 default_add_before = r'(ip prefix-list .*|route-map .*|line vty|end)'
 
 class FrrError(Exception):
     pass
 
 
 class ConfigurationNotValid(FrrError):
     """
     The configuratioin supplied to vtysh is not valid
     """
     pass
 
 
 class CommitError(FrrError):
     """
     Commiting the supplied configuration failed to commit by a unknown reason
     see commit error and/or run mark_configuration on the specified configuration
     to se error generated
 
     used by: reload_configuration()
     """
     pass
 
 
 class ConfigSectionNotFound(FrrError):
     """
     Removal of configuration failed because it is not existing in the supplied configuration
     """
     pass
 
 def init_debugging():
     global DEBUG
 
     DEBUG = os.path.exists('/tmp/vyos.frr.debug')
     if DEBUG:
         LOG.setLevel(logging.DEBUG)
 
 def get_configuration(daemon=None, marked=False):
     """ Get current running FRR configuration
     daemon:  Collect only configuration for the specified FRR daemon,
              supplying daemon=None retrieves the complete configuration
     marked:  Mark the configuration with "end" tags
 
     return:  string containing the running configuration from frr
 
     """
     if daemon and daemon not in _frr_daemons:
         raise ValueError(f'The specified daemon type is not supported {repr(daemon)}')
 
     cmd = f"{path_vtysh} -c 'show run'"
     if daemon:
         cmd += f' -d {daemon}'
 
     output, code = util.popen(cmd, stderr=util.STDOUT)
     if code:
         raise OSError(code, output)
 
     config = output.replace('\r', '')
     # Remove first header lines from FRR config
     config = config.split("\n", 3)[-1]
     # Mark the configuration with end tags
     if marked:
         config = mark_configuration(config)
 
     return config
 
 
 def mark_configuration(config):
     """ Add end marks and Test the configuration for syntax faults
     If the configuration is valid a marked version of the configuration is returned,
     or else it failes with a ConfigurationNotValid Exception
 
     config:  The configuration string to mark/test
     return:  The marked configuration from FRR
     """
     output, code = util.popen(f"{path_vtysh} -m -f -", stderr=util.STDOUT, input=config)
 
     if code == 2:
         raise ConfigurationNotValid(str(output))
     elif code:
         raise OSError(code, output)
 
     config = output.replace('\r', '')
     return config
 
 
 def reload_configuration(config, daemon=None):
     """ Execute frr-reload with the new configuration
     This will try to reapply the supplied configuration inside FRR.
     The configuration needs to be a complete configuration from the integrated config or
     from a daemon.
 
     config:  The configuration to apply
     daemon:  Apply the conigutaion to the specified FRR daemon,
              supplying daemon=None applies to the integrated configuration
     return:  None
     """
     if daemon and daemon not in _frr_daemons:
         raise ValueError(f'The specified daemon type is not supported {repr(daemon)}')
 
     f = tempfile.NamedTemporaryFile('w')
     f.write(config)
     f.flush()
 
     LOG.debug(f'reload_configuration: Reloading config using temporary file: {f.name}')
     cmd = f'{path_frr_reload} --reload'
     if daemon:
         cmd += f' --daemon {daemon}'
 
     if DEBUG:
         cmd += f' --debug --stdout'
 
     cmd += f' {f.name}'
 
     LOG.debug(f'reload_configuration: Executing command against frr-reload: "{cmd}"')
     output, code = util.popen(cmd, stderr=util.STDOUT)
     f.close()
     for i, e in enumerate(output.split('\n')):
         LOG.debug(f'frr-reload output: {i:3} {e}')
     if code == 1:
         raise CommitError('FRR configuration failed while running commit. Please ' \
                           'enable debugging to examine logs.\n\n\n' \
                           'To enable debugging run: "touch /tmp/vyos.frr.debug" ' \
                           'and "sudo systemctl stop vyos-configd"')
     elif code:
         raise OSError(code, output)
 
     return output
 
 
 def save_configuration():
     """ T3217: Save FRR configuration to /run/frr/config/frr.conf """
     return cmd(f'{path_vtysh} -n -w')
 
 
 def execute(command):
     """ Run commands inside vtysh
     command:  str containing commands to execute inside a vtysh session
     """
     if not isinstance(command, str):
         raise ValueError(f'command needs to be a string: {repr(command)}')
 
     cmd = f"{path_vtysh} -c '{command}'"
 
     output, code = util.popen(cmd, stderr=util.STDOUT)
     if code:
         raise OSError(code, output)
 
     config = output.replace('\r', '')
     return config
 
 
 def configure(lines, daemon=False):
     """ run commands inside config mode vtysh
     lines:  list or str conaining commands to execute inside a configure session
             only one command executed on each configure()
             Executing commands inside a subcontext uses the list to describe the context
             ex: ['router bgp 6500', 'neighbor 192.0.2.1 remote-as 65000']
     return: None
     """
     if isinstance(lines, str):
         lines = [lines]
     elif not isinstance(lines, list):
         raise ValueError('lines needs to be string or list of commands')
 
     if daemon and daemon not in _frr_daemons:
         raise ValueError(f'The specified daemon type is not supported {repr(daemon)}')
 
     cmd = f'{path_vtysh}'
     if daemon:
         cmd += f' -d {daemon}'
 
     cmd += " -c 'configure terminal'"
     for x in lines:
         cmd += f" -c '{x}'"
 
     output, code = util.popen(cmd, stderr=util.STDOUT)
     if code == 1:
         raise ConfigurationNotValid(f'Configuration FRR failed: {repr(output)}')
     elif code:
         raise OSError(code, output)
 
     config = output.replace('\r', '')
     return config
 
 
 def _replace_section(config, replacement, replace_re, before_re):
     r"""Replace a section of FRR config
     config:      full original configuration
     replacement: replacement configuration section
     replace_re:  The regex to replace
                  example: ^router bgp \d+$.?*^!$
                  this will replace everything between ^router bgp X$ and ^!$
     before_re:   When replace_re is not existant, the config will be added before this tag
                  example: ^line vty$
 
     return:      modified configuration as a text file
     """
     # DEPRECATED, this is replaced by a new implementation
     # Check if block is configured, remove the existing instance else add a new one
     if re.findall(replace_re, config, flags=re.MULTILINE | re.DOTALL):
         # Section is in the configration, replace it
         return re.sub(replace_re, replacement, config, count=1,
                       flags=re.MULTILINE | re.DOTALL)
     if before_re:
         if not re.findall(before_re, config, flags=re.MULTILINE | re.DOTALL):
             raise ConfigSectionNotFound(f"Config section {before_re} not found in config")
 
         # If no section is in the configuration, add it before the line vty line
         return re.sub(before_re, rf'{replacement}\n\g<1>', config, count=1,
                       flags=re.MULTILINE | re.DOTALL)
 
     raise ConfigSectionNotFound(f"Config section {replacement} not found in config")
 
 
 def replace_section(config, replacement, from_re, to_re=r'!', before_re=r'line vty'):
     r"""Replace a section of FRR config
     config:      full original configuration
     replacement: replacement configuration section
     from_re:     Regex for the start of section matching
                  example: 'router bgp \d+'
     to_re:       Regex for stop of section matching
                  default: '!'
                  example: '!'  or  'end'
     before_re:   When from_re/to_re  does not return a match, the config will
                  be added before this tag
                  default: ^line vty$
 
     startline and endline tags will be automatically added to the resulting from_re/to_re and before_re regex'es
     """
     # DEPRECATED, this is replaced by a new implementation
     return _replace_section(config, replacement, replace_re=rf'^{from_re}$.*?^{to_re}$', before_re=rf'^({before_re})$')
 
 
 def remove_section(config, from_re, to_re='!'):
     # DEPRECATED, this is replaced by a new implementation
     return _replace_section(config, '', replace_re=rf'^{from_re}$.*?^{to_re}$', before_re=None)
 
 
 def _find_first_block(config, start_pattern, stop_pattern, start_at=0):
     '''Find start and stop line numbers for a config block
     config:        (list) A list conaining the configuration that is searched
     start_pattern: (raw-str) The pattern searched for a a start of block tag
     stop_pattern:  (raw-str) The pattern searched for to signify the end of the block
     start_at:      (int) The index to start searching at in the <config>
 
     Returns:
         None: No complete block could be found
         set(int, int): A complete block found between the line numbers returned in the set
 
     The object <config> is searched from the start for the regex <start_pattern> until the first match is found.
     On a successful match it continues the search for the regex <stop_pattern> until it is found.
     After a successful run a set is returned containing the start and stop line numbers.
     '''
     LOG.debug(f'_find_first_block: find start={repr(start_pattern)} stop={repr(stop_pattern)} start_at={start_at}')
     _start = None
     for i, element in enumerate(config[start_at:], start=start_at):
         # LOG.debug(f'_find_first_block: running line {i:3} "{element}"')
         if not _start:
             if not re.match(start_pattern, element):
                 LOG.debug(f'_find_first_block: no match     {i:3} "{element}"')
                 continue
             _start = i
             LOG.debug(f'_find_first_block: Found start  {i:3} "{element}"')
             continue
 
         if not re.match(stop_pattern, element):
             LOG.debug(f'_find_first_block: no match     {i:3} "{element}"')
             continue
 
         LOG.debug(f'_find_first_block: Found stop   {i:3} "{element}"')
         return (_start, i)
 
     LOG.debug('_find_first_block: exit start={repr(start_pattern)} stop={repr(stop_pattern)} start_at={start_at}')
     return None
 
 
 def _find_first_element(config, pattern, start_at=0):
     '''Find the first element that matches the current pattern in config
     config:        (list) A list containing the configuration that is searched
     start_pattern: (raw-str) The pattern searched for
     start_at:      (int) The index to start searching at in the <config>
 
     return:   Line index of the line containing the searched pattern
 
     TODO: for now it returns -1 on a no-match because 0 also returns as False
     TODO: that means that we can not use False matching to tell if its
     '''
     LOG.debug(f'_find_first_element: find start="{pattern}" start_at={start_at}')
     for i, element in enumerate(config[start_at:], start=0):
         if re.match(pattern + '$', element):
             LOG.debug(f'_find_first_element: Found stop {i:3} "{element}"')
             return i
         LOG.debug(f'_find_first_element: no match   {i:3} "{element}"')
     LOG.debug(f'_find_first_element: Did not find any match, exiting')
     return -1
 
 
 def _find_elements(config, pattern, start_at=0):
     '''Find all instances of pattern and return a list containing all element indexes
     config:        (list) A list containing the configuration that is searched
     start_pattern: (raw-str) The pattern searched for
     start_at:      (int) The index to start searching at in the <config>
 
     return:    A list of line indexes containing the searched pattern
     TODO: refactor this to return a generator instead
     '''
     return [i for i, element in enumerate(config[start_at:], start=0) if re.match(pattern + '$', element)]
 
 
 class FRRConfig:
     '''Main FRR Configuration manipulation object
     Using this object the user could load, manipulate and commit the configuration to FRR
     '''
     def __init__(self, config=[]):
         self.imported_config = ''
 
         if isinstance(config, list):
             self.config = config.copy()
             self.original_config = config.copy()
         elif isinstance(config, str):
             self.config = config.split('\n')
             self.original_config = self.config.copy()
         else:
             raise ValueError(
                 'The config element needs to be a string or list type object')
 
         if config:
             LOG.debug(f'__init__: frr library initiated with initial config')
             for i, e in enumerate(self.config):
                 LOG.debug(f'__init__: initial              {i:3} {e}')
 
     def load_configuration(self, daemon=None):
         '''Load the running configuration from FRR into the config object
         daemon: str with name of the FRR Daemon to load configuration from or
                 None to load the consolidated config
 
         Using this overwrites the current loaded config objects and replaces the original loaded config
         '''
         init_debugging()
 
         self.imported_config = get_configuration(daemon=daemon)
         if daemon:
             LOG.debug(f'load_configuration: Configuration loaded from FRR daemon {daemon}')
         else:
             LOG.debug(f'load_configuration: Configuration loaded from FRR integrated config')
 
         self.original_config = self.imported_config.split('\n')
         self.config = self.original_config.copy()
 
         for i, e in enumerate(self.imported_config.split('\n')):
             LOG.debug(f'load_configuration:  loaded    {i:3} {e}')
         return
 
     def test_configuration(self):
         '''Test the current configuration against FRR
         This will exception if FRR failes to load the current configuration object
         '''
         LOG.debug('test_configation: Testing configuration')
         mark_configuration('\n'.join(self.config))
 
     def commit_configuration(self, daemon=None):
         '''
         Commit the current configuration to FRR daemon: str with name of the
         FRR daemon to commit to or None to use the consolidated config.
 
         Configuration is automatically saved after apply
         '''
         LOG.debug('commit_configuration:  Commiting configuration')
         for i, e in enumerate(self.config):
             LOG.debug(f'commit_configuration: new_config {i:3} {e}')
 
         # https://github.com/FRRouting/frr/issues/10132
         # https://github.com/FRRouting/frr/issues/10133
         count = 0
         count_max = 5
         while count < count_max:
             count += 1
             try:
                 reload_configuration('\n'.join(self.config), daemon=daemon)
                 break
             except:
                 # we just need to re-try the commit of the configuration
                 # for the listed FRR issues above
                 pass
         if count >= count_max:
             raise ConfigurationNotValid(f'Config commit retry counter ({count_max}) exceeded for {daemon} dameon!')
 
         # Save configuration to /run/frr/config/frr.conf
         save_configuration()
 
 
     def modify_section(self, start_pattern, replacement='!', stop_pattern=r'\S+', remove_stop_mark=False, count=0):
         if isinstance(replacement, str):
             replacement = replacement.split('\n')
         elif not isinstance(replacement, list):
             return ValueError("The replacement element needs to be a string or list type object")
         LOG.debug(f'modify_section: starting search for {repr(start_pattern)} until {repr(stop_pattern)}')
 
         _count = 0
         _next_start = 0
         while True:
             if count and count <= _count:
                 # Break out of the loop after specified amount of matches
                 LOG.debug(f'modify_section: reached limit ({_count}), exiting loop at line {_next_start}')
                 break
             # While searching, always assume that the user wants to search for the exact pattern he entered
             # To be more specific the user needs a override, eg. a "pattern.*"
             _w = _find_first_block(
                 self.config, start_pattern+'$', stop_pattern, start_at=_next_start)
             if not _w:
                 # Reached the end, no more elements to remove
                 LOG.debug(f'modify_section: No more config sections found, exiting')
                 break
             start_element, end_element = _w
             LOG.debug(f'modify_section:   found match between {start_element} and {end_element}')
             for i, e in enumerate(self.config[start_element:end_element+1 if remove_stop_mark else end_element],
                                   start=start_element):
                 LOG.debug(f'modify_section:   remove       {i:3} {e}')
             del self.config[start_element:end_element +
                             1 if remove_stop_mark else end_element]
             if replacement:
                 # Append the replacement config at the current position
                 for i, e in enumerate(replacement, start=start_element):
                     LOG.debug(f'modify_section:   add          {i:3} {e}')
                 self.config[start_element:start_element] = replacement
             _count += 1
             _next_start = start_element + len(replacement)
 
         return _count
 
     def add_before(self, before_pattern, addition):
         '''Add config block before this element in the configuration'''
         if isinstance(addition, str):
             addition = addition.split('\n')
         elif not isinstance(addition, list):
             return ValueError("The replacement element needs to be a string or list type object")
 
         start = _find_first_element(self.config, before_pattern)
         if start < 0:
             return False
         for i, e in enumerate(addition, start=start):
             LOG.debug(f'add_before:   add          {i:3} {e}')
         self.config[start:start] = addition
         return True
 
     def __str__(self):
         return '\n'.join(self.config)
 
     def __repr__(self):
         return f'frr({repr(str(self))})'
diff --git a/src/conf_mode/protocols_babel.py b/src/conf_mode/protocols_babel.py
new file mode 100755
index 000000000..20821c7f2
--- /dev/null
+++ b/src/conf_mode/protocols_babel.py
@@ -0,0 +1,163 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2021-2023 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+
+from sys import exit
+
+from vyos.config import Config
+from vyos.configdict import dict_merge
+from vyos.configdict import node_changed
+from vyos.configverify import verify_common_route_maps
+from vyos.configverify import verify_access_list
+from vyos.configverify import verify_prefix_list
+from vyos.util import dict_search
+from vyos.xml import defaults
+from vyos.template import render_to_string
+from vyos import ConfigError
+from vyos import frr
+from vyos import airbag
+airbag.enable()
+
+def get_config(config=None):
+    if config:
+        conf = config
+    else:
+        conf = Config()
+    base = ['protocols', 'babel']
+    babel = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True)
+
+    # FRR has VRF support for different routing daemons. As interfaces belong
+    # to VRFs - or the global VRF, we need to check for changed interfaces so
+    # that they will be properly rendered for the FRR config. Also this eases
+    # removal of interfaces from the running configuration.
+    interfaces_removed = node_changed(conf, base + ['interface'])
+    if interfaces_removed:
+        babel['interface_removed'] = list(interfaces_removed)
+
+    # Bail out early if configuration tree does not exist
+    if not conf.exists(base):
+        babel.update({'deleted' : ''})
+        return babel
+
+    # We have gathered the dict representation of the CLI, but there are default
+    # options which we need to update into the dictionary retrived.
+    default_values = defaults(base)
+
+    # XXX: T2665: we currently have no nice way for defaults under tag nodes,
+    # clean them out and add them manually :(
+    del default_values['interface']
+
+    # merge in remaining default values
+    babel = dict_merge(default_values, babel)
+
+    # We also need some additional information from the config, prefix-lists
+    # and route-maps for instance. They will be used in verify().
+    #
+    # XXX: one MUST always call this without the key_mangling() option! See
+    # vyos.configverify.verify_common_route_maps() for more information.
+    tmp = conf.get_config_dict(['policy'])
+    # Merge policy dict into "regular" config dict
+    babel = dict_merge(tmp, babel)
+    return babel
+
+def verify(babel):
+    if not babel:
+        return None
+
+    # verify distribute_list
+    if "distribute_list" in babel:
+        acl_keys = {
+            "ipv4": [
+                "distribute_list.ipv4.access_list.in",
+                "distribute_list.ipv4.access_list.out",
+            ],
+            "ipv6": [
+                "distribute_list.ipv6.access_list.in",
+                "distribute_list.ipv6.access_list.out",
+            ]
+        }
+        prefix_list_keys = {
+            "ipv4": [
+                "distribute_list.ipv4.prefix_list.in",
+                "distribute_list.ipv4.prefix_list.out",
+            ],
+            "ipv6":[
+                "distribute_list.ipv6.prefix_list.in",
+                "distribute_list.ipv6.prefix_list.out",
+            ]
+        }
+        for address_family in ["ipv4", "ipv6"]:
+            for iface_key in babel["distribute_list"].get(address_family, {}).get("interface", {}).keys():
+                acl_keys[address_family].extend([
+                    f"distribute_list.{address_family}.interface.{iface_key}.access_list.in",
+                    f"distribute_list.{address_family}.interface.{iface_key}.access_list.out"
+                ])
+                prefix_list_keys[address_family].extend([
+                    f"distribute_list.{address_family}.interface.{iface_key}.prefix_list.in",
+                    f"distribute_list.{address_family}.interface.{iface_key}.prefix_list.out"
+                ])
+
+        for address_family, keys in acl_keys.items():
+            for key in keys:
+                acl = dict_search(key, babel)
+                if acl:
+                    verify_access_list(acl, babel, version='6' if address_family == 'ipv6' else '')
+
+        for address_family, keys in prefix_list_keys.items():
+            for key in keys:
+                prefix_list = dict_search(key, babel)
+                if prefix_list:
+                    verify_prefix_list(prefix_list, babel, version='6' if address_family == 'ipv6' else '')
+
+
+def generate(babel):
+    if not babel or 'deleted' in babel:
+        return None
+
+    babel['new_frr_config'] = render_to_string('frr/babeld.frr.j2', babel)
+    return None
+
+def apply(babel):
+    babel_daemon = 'babeld'
+
+    # Save original configuration prior to starting any commit actions
+    frr_cfg = frr.FRRConfig()
+
+    frr_cfg.load_configuration(babel_daemon)
+    frr_cfg.modify_section('^router babel', stop_pattern='^exit', remove_stop_mark=True)
+
+    for key in ['interface', 'interface_removed']:
+        if key not in babel:
+            continue
+        for interface in babel[key]:
+            frr_cfg.modify_section(f'^interface {interface}', stop_pattern='^exit', remove_stop_mark=True)
+
+    if 'new_frr_config' in babel:
+        frr_cfg.add_before(frr.default_add_before, babel['new_frr_config'])
+    frr_cfg.commit_configuration(babel_daemon)
+
+    return None
+
+if __name__ == '__main__':
+    try:
+        c = get_config()
+        verify(c)
+        generate(c)
+        apply(c)
+    except ConfigError as e:
+        print(e)
+        exit(1)
diff --git a/src/op_mode/restart_frr.py b/src/op_mode/restart_frr.py
index 91b25567a..680d9f8cc 100755
--- a/src/op_mode/restart_frr.py
+++ b/src/op_mode/restart_frr.py
@@ -1,181 +1,181 @@
 #!/usr/bin/env python3
 #
 # Copyright (C) 2019-2021 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 import argparse
 import logging
 import psutil
 
 from logging.handlers import SysLogHandler
 from shutil import rmtree
 
 from vyos.base import Warning
 from vyos.util import call
 from vyos.util import ask_yes_no
 from vyos.util import process_named_running
 from vyos.util import makedir
 
 # some default values
 watchfrr = '/usr/lib/frr/watchfrr.sh'
 vtysh = '/usr/bin/vtysh'
 frrconfig_tmp = '/tmp/frr_restart'
 
 # configure logging
 logger = logging.getLogger(__name__)
 logs_handler = SysLogHandler('/dev/log')
 logs_handler.setFormatter(logging.Formatter('%(filename)s: %(message)s'))
 logger.addHandler(logs_handler)
 logger.setLevel(logging.INFO)
 
 # check if it is safe to restart FRR
 def _check_safety():
     try:
         # print warning
         if not ask_yes_no('WARNING: This is a potentially unsafe function!\n' \
                           'You may lose the connection to the router or active configuration after\n' \
                           'running this command. Use it at your own risk!\n\n'
                           'Continue?'):
             return False
 
         # check if another restart process already running
         if len([process for process in psutil.process_iter(attrs=['pid', 'name', 'cmdline']) if 'python' in process.info['name'] and 'restart_frr.py' in process.info['cmdline'][1]]) > 1:
             message = 'Another restart_frr.py process is already running!'
             logger.error(message)
             if not ask_yes_no(f'\n{message} It is unsafe to continue.\n\n' \
                               'Do you want to process anyway?'):
                 return False
 
         # check if watchfrr.sh is running
         tmp = os.path.basename(watchfrr)
         if process_named_running(tmp):
             message = f'Another {tmp} process is already running.'
             logger.error(message)
             if not ask_yes_no(f'{message} It is unsafe to continue.\n\n' \
                               'Do you want to process anyway?'):
                 return False
 
         # check if vtysh is running
         if process_named_running('vtysh'):
             message = 'vtysh process is executed by another task.'
             logger.error(message)
             if not ask_yes_no(f'{message} It is unsafe to continue.\n\n' \
                               'Do you want to process anyway?'):
                 return False
 
         # check if temporary directory exists
         if os.path.exists(frrconfig_tmp):
             message = f'Temporary directory "{frrconfig_tmp}" already exists!'
             logger.error(message)
             if not ask_yes_no(f'{message} It is unsafe to continue.\n\n' \
                               'Do you want to process anyway?'):
                 return False
 
     except:
         logger.error("Something goes wrong in _check_safety()")
         return False
 
     # return True if all check was passed or user confirmed to ignore they results
     return True
 
 # write active config to file
 def _write_config():
     # create temporary directory
     makedir(frrconfig_tmp)
     # save frr.conf to it
     command = f'{vtysh} -n -w --config_dir {frrconfig_tmp} 2> /dev/null'
     return_code = call(command)
     if return_code != 0:
         logger.error(f'Failed to save active config: "{command}" returned exit code: {return_code}')
         return False
     logger.info(f'Active config saved to {frrconfig_tmp}')
     return True
 
 # clear and remove temporary directory
 def _cleanup():
     if os.path.isdir(frrconfig_tmp):
         rmtree(frrconfig_tmp)
 
 # restart daemon
 def _daemon_restart(daemon):
     command = f'{watchfrr} restart {daemon}'
     return_code = call(command)
     if not return_code == 0:
         logger.error(f'Failed to restart daemon "{daemon}"!')
         return False
 
     # return True if restarted successfully
     logger.info(f'Daemon "{daemon}" restarted!')
     return True
 
 # reload old config
 def _reload_config(daemon):
     if daemon != '':
         command = f'{vtysh} -n -b --config_dir {frrconfig_tmp} -d {daemon} 2> /dev/null'
     else:
         command = f'{vtysh} -n -b --config_dir {frrconfig_tmp} 2> /dev/null'
 
     return_code = call(command)
     if not return_code == 0:
         logger.error('Failed to re-install configuration!')
         return False
 
     # return True if restarted successfully
     logger.info('Configuration re-installed successfully!')
     return True
 
 # define program arguments
 cmd_args_parser = argparse.ArgumentParser(description='restart frr daemons')
 cmd_args_parser.add_argument('--action', choices=['restart'], required=True, help='action to frr daemons')
-cmd_args_parser.add_argument('--daemon', choices=['bfdd', 'bgpd', 'ldpd', 'ospfd', 'ospf6d', 'isisd', 'ripd', 'ripngd', 'staticd', 'zebra'], required=False,  nargs='*', help='select single or multiple daemons')
+cmd_args_parser.add_argument('--daemon', choices=['bfdd', 'bgpd', 'ldpd', 'ospfd', 'ospf6d', 'isisd', 'ripd', 'ripngd', 'staticd', 'zebra', 'babeld'], required=False,  nargs='*', help='select single or multiple daemons')
 # parse arguments
 cmd_args = cmd_args_parser.parse_args()
 
 # main logic
 # restart daemon
 if cmd_args.action == 'restart':
     # check if it is safe to restart FRR
     if not _check_safety():
         print("\nOne of the safety checks was failed or user aborted command. Exiting.")
         exit(1)
 
     if not _write_config():
         print("Failed to save active config")
         _cleanup()
         exit(1)
 
     # a little trick to make further commands more clear
     if not cmd_args.daemon:
         cmd_args.daemon = ['']
 
     # check all daemons if they are running
     if cmd_args.daemon != ['']:
         for daemon in cmd_args.daemon:
             if not process_named_running(daemon):
                 Warning('some of listed daemons are not running!')
 
     # run command to restart daemon
     for daemon in cmd_args.daemon:
         if not _daemon_restart(daemon):
             print('Failed to restart daemon: {daemon}')
             _cleanup()
             exit(1)
         # reinstall old configuration
         _reload_config(daemon)
 
     # cleanup after all actions
     _cleanup()
 
 exit(0)