Merge branch 'vyos:current' into current

74 files changed, 1912 insertions, 242 deletions

diff --git a/interface-definitions/include/accel-ppp/radius-additions.xml.i b/interface-definitions/include/accel-ppp/radius-additions.xml.i
index 5222ba864..b6c88c6e8 100644
--- a/interface-definitions/include/accel-ppp/radius-additions.xml.i
+++ b/interface-definitions/include/accel-ppp/radius-additions.xml.i
@@ -133,17 +133,8 @@
             </valueHelp>
           </properties>
         </leafNode>
+        #include <include/port-number.xml.i>
         <leafNode name="port">
-          <properties>
-            <help>Port for Dynamic Authorization Extension server (DM/CoA)</help>
-            <valueHelp>
-              <format>u32:1-65535</format>
-              <description>TCP port</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-65535"/>
-            </constraint>
-          </properties>
           <defaultValue>1700</defaultValue>
         </leafNode>
         <leafNode name="key">
diff --git a/interface-definitions/include/accel-ppp/thread-count.xml.i b/interface-definitions/include/accel-ppp/thread-count.xml.i
new file mode 100644
index 000000000..84d9224d0
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/thread-count.xml.i
@@ -0,0 +1,27 @@
+<!-- include start from accel-ppp/thread-count.xml.i -->
+<leafNode name="thread-count">
+  <properties>
+    <help>Number of working threads</help>
+    <completionHelp>
+      <list>all half</list>
+    </completionHelp>
+    <valueHelp>
+      <format>all</format>
+      <description>Use all available CPU cores</description>
+    </valueHelp>
+    <valueHelp>
+      <format>half</format>
+      <description>Use half of available CPU cores</description>
+    </valueHelp>
+    <valueHelp>
+      <format>u32:1-512</format>
+      <description>Thread count</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-512"/>
+      <regex>(all|half)</regex>
+    </constraint>
+  </properties>
+  <defaultValue>all</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/babel/redistribute-common.xml.i b/interface-definitions/include/babel/redistribute-common.xml.i
index 93efe68dd..e988cc0d0 100644
--- a/interface-definitions/include/babel/redistribute-common.xml.i
+++ b/interface-definitions/include/babel/redistribute-common.xml.i
@@ -23,6 +23,12 @@
       <valueless/>
     </properties>
   </leafNode>
+  <leafNode name="nhrp">
+    <properties>
+      <help>Redistribute NHRP routes</help>
+      <valueless/>
+    </properties>
+  </leafNode>
   <leafNode name="openfabric">
     <properties>
       <help>OpenFabric Routing Protocol</help>
diff --git a/interface-definitions/include/bgp/afi-redistribute-common-protocols.xml.i b/interface-definitions/include/bgp/afi-redistribute-common-protocols.xml.i
new file mode 100644
index 000000000..3f6517d03
--- /dev/null
+++ b/interface-definitions/include/bgp/afi-redistribute-common-protocols.xml.i
@@ -0,0 +1,62 @@
+<!-- include start from bgp/afi-redistribute-common-protocols.xml.i -->
+<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="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="nhrp">
+  <properties>
+    <help>Redistribute NHRP 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>
+<tagNode name="table">
+  <properties>
+    <help>Redistribute non-main Kernel Routing Table</help>
+    <completionHelp>
+      <path>protocols static table</path>
+    </completionHelp>
+    #include <include/constraint/protocols-static-table.xml.i>
+  </properties>
+  <children>
+    #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
+  </children>
+</tagNode>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-route-map-export-import.xml.i b/interface-definitions/include/bgp/afi-route-map-export-import.xml.i
deleted file mode 100644
index 388991241..000000000
--- a/interface-definitions/include/bgp/afi-route-map-export-import.xml.i
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- include start from bgp/afi-route-map.xml.i -->
-<leafNode name="export">
-  <properties>
-    <help>Route-map to filter outgoing route updates</help>
-    <completionHelp>
-      <path>policy route-map</path>
-    </completionHelp>
-    <valueHelp>
-      <format>txt</format>
-      <description>Route map name</description>
-    </valueHelp>
-    <constraint>
-      #include <include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i>
-    </constraint>
-    <constraintErrorMessage>Name of route-map can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
-  </properties>
-</leafNode>
-<leafNode name="import">
-  <properties>
-    <help>Route-map to filter incoming route updates</help>
-    <completionHelp>
-      <path>policy route-map</path>
-    </completionHelp>
-    <valueHelp>
-      <format>txt</format>
-      <description>Route map name</description>
-    </valueHelp>
-    <constraint>
-      #include <include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i>
-    </constraint>
-    <constraintErrorMessage>Name of route-map can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-route-map-export.xml.i b/interface-definitions/include/bgp/afi-route-map-export.xml.i
new file mode 100644
index 000000000..94d77caf2
--- /dev/null
+++ b/interface-definitions/include/bgp/afi-route-map-export.xml.i
@@ -0,0 +1,18 @@
+<!-- include start from bgp/afi-route-map-export.xml.i -->
+<leafNode name="export">
+  <properties>
+    <help>Route-map to filter outgoing route updates</help>
+    <completionHelp>
+      <path>policy route-map</path>
+    </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Route map name</description>
+    </valueHelp>
+    <constraint>
+      #include <include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i>
+    </constraint>
+    <constraintErrorMessage>Route map names can only contain alphanumeric characters, hyphens, and underscores</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-route-map-import.xml.i b/interface-definitions/include/bgp/afi-route-map-import.xml.i
new file mode 100644
index 000000000..a1b154fcd
--- /dev/null
+++ b/interface-definitions/include/bgp/afi-route-map-import.xml.i
@@ -0,0 +1,18 @@
+<!-- include start from bgp/afi-route-map-import.xml.i -->
+<leafNode name="import">
+  <properties>
+    <help>Route-map to filter incoming route updates</help>
+    <completionHelp>
+      <path>policy route-map</path>
+    </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Route map name</description>
+    </valueHelp>
+    <constraint>
+      #include <include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i>
+    </constraint>
+    <constraintErrorMessage>Name of route-map can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-route-map-vpn.xml.i b/interface-definitions/include/bgp/afi-route-map-vpn.xml.i
index e6be113c5..ac7b55af6 100644
--- a/interface-definitions/include/bgp/afi-route-map-vpn.xml.i
+++ b/interface-definitions/include/bgp/afi-route-map-vpn.xml.i
@@ -9,7 +9,8 @@
         <help>Between current address-family and VPN</help>
       </properties>
       <children>
-        #include <include/bgp/afi-route-map-export-import.xml.i>
+        #include <include/bgp/afi-route-map-export.xml.i>
+        #include <include/bgp/afi-route-map-import.xml.i>
       </children>
     </node>
   </children>
diff --git a/interface-definitions/include/bgp/afi-route-map-vrf.xml.i b/interface-definitions/include/bgp/afi-route-map-vrf.xml.i
new file mode 100644
index 000000000..5c1783bda
--- /dev/null
+++ b/interface-definitions/include/bgp/afi-route-map-vrf.xml.i
@@ -0,0 +1,17 @@
+<!-- include start from bgp/afi-route-map-vrf.xml.i -->
+<node name="route-map">
+  <properties>
+    <help>Route-map to filter route updates to/from this peer</help>
+  </properties>
+  <children>
+    <node name="vrf">
+      <properties>
+        <help>Between current address-family and VRF</help>
+      </properties>
+      <children>
+        #include <include/bgp/afi-route-map-import.xml.i>
+      </children>
+    </node>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-route-map.xml.i b/interface-definitions/include/bgp/afi-route-map.xml.i
index 0b6178176..f8e1d7033 100644
--- a/interface-definitions/include/bgp/afi-route-map.xml.i
+++ b/interface-definitions/include/bgp/afi-route-map.xml.i
@@ -4,7 +4,8 @@
     <help>Route-map to filter route updates to/from this peer</help>
   </properties>
   <children>
-    #include <include/bgp/afi-route-map-export-import.xml.i>
+    #include <include/bgp/afi-route-map-export.xml.i>
+    #include <include/bgp/afi-route-map-import.xml.i>
   </children>
 </node>
 <!-- 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 4953251c5..ab016884e 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -119,6 +119,7 @@
         </tagNode>
         #include <include/bgp/afi-rd.xml.i>
         #include <include/bgp/afi-route-map-vpn.xml.i>
+        #include <include/bgp/afi-route-map-vrf.xml.i>
         #include <include/bgp/afi-route-target-vpn.xml.i>
         #include <include/bgp/afi-nexthop-vpn-export.xml.i>
         <node name="redistribute">
@@ -126,30 +127,7 @@
             <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>
+            #include <include/bgp/afi-redistribute-common-protocols.xml.i>
             <node name="ospf">
               <properties>
                 <help>Redistribute OSPF routes into BGP</help>
@@ -166,27 +144,6 @@
                 #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>
         #include <include/bgp/afi-sid.xml.i>
@@ -503,22 +460,7 @@
             <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>
+            #include <include/bgp/afi-redistribute-common-protocols.xml.i>
             <node name="ospfv3">
               <properties>
                 <help>Redistribute OSPFv3 routes into BGP</help>
@@ -535,27 +477,6 @@
                 #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>
         #include <include/bgp/afi-sid.xml.i>
@@ -1675,6 +1596,12 @@
         <valueless/>
       </properties>
     </leafNode>
+    <leafNode name="no-ipv6-auto-ra">
+      <properties>
+        <help>Disable IPv6 automatic router advertisement</help>
+        <valueless/>
+      </properties>
+    </leafNode>
     <leafNode name="no-suppress-duplicates">
       <properties>
         <help>Disable suppress duplicate updates if the route actually not changed</help>
diff --git a/interface-definitions/include/constraint/interface-name.xml.i b/interface-definitions/include/constraint/interface-name.xml.i
index 3e7c4e667..f64ea86f5 100644
--- a/interface-definitions/include/constraint/interface-name.xml.i
+++ b/interface-definitions/include/constraint/interface-name.xml.i
@@ -1,4 +1,4 @@
 <!-- include start from constraint/interface-name.xml.i -->
-<regex>(bond|br|dum|en|ersp|eth|gnv|ifb|ipoe|lan|l2tp|l2tpeth|macsec|peth|ppp|pppoe|pptp|sstp|sstpc|tun|veth|vti|vtun|vxlan|wg|wlan|wwan)[0-9]+(.\d+)?|lo</regex>
+<regex>(bond|br|dum|en|ersp|eth|gnv|ifb|ipoe|lan|l2tp|l2tpeth|macsec|peth|ppp|pppoe|pptp|sstp|sstpc|tun|veth|vpptap|vpptun|vti|vtun|vxlan|wg|wlan|wwan)[0-9]+(.\d+)?|pod-[-_a-zA-Z0-9]{1,11}|lo</regex>
 <validator name="file-path --lookup-path /sys/class/net --directory"/>
 <!-- include end -->
diff --git a/interface-definitions/include/constraint/protocols-static-table.xml.i b/interface-definitions/include/constraint/protocols-static-table.xml.i
new file mode 100644
index 000000000..2d8b067a4
--- /dev/null
+++ b/interface-definitions/include/constraint/protocols-static-table.xml.i
@@ -0,0 +1,9 @@
+<!-- include start from constraint/host-name.xml.i -->
+<valueHelp>
+  <format>u32:1-200</format>
+  <description>Policy route table number</description>
+</valueHelp>
+<constraint>
+  <validator name="numeric" argument="--range 1-200"/>
+</constraint>
+<!-- include end -->
diff --git a/interface-definitions/include/constraint/wireguard-keys.xml.i b/interface-definitions/include/constraint/wireguard-keys.xml.i
new file mode 100644
index 000000000..f59c86087
--- /dev/null
+++ b/interface-definitions/include/constraint/wireguard-keys.xml.i
@@ -0,0 +1,6 @@
+<!-- include start from constraint/wireguard-keys.xml.i -->
+<constraint>
+  <validator name="base64" argument="--decoded-len 32"/>
+</constraint>
+<constraintErrorMessage>Key must be Base64-encoded with 32 bytes in length</constraintErrorMessage>
+<!-- include end -->
diff --git a/interface-definitions/include/dhcp/ddns-dns-server.xml.i b/interface-definitions/include/dhcp/ddns-dns-server.xml.i
new file mode 100644
index 000000000..ba9f186d0
--- /dev/null
+++ b/interface-definitions/include/dhcp/ddns-dns-server.xml.i
@@ -0,0 +1,19 @@
+<!-- include start from dhcp/ddns-dns-server.xml.i -->
+<tagNode name="dns-server">
+  <properties>
+    <help>DNS server specification</help>
+    <valueHelp>
+      <format>u32:1-999999</format>
+      <description>Number for this DNS server</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-999999"/>
+    </constraint>
+    <constraintErrorMessage>DNS server number must be between 1 and 999999</constraintErrorMessage>
+  </properties>
+  <children>
+    #include <include/address-ipv4-ipv6-single.xml.i>
+    #include <include/port-number.xml.i>
+  </children>
+</tagNode>
+<!-- include end -->
diff --git a/interface-definitions/include/dhcp/ddns-settings.xml.i b/interface-definitions/include/dhcp/ddns-settings.xml.i
new file mode 100644
index 000000000..3e202685e
--- /dev/null
+++ b/interface-definitions/include/dhcp/ddns-settings.xml.i
@@ -0,0 +1,172 @@
+<!-- include start from dhcp/ddns-settings.xml.i -->
+<leafNode name="send-updates">
+    <properties>
+        <help>Enable or disable updates for this scope</help>
+        <completionHelp>
+            <list>enable disable</list>
+        </completionHelp>
+        <valueHelp>
+            <format>enable</format>
+            <description>Enable updates for this scope</description>
+        </valueHelp>
+        <valueHelp>
+            <format>disable</format>
+            <description>Disable updates for this scope</description>
+        </valueHelp>
+        <constraint>
+            <regex>(enable|disable)</regex>
+        </constraint>
+        <constraintErrorMessage>Set it to either enable or disable</constraintErrorMessage>
+    </properties>
+</leafNode>
+<leafNode name="override-client-update">
+    <properties>
+        <help>Always update both forward and reverse DNS data, regardless of the client's request</help>
+        <completionHelp>
+            <list>enable disable</list>
+        </completionHelp>
+        <valueHelp>
+            <format>enable</format>
+            <description>Force update both forward and reverse DNS records</description>
+        </valueHelp>
+        <valueHelp>
+            <format>disable</format>
+            <description>Respect client request settings</description>
+        </valueHelp>
+        <constraint>
+            <regex>(enable|disable)</regex>
+        </constraint>
+        <constraintErrorMessage>Set it to either enable or disable</constraintErrorMessage>
+    </properties>
+</leafNode>
+<leafNode name="override-no-update">
+    <properties>
+        <help>Perform a DDNS update, even if the client instructs the server not to</help>
+        <completionHelp>
+            <list>enable disable</list>
+        </completionHelp>
+        <valueHelp>
+            <format>enable</format>
+            <description>Force DDNS updates regardless of client request</description>
+        </valueHelp>
+        <valueHelp>
+            <format>disable</format>
+            <description>Respect client request settings</description>
+        </valueHelp>
+        <constraint>
+            <regex>(enable|disable)</regex>
+        </constraint>
+        <constraintErrorMessage>Set it to either enable or disable</constraintErrorMessage>
+    </properties>
+</leafNode>
+<leafNode name="replace-client-name">
+    <properties>
+        <help>Replace client name mode</help>
+        <completionHelp>
+            <list>never always when-present when-not-present</list>
+        </completionHelp>
+        <valueHelp>
+            <format>never</format>
+            <description>Use the name the client sent. If the client sent no name, do not generate
+                one</description>
+        </valueHelp>
+        <valueHelp>
+            <format>always</format>
+            <description>Replace the name the client sent. If the client sent no name, generate one
+                for the client</description>
+        </valueHelp>
+        <valueHelp>
+            <format>when-present</format>
+            <description>Replace the name the client sent. If the client sent no name, do not
+                generate one</description>
+        </valueHelp>
+        <valueHelp>
+            <format>when-not-present</format>
+            <description>Use the name the client sent. If the client sent no name, generate one for
+                the client</description>
+        </valueHelp>
+        <constraint>
+            <regex>(never|always|when-present|when-not-present)</regex>
+        </constraint>
+        <constraintErrorMessage>Invalid replace client name mode</constraintErrorMessage>
+    </properties>
+</leafNode>
+<leafNode name="generated-prefix">
+    <properties>
+        <help>The prefix used in the generation of an FQDN</help>
+        <constraint>
+            <validator name="fqdn" />
+        </constraint>
+        <constraintErrorMessage>Invalid generated prefix</constraintErrorMessage>
+    </properties>
+</leafNode>
+<leafNode name="qualifying-suffix">
+    <properties>
+        <help>The suffix used when generating an FQDN, or when qualifying a partial name</help>
+        <constraint>
+            <validator name="fqdn" />
+        </constraint>
+        <constraintErrorMessage>Invalid qualifying suffix</constraintErrorMessage>
+    </properties>
+</leafNode>
+<leafNode name="update-on-renew">
+    <properties>
+        <help>Update DNS record on lease renew</help>
+        <completionHelp>
+            <list>enable disable</list>
+        </completionHelp>
+        <valueHelp>
+            <format>enable</format>
+            <description>Update DNS record on lease renew</description>
+        </valueHelp>
+        <valueHelp>
+            <format>disable</format>
+            <description>Do not update DNS record on lease renew</description>
+        </valueHelp>
+        <constraint>
+            <regex>(enable|disable)</regex>
+        </constraint>
+        <constraintErrorMessage>Set it to either enable or disable</constraintErrorMessage>
+    </properties>
+</leafNode>
+<leafNode name="conflict-resolution">
+    <properties>
+        <help>DNS conflict resolution behavior</help>
+        <completionHelp>
+            <list>enable disable</list>
+        </completionHelp>
+        <valueHelp>
+            <format>enable</format>
+            <description>Enable DNS conflict resolution</description>
+        </valueHelp>
+        <valueHelp>
+            <format>disable</format>
+            <description>Disable DNS conflict resolution</description>
+        </valueHelp>
+        <constraint>
+            <regex>(enable|disable)</regex>
+        </constraint>
+        <constraintErrorMessage>Set it to either enable or disable</constraintErrorMessage>
+    </properties>
+</leafNode>
+<leafNode name="ttl-percent">
+    <properties>
+        <help>Calculate TTL of the DNS record as a percentage of the lease lifetime</help>
+        <constraint>
+            <validator name="numeric" argument="--range 1-100" />
+        </constraint>
+        <constraintErrorMessage>Invalid qualifying suffix</constraintErrorMessage>
+    </properties>
+</leafNode>
+<leafNode name="hostname-char-set">
+    <properties>
+        <help>A regular expression describing the invalid character set in the host name</help>
+    </properties>
+</leafNode>
+<leafNode name="hostname-char-replacement">
+    <properties>
+        <help>A string of zero or more characters with which to replace each invalid character in
+            the host name</help>
+    </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/dhcp/dhcp-server-common-config.xml.i b/interface-definitions/include/dhcp/dhcp-server-common-config.xml.i
new file mode 100644
index 000000000..60eb01489
--- /dev/null
+++ b/interface-definitions/include/dhcp/dhcp-server-common-config.xml.i
@@ -0,0 +1,342 @@
+<!-- include start from dhcp/dhcp-server-common-config.xml.i -->
+#include <include/generic-disable-node.xml.i>
+<node name="dynamic-dns-update">
+  <properties>
+    <help>Dynamically update Domain Name System (RFC4702)</help>
+  </properties>
+  <children>
+    #include <include/dhcp/ddns-settings.xml.i>
+    <tagNode name="tsig-key">
+      <properties>
+        <help>TSIG key definition for DNS updates</help>
+        <constraint>
+          #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
+        </constraint>
+        <constraintErrorMessage>Invalid TSIG key name. May only contain letters, numbers, hyphen and underscore</constraintErrorMessage>
+      </properties>
+      <children>
+        <leafNode name="algorithm">
+          <properties>
+            <help>TSIG key algorithm</help>
+            <completionHelp>
+              <list>md5 sha1 sha224 sha256 sha384 sha512</list>
+            </completionHelp>
+            <valueHelp>
+              <format>md5</format>
+              <description>MD5 HMAC algorithm</description>
+            </valueHelp>
+            <valueHelp>
+              <format>sha1</format>
+              <description>SHA1 HMAC algorithm</description>
+            </valueHelp>
+            <valueHelp>
+              <format>sha224</format>
+              <description>SHA224 HMAC algorithm</description>
+            </valueHelp>
+            <valueHelp>
+              <format>sha256</format>
+              <description>SHA256 HMAC algorithm</description>
+            </valueHelp>
+            <valueHelp>
+              <format>sha384</format>
+              <description>SHA384 HMAC algorithm</description>
+            </valueHelp>
+            <valueHelp>
+              <format>sha512</format>
+              <description>SHA512 HMAC algorithm</description>
+            </valueHelp>
+            <constraint>
+              <regex>(md5|sha1|sha224|sha256|sha384|sha512)</regex>
+            </constraint>
+            <constraintErrorMessage>Invalid TSIG key algorithm</constraintErrorMessage>
+          </properties>
+        </leafNode>
+        <leafNode name="secret">
+          <properties>
+            <help>TSIG key secret (base64-encoded)</help>
+            <constraint>
+              <validator name="base64"/>
+            </constraint>
+          </properties>
+        </leafNode>
+      </children>
+    </tagNode>
+    <tagNode name="forward-domain">
+      <properties>
+        <help>Forward DNS domain name</help>
+        <constraint>
+          <validator name="fqdn"/>
+        </constraint>
+        <constraintErrorMessage>Invalid forward DNS domain name</constraintErrorMessage>
+      </properties>
+      <children>
+        <leafNode name="key-name">
+          <properties>
+            <help>TSIG key name for forward DNS updates</help>
+            <constraint>
+              #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
+            </constraint>
+            <constraintErrorMessage>Invalid TSIG key name. May only contain letters, numbers, numbers, hyphen and underscore</constraintErrorMessage>
+          </properties>
+        </leafNode>
+        #include <include/dhcp/ddns-dns-server.xml.i>
+      </children>
+    </tagNode>
+    <tagNode name="reverse-domain">
+      <properties>
+        <help>Reverse DNS domain name</help>
+        <constraint>
+          <validator name="fqdn"/>
+        </constraint>
+        <constraintErrorMessage>Invalid reverse DNS domain name</constraintErrorMessage>
+      </properties>
+      <children>
+        <leafNode name="key-name">
+          <properties>
+            <help>TSIG key name for reverse DNS updates</help>
+            <constraint>
+              #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
+            </constraint>
+            <constraintErrorMessage>Invalid TSIG key name. May only contain letters, numbers, numbers, hyphen and underscore</constraintErrorMessage>
+          </properties>
+        </leafNode>
+        #include <include/dhcp/ddns-dns-server.xml.i>
+      </children>
+    </tagNode>
+  </children>
+</node>
+<node name="high-availability">
+  <properties>
+    <help>DHCP high availability configuration</help>
+  </properties>
+  <children>
+    #include <include/source-address-ipv4.xml.i>
+    <leafNode name="mode">
+      <properties>
+        <help>Configure high availability mode</help>
+        <completionHelp>
+          <list>active-active active-passive</list>
+        </completionHelp>
+        <valueHelp>
+          <format>active-active</format>
+          <description>Both server attend DHCP requests</description>
+        </valueHelp>
+        <valueHelp>
+          <format>active-passive</format>
+          <description>Only primary server attends DHCP requests</description>
+        </valueHelp>
+        <constraint>
+          <regex>(active-active|active-passive)</regex>
+        </constraint>
+        <constraintErrorMessage>Invalid DHCP high availability mode</constraintErrorMessage>
+      </properties>
+      <defaultValue>active-active</defaultValue>
+    </leafNode>
+    <leafNode name="remote">
+      <properties>
+        <help>IPv4 remote address used for connection</help>
+        <valueHelp>
+          <format>ipv4</format>
+          <description>IPv4 address of high availability peer</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv4-address"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="name">
+      <properties>
+        <help>Peer name used to identify connection</help>
+        <constraint>
+          #include <include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i>
+        </constraint>
+        <constraintErrorMessage>Invalid failover peer name. May only contain letters, numbers and .-_</constraintErrorMessage>
+      </properties>
+    </leafNode>
+    <leafNode name="status">
+      <properties>
+        <help>High availability hierarchy</help>
+        <completionHelp>
+          <list>primary secondary</list>
+        </completionHelp>
+        <valueHelp>
+          <format>primary</format>
+          <description>Configure this server to be the primary node</description>
+        </valueHelp>
+        <valueHelp>
+          <format>secondary</format>
+          <description>Configure this server to be the secondary node</description>
+        </valueHelp>
+        <constraint>
+          <regex>(primary|secondary)</regex>
+        </constraint>
+        <constraintErrorMessage>Invalid DHCP high availability peer status</constraintErrorMessage>
+      </properties>
+    </leafNode>
+    #include <include/pki/ca-certificate.xml.i>
+    #include <include/pki/certificate.xml.i>
+  </children>
+</node>
+<leafNode name="hostfile-update">
+  <properties>
+    <help>Updating /etc/hosts file (per client lease)</help>
+    <valueless/>
+  </properties>
+</leafNode>
+#include <include/listen-address-ipv4.xml.i>
+#include <include/listen-interface-multi-broadcast.xml.i>
+<tagNode name="shared-network-name">
+  <properties>
+    <help>Name of DHCP shared network</help>
+    <constraint>
+      #include <include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i>
+    </constraint>
+    <constraintErrorMessage>Invalid shared network name. May only contain letters, numbers and .-_</constraintErrorMessage>
+  </properties>
+  <children>
+    <node name="dynamic-dns-update">
+      <properties>
+        <help>Dynamically update Domain Name System (RFC4702)</help>
+      </properties>
+      <children>
+        #include <include/dhcp/ddns-settings.xml.i>
+      </children>
+    </node>
+    <leafNode name="authoritative">
+      <properties>
+        <help>Option to make DHCP server authoritative for this physical network</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    #include <include/dhcp/option-v4.xml.i>
+    #include <include/dhcp/ping-check.xml.i>
+    #include <include/generic-description.xml.i>
+    #include <include/generic-disable-node.xml.i>
+    <tagNode name="subnet">
+      <properties>
+        <help>DHCP subnet for shared network</help>
+        <valueHelp>
+          <format>ipv4net</format>
+          <description>IPv4 address and prefix length</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv4-prefix"/>
+        </constraint>
+        <constraintErrorMessage>Invalid IPv4 subnet definition</constraintErrorMessage>
+      </properties>
+      <children>
+        #include <include/dhcp/option-v4.xml.i>
+        #include <include/dhcp/ping-check.xml.i>
+        #include <include/generic-description.xml.i>
+        #include <include/generic-disable-node.xml.i>
+        <node name="dynamic-dns-update">
+          <properties>
+            <help>Dynamically update Domain Name System (RFC4702)</help>
+          </properties>
+          <children>
+            #include <include/dhcp/ddns-settings.xml.i>
+          </children>
+        </node>
+        <leafNode name="exclude">
+          <properties>
+            <help>IP address to exclude from DHCP lease range</help>
+            <valueHelp>
+              <format>ipv4</format>
+              <description>IPv4 address to exclude from lease range</description>
+            </valueHelp>
+            <constraint>
+              <validator name="ipv4-address"/>
+            </constraint>
+            <multi/>
+          </properties>
+        </leafNode>
+        <leafNode name="ignore-client-id">
+          <properties>
+            <help>Ignore client identifier for lease lookups</help>
+            <valueless/>
+          </properties>
+        </leafNode>
+        <leafNode name="lease">
+          <properties>
+            <help>Lease timeout in seconds</help>
+            <valueHelp>
+              <format>u32</format>
+              <description>DHCP lease time in seconds</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 0-4294967295"/>
+            </constraint>
+            <constraintErrorMessage>DHCP lease time must be between 0 and 4294967295 (49 days)</constraintErrorMessage>
+          </properties>
+          <defaultValue>86400</defaultValue>
+        </leafNode>
+        <tagNode name="range">
+          <properties>
+            <help>DHCP lease range</help>
+            <constraint>
+              #include <include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i>
+            </constraint>
+            <constraintErrorMessage>Invalid range name, may only be alphanumeric, dot and hyphen</constraintErrorMessage>
+          </properties>
+          <children>
+            #include <include/dhcp/option-v4.xml.i>
+            <leafNode name="start">
+              <properties>
+                <help>First IP address for DHCP lease range</help>
+                <valueHelp>
+                  <format>ipv4</format>
+                  <description>IPv4 start address of pool</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="ipv4-address"/>
+                </constraint>
+              </properties>
+            </leafNode>
+            <leafNode name="stop">
+              <properties>
+                <help>Last IP address for DHCP lease range</help>
+                <valueHelp>
+                  <format>ipv4</format>
+                  <description>IPv4 end address of pool</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="ipv4-address"/>
+                </constraint>
+              </properties>
+            </leafNode>
+          </children>
+        </tagNode>
+        <tagNode name="static-mapping">
+          <properties>
+            <help>Hostname for static mapping reservation</help>
+            <constraint>
+              <validator name="fqdn"/>
+            </constraint>
+            <constraintErrorMessage>Invalid static mapping hostname</constraintErrorMessage>
+          </properties>
+          <children>
+            #include <include/dhcp/option-v4.xml.i>
+            #include <include/generic-description.xml.i>
+            #include <include/generic-disable-node.xml.i>
+            #include <include/ip-address.xml.i>
+            #include <include/interface/mac.xml.i>
+            #include <include/interface/duid.xml.i>
+          </children>
+        </tagNode>
+        <leafNode name="subnet-id">
+          <properties>
+            <help>Unique ID mapped to leases in the lease file</help>
+            <valueHelp>
+              <format>u32</format>
+              <description>Unique subnet ID</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 1-4294967295"/>
+            </constraint>
+          </properties>
+        </leafNode>
+      </children>
+    </tagNode>
+  </children>
+</tagNode>
+<!-- include end -->
diff --git a/interface-definitions/include/dhcp/dhcpv6-server-common-config.xml.i b/interface-definitions/include/dhcp/dhcpv6-server-common-config.xml.i
new file mode 100644
index 000000000..798ecac4b
--- /dev/null
+++ b/interface-definitions/include/dhcp/dhcpv6-server-common-config.xml.i
@@ -0,0 +1,276 @@
+<!-- include start from dhcp/dhcpv6-server-common-config.xml.i -->
+#include <include/generic-disable-node.xml.i>
+#include <include/listen-interface-multi-broadcast.xml.i>
+<leafNode name="disable-route-autoinstall">
+  <properties>
+    <help>Do not install routes for delegated prefixes</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<node name="global-parameters">
+  <properties>
+    <help>Additional global parameters for DHCPv6 server</help>
+  </properties>
+  <children>
+    #include <include/name-server-ipv6.xml.i>
+  </children>
+</node>
+<leafNode name="preference">
+  <properties>
+    <help>Preference of this DHCPv6 server compared with others</help>
+    <valueHelp>
+      <format>u32:0-255</format>
+      <description>DHCPv6 server preference (0-255)</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-255"/>
+    </constraint>
+    <constraintErrorMessage>Preference must be between 0 and 255</constraintErrorMessage>
+  </properties>
+</leafNode>
+<tagNode name="shared-network-name">
+  <properties>
+    <help>DHCPv6 shared network name</help>
+    <constraint>
+      #include <include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i>
+    </constraint>
+    <constraintErrorMessage>Invalid DHCPv6 shared network name. May only contain letters, numbers and .-_</constraintErrorMessage>
+  </properties>
+  <children>
+    #include <include/generic-disable-node.xml.i>
+    #include <include/generic-description.xml.i>
+    #include <include/generic-interface.xml.i>
+    #include <include/dhcp/option-v6.xml.i>
+    <tagNode name="subnet">
+      <properties>
+        <help>IPv6 DHCP subnet for this shared network</help>
+        <valueHelp>
+          <format>ipv6net</format>
+          <description>IPv6 address and prefix length</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv6-prefix"/>
+        </constraint>
+      </properties>
+      <children>
+        #include <include/dhcp/option-v6.xml.i>
+        #include <include/generic-interface.xml.i>
+        <tagNode name="range">
+          <properties>
+            <help>Parameters setting ranges for assigning IPv6 addresses</help>
+            <constraint>
+              #include <include/constraint/alpha-numeric-hyphen-underscore-dot.xml.i>
+            </constraint>
+            <constraintErrorMessage>Invalid range name, may only be alphanumeric, dot and hyphen</constraintErrorMessage>
+          </properties>
+          <children>
+            #include <include/dhcp/option-v6.xml.i>
+            <leafNode name="prefix">
+              <properties>
+                <help>IPv6 prefix defining range of addresses to assign</help>
+                <valueHelp>
+                  <format>ipv6net</format>
+                  <description>IPv6 address and prefix length</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="ipv6-prefix"/>
+                </constraint>
+              </properties>
+            </leafNode>
+            <leafNode name="start">
+              <properties>
+                <help>First in range of consecutive IPv6 addresses to assign</help>
+                <valueHelp>
+                  <format>ipv6</format>
+                  <description>IPv6 address</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="ipv6-address"/>
+                </constraint>
+              </properties>
+            </leafNode>
+            <leafNode name="stop">
+              <properties>
+                <help>Last in range of consecutive IPv6 addresses</help>
+                <valueHelp>
+                  <format>ipv6</format>
+                  <description>IPv6 address</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="ipv6-address"/>
+                </constraint>
+              </properties>
+            </leafNode>
+          </children>
+        </tagNode>
+        <node name="lease-time">
+          <properties>
+            <help>Parameters relating to the lease time</help>
+          </properties>
+          <children>
+            <leafNode name="default">
+              <properties>
+                <help>Default time (in seconds) that will be assigned to a lease</help>
+                <valueHelp>
+                  <format>u32:1-4294967295</format>
+                  <description>DHCPv6 valid lifetime</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="numeric" argument="--range 1-4294967295"/>
+                </constraint>
+              </properties>
+            </leafNode>
+            <leafNode name="maximum">
+              <properties>
+                <help>Maximum time (in seconds) that will be assigned to a lease</help>
+                <valueHelp>
+                  <format>u32:1-4294967295</format>
+                  <description>Maximum lease time in seconds</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="numeric" argument="--range 1-4294967295"/>
+                </constraint>
+              </properties>
+            </leafNode>
+            <leafNode name="minimum">
+              <properties>
+                <help>Minimum time (in seconds) that will be assigned to a lease</help>
+                <valueHelp>
+                  <format>u32:1-4294967295</format>
+                  <description>Minimum lease time in seconds</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="numeric" argument="--range 1-4294967295"/>
+                </constraint>
+              </properties>
+            </leafNode>
+          </children>
+        </node>
+        <node name="prefix-delegation">
+          <properties>
+            <help>Parameters relating to IPv6 prefix delegation</help>
+          </properties>
+          <children>
+            <tagNode name="prefix">
+              <properties>
+                <help>IPv6 prefix to be used in prefix delegation</help>
+                <valueHelp>
+                  <format>ipv6</format>
+                  <description>IPv6 prefix used in prefix delegation</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="ipv6-address"/>
+                </constraint>
+              </properties>
+              <children>
+                <leafNode name="prefix-length">
+                  <properties>
+                    <help>Length in bits of prefix</help>
+                    <valueHelp>
+                      <format>u32:32-64</format>
+                      <description>Prefix length (32-64)</description>
+                    </valueHelp>
+                    <constraint>
+                      <validator name="numeric" argument="--range 32-64"/>
+                    </constraint>
+                    <constraintErrorMessage>Prefix length must be between 32 and 64</constraintErrorMessage>
+                  </properties>
+                </leafNode>
+                <leafNode name="delegated-length">
+                  <properties>
+                    <help>Length in bits of prefixes to be delegated</help>
+                    <valueHelp>
+                      <format>u32:32-64</format>
+                      <description>Delegated prefix length (32-64)</description>
+                    </valueHelp>
+                    <constraint>
+                      <validator name="numeric" argument="--range 32-96"/>
+                    </constraint>
+                    <constraintErrorMessage>Delegated prefix length must be between 32 and 96</constraintErrorMessage>
+                  </properties>
+                </leafNode>
+                <leafNode name="excluded-prefix">
+                  <properties>
+                    <help>IPv6 prefix to be excluded from prefix delegation</help>
+                    <valueHelp>
+                      <format>ipv6</format>
+                      <description>IPv6 prefix excluded from prefix delegation</description>
+                    </valueHelp>
+                    <constraint>
+                      <validator name="ipv6-address"/>
+                    </constraint>
+                  </properties>
+                </leafNode>
+                <leafNode name="excluded-prefix-length">
+                  <properties>
+                    <help>Length in bits of excluded prefix</help>
+                    <valueHelp>
+                      <format>u32:33-64</format>
+                      <description>Excluded prefix length (33-128)</description>
+                    </valueHelp>
+                    <constraint>
+                      <validator name="numeric" argument="--range 33-128"/>
+                    </constraint>
+                    <constraintErrorMessage>Prefix length must be between 33 and 128</constraintErrorMessage>
+                  </properties>
+                </leafNode>
+              </children>
+            </tagNode>
+          </children>
+        </node>
+        <tagNode name="static-mapping">
+          <properties>
+            <help>Hostname for static mapping reservation</help>
+            <constraint>
+              <validator name="fqdn"/>
+            </constraint>
+            <constraintErrorMessage>Invalid static mapping hostname</constraintErrorMessage>
+          </properties>
+          <children>
+            #include <include/dhcp/option-v6.xml.i>
+            #include <include/generic-disable-node.xml.i>
+            #include <include/interface/mac.xml.i>
+            #include <include/interface/duid.xml.i>
+            <leafNode name="ipv6-address">
+              <properties>
+                <help>Client IPv6 address for this static mapping</help>
+                <valueHelp>
+                  <format>ipv6</format>
+                  <description>IPv6 address for this static mapping</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="ipv6-address"/>
+                </constraint>
+              </properties>
+            </leafNode>
+            <leafNode name="ipv6-prefix">
+              <properties>
+                <help>Client IPv6 prefix for this static mapping</help>
+                <valueHelp>
+                  <format>ipv6net</format>
+                  <description>IPv6 prefix for this static mapping</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="ipv6-prefix"/>
+                </constraint>
+              </properties>
+            </leafNode>
+          </children>
+        </tagNode>
+        <leafNode name="subnet-id">
+          <properties>
+            <help>Unique ID mapped to leases in the lease file</help>
+            <valueHelp>
+              <format>u32</format>
+              <description>Unique subnet ID</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 1-4294967295"/>
+            </constraint>
+          </properties>
+        </leafNode>
+      </children>
+    </tagNode>
+  </children>
+</tagNode>
+<!-- include end -->
diff --git a/interface-definitions/include/dhcp/option-v4.xml.i b/interface-definitions/include/dhcp/option-v4.xml.i
index bd6fc6043..08fbcca4a 100644
--- a/interface-definitions/include/dhcp/option-v4.xml.i
+++ b/interface-definitions/include/dhcp/option-v4.xml.i
@@ -59,6 +59,18 @@
         <constraintErrorMessage>DHCP client prefix length must be 0 to 32</constraintErrorMessage>
       </properties>
     </leafNode>
+    <leafNode name="capwap-controller">
+      <properties>
+        <help>IP address of CAPWAP access controller (Option 138)</help>
+        <valueHelp>
+          <format>ipv4</format>
+          <description>CAPWAP AC controller</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv4-address"/>
+        </constraint>
+      </properties>
+    </leafNode>
     <leafNode name="default-router">
       <properties>
         <help>IP address of default router</help>
diff --git a/interface-definitions/include/dhcp/option-v6.xml.i b/interface-definitions/include/dhcp/option-v6.xml.i
index e1897f52d..202843ddf 100644
--- a/interface-definitions/include/dhcp/option-v6.xml.i
+++ b/interface-definitions/include/dhcp/option-v6.xml.i
@@ -7,6 +7,18 @@
     #include <include/dhcp/captive-portal.xml.i>
     #include <include/dhcp/domain-search.xml.i>
     #include <include/name-server-ipv6.xml.i>
+    <leafNode name="capwap-controller">
+      <properties>
+        <help>IP address of CAPWAP access controller (Option 52)</help>
+        <valueHelp>
+          <format>ipv6</format>
+          <description>CAPWAP AC controller</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv6-address"/>
+        </constraint>
+      </properties>
+    </leafNode>
     <leafNode name="nis-domain">
       <properties>
         <help>NIS domain name for client to use</help>
diff --git a/interface-definitions/include/dhcp/ping-check.xml.i b/interface-definitions/include/dhcp/ping-check.xml.i
new file mode 100644
index 000000000..a506f68e4
--- /dev/null
+++ b/interface-definitions/include/dhcp/ping-check.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from dhcp/ping-check.xml.i -->
+<leafNode name="ping-check">
+  <properties>
+    <help>Sends ICMP Echo request to the address being assigned</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/firewall/common-rule-ipv4.xml.i b/interface-definitions/include/firewall/common-rule-ipv4.xml.i
index 803b94b06..b67ef25dc 100644
--- a/interface-definitions/include/firewall/common-rule-ipv4.xml.i
+++ b/interface-definitions/include/firewall/common-rule-ipv4.xml.i
@@ -16,6 +16,7 @@
     #include <include/firewall/port.xml.i>
     #include <include/firewall/source-destination-group.xml.i>
     #include <include/firewall/source-destination-dynamic-group.xml.i>
+    #include <include/firewall/source-destination-remote-group.xml.i>
   </children>
 </node>
 <leafNode name="jump-target">
@@ -39,6 +40,7 @@
     #include <include/firewall/port.xml.i>
     #include <include/firewall/source-destination-group.xml.i>
     #include <include/firewall/source-destination-dynamic-group.xml.i>
+    #include <include/firewall/source-destination-remote-group.xml.i>
   </children>
 </node>
 <!-- include end -->
\ No newline at end of file
diff --git a/interface-definitions/include/firewall/common-rule-ipv6.xml.i b/interface-definitions/include/firewall/common-rule-ipv6.xml.i
index bb176fe71..65ec415fb 100644
--- a/interface-definitions/include/firewall/common-rule-ipv6.xml.i
+++ b/interface-definitions/include/firewall/common-rule-ipv6.xml.i
@@ -16,6 +16,7 @@
     #include <include/firewall/port.xml.i>
     #include <include/firewall/source-destination-group-ipv6.xml.i>
     #include <include/firewall/source-destination-dynamic-group-ipv6.xml.i>
+    #include <include/firewall/source-destination-remote-group.xml.i>
   </children>
 </node>
 <leafNode name="jump-target">
@@ -39,6 +40,7 @@
     #include <include/firewall/port.xml.i>
     #include <include/firewall/source-destination-group-ipv6.xml.i>
     #include <include/firewall/source-destination-dynamic-group-ipv6.xml.i>
+    #include <include/firewall/source-destination-remote-group.xml.i>
   </children>
 </node>
-<!-- include end -->
\ No newline at end of file
+<!-- include end -->
diff --git a/interface-definitions/include/firewall/geoip.xml.i b/interface-definitions/include/firewall/geoip.xml.i
index 9fb37a574..b8f2cbc45 100644
--- a/interface-definitions/include/firewall/geoip.xml.i
+++ b/interface-definitions/include/firewall/geoip.xml.i
@@ -12,7 +12,7 @@
           <description>Country code (2 characters)</description>
         </valueHelp>
         <constraint>
-          <regex>^(ad|ae|af|ag|ai|al|am|ao|aq|ar|as|at|au|aw|ax|az|ba|bb|bd|be|bf|bg|bh|bi|bj|bl|bm|bn|bo|bq|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|cr|cu|cv|cw|cx|cy|cz|de|dj|dk|dm|do|dz|ec|ee|eg|eh|er|es|et|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gg|gh|gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|im|in|io|iq|ir|is|it|je|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mf|mg|mh|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|nu|nz|om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|ps|pt|pw|py|qa|re|ro|rs|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr|ss|st|sv|sx|sy|sz|tc|td|tf|tg|th|tj|tk|tl|tm|tn|to|tr|tt|tv|tw|tz|ua|ug|um|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|za|zm|zw)$</regex>
+          <regex>(ad|ae|af|ag|ai|al|am|ao|aq|ar|as|at|au|aw|ax|az|ba|bb|bd|be|bf|bg|bh|bi|bj|bl|bm|bn|bo|bq|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|cr|cu|cv|cw|cx|cy|cz|de|dj|dk|dm|do|dz|ec|ee|eg|eh|er|es|et|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gg|gh|gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|im|in|io|iq|ir|is|it|je|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mf|mg|mh|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|nu|nz|om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|ps|pt|pw|py|qa|re|ro|rs|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr|ss|st|sv|sx|sy|sz|tc|td|tf|tg|th|tj|tk|tl|tm|tn|to|tr|tt|tv|tw|tz|ua|ug|um|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|za|zm|zw)</regex>
         </constraint>
         <multi />
       </properties>
diff --git a/interface-definitions/include/firewall/global-options.xml.i b/interface-definitions/include/firewall/global-options.xml.i
index 355b41fde..e19f3a7c5 100644
--- a/interface-definitions/include/firewall/global-options.xml.i
+++ b/interface-definitions/include/firewall/global-options.xml.i
@@ -49,12 +49,53 @@
         <help>Apply configured firewall rules to traffic switched by bridges</help>
       </properties>
       <children>
-        <leafNode name="invalid-connections">
+        <node name="accept-invalid">
           <properties>
-            <help>Accept ARP, DHCP and PPPoE despite they are marked as invalid connection</help>
-            <valueless/>
+            <help>Accept connections despite they are marked as invalid</help>
           </properties>
-        </leafNode>
+          <children>
+            <leafNode name="ethernet-type">
+              <properties>
+                <help>Ethernet type</help>
+                <completionHelp>
+                  <list>arp dhcp pppoe 802.1q 802.1ad pppoe-discovery wol</list>
+                </completionHelp>
+                <valueHelp>
+                  <format>arp</format>
+                  <description>Adress Resolution Protocol (ARP)</description>
+                </valueHelp>
+                <valueHelp>
+                  <format>dhcp</format>
+                  <description>Dynamic Host Configuration Protocol (DHCP)</description>
+                </valueHelp>
+                <valueHelp>
+                  <format>pppoe</format>
+                  <description>Point to Point over Ethernet (PPPoE) Session</description>
+                </valueHelp>
+                <valueHelp>
+                  <format>pppoe-discovery</format>
+                  <description>PPPoE Discovery</description>
+                </valueHelp>
+                <valueHelp>
+                  <format>802.1q</format>
+                  <description>Customer VLAN tag type (802.1Q)</description>
+                </valueHelp>
+                <valueHelp>
+                  <format>802.1ad</format>
+                  <description>Service VLAN tag type (802.1ad)</description>
+                </valueHelp>
+                <valueHelp>
+                  <format>wol</format>
+                  <description>Wake-on-LAN magic packet</description>
+                </valueHelp>
+                <constraint>
+                  <regex>(arp|dhcp|pppoe|pppoe-discovery|802.1q|802.1ad|wol)</regex>
+                </constraint>
+                <multi/>
+              </properties>
+            </leafNode>
+          </children>
+        </node>
         <leafNode name="ipv4">
           <properties>
             <help>Apply configured IPv4 firewall rules</help>
@@ -217,6 +258,14 @@
         <help>Global firewall state-policy</help>
       </properties>
       <children>
+        <node name="offload">
+          <properties>
+            <help>All stateful forward traffic is offloaded to a flowtable</help>
+          </properties>
+          <children>
+            #include <include/firewall/offload-target.xml.i>
+          </children>
+        </node>
         <node name="established">
           <properties>
             <help>Global firewall policy for packets part of an established connection</help>
diff --git a/interface-definitions/include/firewall/source-destination-remote-group.xml.i b/interface-definitions/include/firewall/source-destination-remote-group.xml.i
new file mode 100644
index 000000000..16463c8eb
--- /dev/null
+++ b/interface-definitions/include/firewall/source-destination-remote-group.xml.i
@@ -0,0 +1,17 @@
+<!-- include start from firewall/source-destination-remote-group.xml.i -->
+<node name="group">
+  <properties>
+    <help>Group</help>
+  </properties>
+  <children>
+    <leafNode name="remote-group">
+      <properties>
+        <help>Group of remote addresses</help>
+        <completionHelp>
+          <path>firewall group remote-group</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/haproxy/listen-address.xml.i b/interface-definitions/include/haproxy/listen-address.xml.i
new file mode 100644
index 000000000..785b46117
--- /dev/null
+++ b/interface-definitions/include/haproxy/listen-address.xml.i
@@ -0,0 +1,30 @@
+<!-- include start from haproxy/listen-address.xml.i -->
+<tagNode name="listen-address">
+  <properties>
+    <help>Local IP addresses to listen on</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_local_ips.sh --both</script>
+    </completionHelp>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>IPv4 address to listen for incoming connections</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv6</format>
+      <description>IPv6 address to listen for incoming connections</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ip-address"/>
+      <validator name="ipv6-link-local"/>
+    </constraint>
+  </properties>
+  <children>
+    <leafNode name="accept-proxy">
+      <properties>
+        <help>Accept PROXY protocol</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</tagNode>
+<!-- include end -->
diff --git a/interface-definitions/include/haproxy/logging.xml.i b/interface-definitions/include/haproxy/logging.xml.i
index e0af54fa4..315c959bf 100644
--- a/interface-definitions/include/haproxy/logging.xml.i
+++ b/interface-definitions/include/haproxy/logging.xml.i
@@ -4,7 +4,137 @@
     <help>Logging parameters</help>
   </properties>
   <children>
-    #include <include/syslog-facility.xml.i>
+    <tagNode name="facility">
+      <properties>
+        <help>Facility for logging</help>
+        <completionHelp>
+          <list>auth cron daemon kern lpr mail news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7</list>
+        </completionHelp>
+        <constraint>
+          <regex>(auth|cron|daemon|kern|lpr|mail|news|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7)</regex>
+        </constraint>
+        <constraintErrorMessage>Invalid facility type</constraintErrorMessage>
+        <valueHelp>
+          <format>auth</format>
+          <description>Authentication and authorization</description>
+        </valueHelp>
+        <valueHelp>
+          <format>cron</format>
+          <description>Cron daemon</description>
+        </valueHelp>
+        <valueHelp>
+          <format>daemon</format>
+          <description>System daemons</description>
+        </valueHelp>
+        <valueHelp>
+          <format>kern</format>
+          <description>Kernel</description>
+        </valueHelp>
+        <valueHelp>
+          <format>lpr</format>
+          <description>Line printer spooler</description>
+        </valueHelp>
+        <valueHelp>
+          <format>mail</format>
+          <description>Mail subsystem</description>
+        </valueHelp>
+        <valueHelp>
+          <format>news</format>
+          <description>USENET subsystem</description>
+        </valueHelp>
+        <valueHelp>
+          <format>syslog</format>
+          <description>Authentication and authorization</description>
+        </valueHelp>
+        <valueHelp>
+          <format>user</format>
+          <description>Application processes</description>
+        </valueHelp>
+        <valueHelp>
+          <format>uucp</format>
+          <description>UUCP subsystem</description>
+        </valueHelp>
+        <valueHelp>
+          <format>local0</format>
+          <description>Local facility 0</description>
+        </valueHelp>
+        <valueHelp>
+          <format>local1</format>
+          <description>Local facility 1</description>
+        </valueHelp>
+        <valueHelp>
+          <format>local2</format>
+          <description>Local facility 2</description>
+        </valueHelp>
+        <valueHelp>
+          <format>local3</format>
+          <description>Local facility 3</description>
+        </valueHelp>
+        <valueHelp>
+          <format>local4</format>
+          <description>Local facility 4</description>
+        </valueHelp>
+        <valueHelp>
+          <format>local5</format>
+          <description>Local facility 5</description>
+        </valueHelp>
+        <valueHelp>
+          <format>local6</format>
+          <description>Local facility 6</description>
+        </valueHelp>
+        <valueHelp>
+          <format>local7</format>
+          <description>Local facility 7</description>
+        </valueHelp>
+      </properties>
+      <children>
+        <leafNode name="level">
+          <properties>
+            <help>Logging level</help>
+            <completionHelp>
+              <list>emerg alert crit err warning notice info debug</list>
+            </completionHelp>
+            <valueHelp>
+              <format>emerg</format>
+              <description>Emergency messages</description>
+            </valueHelp>
+            <valueHelp>
+              <format>alert</format>
+              <description>Urgent messages</description>
+            </valueHelp>
+            <valueHelp>
+              <format>crit</format>
+              <description>Critical messages</description>
+            </valueHelp>
+            <valueHelp>
+              <format>err</format>
+              <description>Error messages</description>
+            </valueHelp>
+            <valueHelp>
+              <format>warning</format>
+              <description>Warning messages</description>
+            </valueHelp>
+            <valueHelp>
+              <format>notice</format>
+              <description>Messages for further investigation</description>
+            </valueHelp>
+            <valueHelp>
+              <format>info</format>
+              <description>Informational messages</description>
+            </valueHelp>
+            <valueHelp>
+              <format>debug</format>
+              <description>Debug messages</description>
+            </valueHelp>
+            <constraint>
+              <regex>(emerg|alert|crit|err|warning|notice|info|debug)</regex>
+            </constraint>
+            <constraintErrorMessage>Invalid loglevel</constraintErrorMessage>
+          </properties>
+          <defaultValue>err</defaultValue>
+        </leafNode>
+      </children>
+    </tagNode>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/haproxy/rule-backend.xml.i b/interface-definitions/include/haproxy/rule-backend.xml.i
index 1df9d5dcf..20263c23c 100644
--- a/interface-definitions/include/haproxy/rule-backend.xml.i
+++ b/interface-definitions/include/haproxy/rule-backend.xml.i
@@ -12,19 +12,7 @@
     <constraintErrorMessage>Proxy rule number must be between 1 and 10000</constraintErrorMessage>
   </properties>
   <children>
-    <leafNode name="domain-name">
-      <properties>
-        <help>Domain name to match</help>
-        <valueHelp>
-          <format>txt</format>
-          <description>Domain address to match</description>
-        </valueHelp>
-        <constraint>
-          <validator name="fqdn"/>
-        </constraint>
-        <multi/>
-      </properties>
-    </leafNode>
+    #include <include/haproxy/rule-match-domain.xml.i>
     <node name="set">
       <properties>
         <help>Proxy modifications</help>
@@ -38,7 +26,7 @@
               <description>Set URL location</description>
             </valueHelp>
             <constraint>
-              <regex>^\/[\w\-.\/]+$</regex>
+              <regex>\/[\w\-.\/]+</regex>
             </constraint>
             <constraintErrorMessage>Incorrect URL format</constraintErrorMessage>
           </properties>
@@ -90,7 +78,7 @@
               <description>Begin URL</description>
             </valueHelp>
             <constraint>
-              <regex>^\/[\w\-.\/]+$</regex>
+              <regex>\/[\w\-.\/]+</regex>
             </constraint>
             <constraintErrorMessage>Incorrect URL format</constraintErrorMessage>
             <multi/>
@@ -104,7 +92,7 @@
               <description>End URL</description>
             </valueHelp>
             <constraint>
-              <regex>^\/[\w\-.\/]+$</regex>
+              <regex>\/[\w\-.\/]+</regex>
             </constraint>
             <constraintErrorMessage>Incorrect URL format</constraintErrorMessage>
             <multi/>
@@ -118,7 +106,7 @@
               <description>Exactly URL</description>
             </valueHelp>
             <constraint>
-              <regex>^\/[\w\-.\/]*$</regex>
+              <regex>\/[\w\-.\/]*</regex>
             </constraint>
             <constraintErrorMessage>Incorrect URL format</constraintErrorMessage>
             <multi/>
diff --git a/interface-definitions/include/haproxy/rule-frontend.xml.i b/interface-definitions/include/haproxy/rule-frontend.xml.i
index eabdd8632..6237fd44b 100644
--- a/interface-definitions/include/haproxy/rule-frontend.xml.i
+++ b/interface-definitions/include/haproxy/rule-frontend.xml.i
@@ -12,19 +12,7 @@
     <constraintErrorMessage>Proxy rule number must be between 1 and 10000</constraintErrorMessage>
   </properties>
   <children>
-    <leafNode name="domain-name">
-      <properties>
-        <help>Domain name to match</help>
-        <valueHelp>
-          <format>txt</format>
-          <description>Domain address to match</description>
-        </valueHelp>
-        <constraint>
-          <validator name="fqdn"/>
-        </constraint>
-        <multi/>
-      </properties>
-    </leafNode>
+    #include <include/haproxy/rule-match-domain.xml.i>
     <node name="set">
       <properties>
         <help>Proxy modifications</help>
@@ -32,15 +20,15 @@
       <children>
         <leafNode name="redirect-location">
           <properties>
-            <help>Set URL location</help>
+            <help>Set path location</help>
             <valueHelp>
               <format>url</format>
-              <description>Set URL location</description>
+              <description>Set path location</description>
             </valueHelp>
             <constraint>
-              <regex>^\/[\w\-.\/]+$</regex>
+              <regex>\/[\w\-.\/]+</regex>
             </constraint>
-            <constraintErrorMessage>Incorrect URL format</constraintErrorMessage>
+            <constraintErrorMessage>Incorrect path format</constraintErrorMessage>
           </properties>
         </leafNode>
         <leafNode name="backend">
@@ -93,7 +81,7 @@
               <description>Begin URL</description>
             </valueHelp>
             <constraint>
-              <regex>^\/[\w\-.\/]+$</regex>
+              <regex>\/[\w\-.\/]+</regex>
             </constraint>
             <constraintErrorMessage>Incorrect URL format</constraintErrorMessage>
             <multi/>
@@ -107,7 +95,7 @@
               <description>End URL</description>
             </valueHelp>
             <constraint>
-              <regex>^\/[\w\-.\/]+$</regex>
+              <regex>\/[\w\-.\/]+</regex>
             </constraint>
             <constraintErrorMessage>Incorrect URL format</constraintErrorMessage>
             <multi/>
@@ -121,7 +109,7 @@
               <description>Exactly URL</description>
             </valueHelp>
             <constraint>
-              <regex>^\/[\w\-.\/]+$</regex>
+              <regex>\/[\w\-.\/]+</regex>
             </constraint>
             <constraintErrorMessage>Incorrect URL format</constraintErrorMessage>
             <multi/>
diff --git a/interface-definitions/include/haproxy/rule-match-domain.xml.i b/interface-definitions/include/haproxy/rule-match-domain.xml.i
new file mode 100644
index 000000000..2ec61a940
--- /dev/null
+++ b/interface-definitions/include/haproxy/rule-match-domain.xml.i
@@ -0,0 +1,21 @@
+<!-- include start from haproxy/rule-match-domain.xml.i -->
+<leafNode name="domain-name">
+    <properties>
+    <help>Domain name to match</help>
+    <valueHelp>
+        <format>txt</format>
+        <description>Domain address to match</description>
+    </valueHelp>
+    <constraint>
+        <validator name="fqdn"/>
+    </constraint>
+    <multi/>
+    </properties>
+</leafNode>
+<leafNode name="wildcard-domain">
+    <properties>
+    <help>Match subdomains of specified domain(s)</help>
+    <valueless/>
+    </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/haproxy/timeout-check.xml.i b/interface-definitions/include/haproxy/timeout-check.xml.i
new file mode 100644
index 000000000..d1217fac3
--- /dev/null
+++ b/interface-definitions/include/haproxy/timeout-check.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from haproxy/timeout-check.xml.i -->
+<leafNode name="check">
+  <properties>
+    <help>Timeout in seconds for established connections</help>
+    <valueHelp>
+      <format>u32:1-3600</format>
+      <description>Check timeout in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-3600"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/haproxy/timeout-client.xml.i b/interface-definitions/include/haproxy/timeout-client.xml.i
new file mode 100644
index 000000000..2250ccdef
--- /dev/null
+++ b/interface-definitions/include/haproxy/timeout-client.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from haproxy/timeout-client.xml.i -->
+<leafNode name="client">
+  <properties>
+    <help>Maximum inactivity time on the client side</help>
+    <valueHelp>
+      <format>u32:1-3600</format>
+      <description>Timeout in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-3600"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/haproxy/timeout-connect.xml.i b/interface-definitions/include/haproxy/timeout-connect.xml.i
new file mode 100644
index 000000000..da4f983af
--- /dev/null
+++ b/interface-definitions/include/haproxy/timeout-connect.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from haproxy/timeout-connect.xml.i -->
+<leafNode name="connect">
+  <properties>
+    <help>Set the maximum time to wait for a connection attempt to a server to succeed</help>
+    <valueHelp>
+      <format>u32:1-3600</format>
+      <description>Connect timeout in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-3600"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/haproxy/timeout-server.xml.i b/interface-definitions/include/haproxy/timeout-server.xml.i
new file mode 100644
index 000000000..f27d415c1
--- /dev/null
+++ b/interface-definitions/include/haproxy/timeout-server.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from haproxy/timeout-server.xml.i -->
+<leafNode name="server">
+  <properties>
+    <help>Set the maximum inactivity time on the server side</help>
+    <valueHelp>
+      <format>u32:1-3600</format>
+      <description>Server timeout in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-3600"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/haproxy/timeout.xml.i b/interface-definitions/include/haproxy/timeout.xml.i
index 79e7303b1..a3a5a8a3e 100644
--- a/interface-definitions/include/haproxy/timeout.xml.i
+++ b/interface-definitions/include/haproxy/timeout.xml.i
@@ -4,42 +4,9 @@
     <help>Timeout options</help>
   </properties>
   <children>
-    <leafNode name="check">
-      <properties>
-        <help>Timeout in seconds for established connections</help>
-        <valueHelp>
-          <format>u32:1-3600</format>
-          <description>Check timeout in seconds</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-3600"/>
-        </constraint>
-      </properties>
-    </leafNode>
-    <leafNode name="connect">
-      <properties>
-        <help>Set the maximum time to wait for a connection attempt to a server to succeed</help>
-        <valueHelp>
-          <format>u32:1-3600</format>
-          <description>Connect timeout in seconds</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-3600"/>
-        </constraint>
-      </properties>
-    </leafNode>
-    <leafNode name="server">
-      <properties>
-        <help>Set the maximum inactivity time on the server side</help>
-        <valueHelp>
-          <format>u32:1-3600</format>
-          <description>Server timeout in seconds</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-3600"/>
-        </constraint>
-      </properties>
-    </leafNode>
+    #include <include/haproxy/timeout-check.xml.i>
+    #include <include/haproxy/timeout-connect.xml.i>
+    #include <include/haproxy/timeout-server.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/interface/ipv6-address-interface-identifier.xml.i b/interface-definitions/include/interface/ipv6-address-interface-identifier.xml.i
new file mode 100644
index 000000000..d173dfdb8
--- /dev/null
+++ b/interface-definitions/include/interface/ipv6-address-interface-identifier.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from interface/ipv6-address-interface-identifier.xml.i -->
+<leafNode name="interface-identifier">
+  <properties>
+    <help>SLAAC interface identifier</help>
+    <valueHelp>
+      <format>::h:h:h:h</format>
+      <description>Interface identifier</description>
+    </valueHelp>
+    <constraint>
+      <regex>::([0-9a-fA-F]{1,4}(:[0-9a-fA-F]{1,4}){0,3})</regex>
+    </constraint>
+    <constraintErrorMessage>Interface identifier format must start with :: and may contain up four hextets (::h:h:h:h)</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/ipv6-address.xml.i b/interface-definitions/include/interface/ipv6-address.xml.i
deleted file mode 100644
index e1bdf02fd..000000000
--- a/interface-definitions/include/interface/ipv6-address.xml.i
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- include start from interface/ipv6-address.xml.i -->
-<node name="address">
-  <properties>
-    <help>IPv6 address configuration modes</help>
-  </properties>
-  <children>
-    #include <include/interface/ipv6-address-autoconf.xml.i>
-    #include <include/interface/ipv6-address-eui64.xml.i>
-    #include <include/interface/ipv6-address-no-default-link-local.xml.i>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/ipv6-options-with-nd.xml.i b/interface-definitions/include/interface/ipv6-options-with-nd.xml.i
new file mode 100644
index 000000000..5894104b3
--- /dev/null
+++ b/interface-definitions/include/interface/ipv6-options-with-nd.xml.i
@@ -0,0 +1,9 @@
+          <node name="ipv6">
+            <children>
+              <node name="address">
+                <children>
+                  #include <include/interface/ipv6-address-interface-identifier.xml.i>
+                </children>
+              </node>
+            </children>
+          </node>
diff --git a/interface-definitions/include/interface/ipv6-options.xml.i b/interface-definitions/include/interface/ipv6-options.xml.i
index ec6ec64ee..f84a9f2cd 100644
--- a/interface-definitions/include/interface/ipv6-options.xml.i
+++ b/interface-definitions/include/interface/ipv6-options.xml.i
@@ -8,9 +8,18 @@
     #include <include/interface/base-reachable-time.xml.i>
     #include <include/interface/disable-forwarding.xml.i>
     #include <include/interface/ipv6-accept-dad.xml.i>
-    #include <include/interface/ipv6-address.xml.i>
     #include <include/interface/ipv6-dup-addr-detect-transmits.xml.i>
     #include <include/interface/source-validation.xml.i>
+    <node name="address">
+      <properties>
+        <help>IPv6 address configuration modes</help>
+      </properties>
+      <children>
+        #include <include/interface/ipv6-address-autoconf.xml.i>
+        #include <include/interface/ipv6-address-eui64.xml.i>
+        #include <include/interface/ipv6-address-no-default-link-local.xml.i>
+      </children>
+    </node>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/interface/vif-s.xml.i b/interface-definitions/include/interface/vif-s.xml.i
index 02e7ab057..65ca10207 100644
--- a/interface-definitions/include/interface/vif-s.xml.i
+++ b/interface-definitions/include/interface/vif-s.xml.i
@@ -21,6 +21,7 @@
     #include <include/interface/vlan-protocol.xml.i>
     #include <include/interface/ipv4-options.xml.i>
     #include <include/interface/ipv6-options.xml.i>
+    #include <include/interface/ipv6-options-with-nd.xml.i>
     #include <include/interface/mac.xml.i>
     #include <include/interface/mirror.xml.i>
     #include <include/interface/mtu-68-16000.xml.i>
@@ -41,6 +42,7 @@
         #include <include/interface/disable.xml.i>
         #include <include/interface/ipv4-options.xml.i>
         #include <include/interface/ipv6-options.xml.i>
+        #include <include/interface/ipv6-options-with-nd.xml.i>
         #include <include/interface/mac.xml.i>
         #include <include/interface/mirror.xml.i>
         #include <include/interface/mtu-68-16000.xml.i>
diff --git a/interface-definitions/include/interface/vif.xml.i b/interface-definitions/include/interface/vif.xml.i
index ec3921bf6..87f91c5ce 100644
--- a/interface-definitions/include/interface/vif.xml.i
+++ b/interface-definitions/include/interface/vif.xml.i
@@ -46,6 +46,7 @@
     </leafNode>
     #include <include/interface/ipv4-options.xml.i>
     #include <include/interface/ipv6-options.xml.i>
+    #include <include/interface/ipv6-options-with-nd.xml.i>
     #include <include/interface/mac.xml.i>
     #include <include/interface/mirror.xml.i>
     #include <include/interface/mtu-68-16000.xml.i>
diff --git a/interface-definitions/include/ip-address.xml.i b/interface-definitions/include/ip-address.xml.i
new file mode 100644
index 000000000..6027e97ee
--- /dev/null
+++ b/interface-definitions/include/ip-address.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from ip-address.xml.i -->
+<leafNode name="ip-address">
+  <properties>
+    <help>Fixed IP address of static mapping</help>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>IPv4 address used in static mapping</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-address"/>
+    </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 35ce80be9..e75466457 100644
--- a/interface-definitions/include/isis/protocol-common-config.xml.i
+++ b/interface-definitions/include/isis/protocol-common-config.xml.i
@@ -275,7 +275,7 @@
   <children>
     <node name="global-block">
       <properties>
-        <help>Segment Routing Global Block label range</help>
+        <help>Segment-Routing Global Block label range</help>
       </properties>
       <children>
         #include <include/segment-routing-label-value.xml.i>
@@ -283,12 +283,31 @@
     </node>
     <node name="local-block">
       <properties>
-        <help>Segment Routing Local Block label range</help>
+        <help>Segment-Routing Local Block label range</help>
       </properties>
       <children>
         #include <include/segment-routing-label-value.xml.i>
       </children>
     </node>
+    <node name="srv6">
+      <properties>
+        <help>Segment-Routing SRv6 configuration</help>
+      </properties>
+      <children>
+        <leafNode name="locator">
+          <properties>
+            <help>Specify SRv6 locator</help>
+            <valueHelp>
+              <format>txt</format>
+              <description>SRv6 locator name</description>
+            </valueHelp>
+            <constraint>
+              #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
+            </constraint>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
     <leafNode name="maximum-label-depth">
       <properties>
         <help>Maximum MPLS labels allowed for this router</help>
@@ -418,6 +437,14 @@
             #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
+        <node name="nhrp">
+          <properties>
+            <help>Redistribute NHRP 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>
diff --git a/interface-definitions/include/kernel-interface-tap.xml.i b/interface-definitions/include/kernel-interface-tap.xml.i
new file mode 100644
index 000000000..83399f1f4
--- /dev/null
+++ b/interface-definitions/include/kernel-interface-tap.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from kernel-interface-tap.xml.i -->
+<leafNode name="kernel-interface">
+  <properties>
+    <help>Kernel interface name</help>
+    <valueHelp>
+      <format>vpptapN</format>
+      <description>Kernel interface name</description>
+    </valueHelp>
+    <constraint>
+      <regex>vpptap\d+</regex>
+    </constraint>
+    <constraintErrorMessage>Kernel interface must start with vpptapN</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/kernel-interface-tun.xml.i b/interface-definitions/include/kernel-interface-tun.xml.i
new file mode 100644
index 000000000..3cbd5ab30
--- /dev/null
+++ b/interface-definitions/include/kernel-interface-tun.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from kernel-interface-tun.xml.i -->
+<leafNode name="kernel-interface">
+  <properties>
+    <help>Kernel interface name</help>
+    <valueHelp>
+      <format>vpptunN</format>
+      <description>Kernel interface name</description>
+    </valueHelp>
+    <constraint>
+      <regex>vpptun\d+</regex>
+    </constraint>
+    <constraintErrorMessage>Kernel interface must start with vpptunN</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/netlink/log-level.xml.i b/interface-definitions/include/netlink/log-level.xml.i
new file mode 100644
index 000000000..bbaf9412c
--- /dev/null
+++ b/interface-definitions/include/netlink/log-level.xml.i
@@ -0,0 +1,21 @@
+<!-- include start from netlink/log-level.xml.i -->
+<leafNode name="log-level">
+  <properties>
+    <help>Set log-level</help>
+    <completionHelp>
+      <list>info debug</list>
+    </completionHelp>
+    <valueHelp>
+      <format>info</format>
+      <description>Info log level</description>
+    </valueHelp>
+    <valueHelp>
+      <format>debug</format>
+      <description>Debug log level</description>
+    </valueHelp>
+    <constraint>
+      <regex>(info|debug)</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/netlink/queue-size.xml.i b/interface-definitions/include/netlink/queue-size.xml.i
new file mode 100644
index 000000000..d284838cf
--- /dev/null
+++ b/interface-definitions/include/netlink/queue-size.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from netlink/queue-size.xml.i -->
+<leafNode name="queue-size">
+  <properties>
+    <help>Internal message queue size</help>
+    <valueHelp>
+      <format>u32:100-2147483647</format>
+      <description>Queue size</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-2147483647"/>
+    </constraint>
+    <constraintErrorMessage>Queue size must be between 100 and 2147483647</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- 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 cef832381..571ccbded 100644
--- a/interface-definitions/include/ospf/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospf/protocol-common-config.xml.i
@@ -680,7 +680,7 @@
   <children>
     <node name="global-block">
       <properties>
-        <help>Segment Routing Global Block label range</help>
+        <help>Segment-Routing Global Block label range</help>
       </properties>
       <children>
         #include <include/segment-routing-label-value.xml.i>
@@ -688,7 +688,7 @@
     </node>
     <node name="local-block">
       <properties>
-        <help>Segment Routing Local Block label range</help>
+        <help>Segment-Routing Local Block label range</help>
       </properties>
       <children>
         #include <include/segment-routing-label-value.xml.i>
@@ -798,6 +798,16 @@
         #include <include/route-map.xml.i>
       </children>
     </node>
+    <node name="nhrp">
+      <properties>
+        <help>Redistribute NHRP 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>
diff --git a/interface-definitions/include/policy/community-value-list.xml.i b/interface-definitions/include/policy/community-value-list.xml.i
index 8c665c5f0..b1499440a 100644
--- a/interface-definitions/include/policy/community-value-list.xml.i
+++ b/interface-definitions/include/policy/community-value-list.xml.i
@@ -4,7 +4,6 @@
       local-as
       no-advertise
       no-export
-      internet
       graceful-shutdown
       accept-own
       route-filter-translated-v4
@@ -35,10 +34,6 @@
     <description>Well-known communities value NO_EXPORT 0xFFFFFF01</description>
 </valueHelp>
 <valueHelp>
-    <format>internet</format>
-    <description>Well-known communities value 0</description>
-</valueHelp>
-<valueHelp>
     <format>graceful-shutdown</format>
     <description>Well-known communities value GRACEFUL_SHUTDOWN 0xFFFF0000</description>
 </valueHelp>
@@ -84,7 +79,7 @@
 </valueHelp>
 <multi/>
 <constraint>
-    <regex>local-as|no-advertise|no-export|internet|graceful-shutdown|accept-own|route-filter-translated-v4|route-filter-v4|route-filter-translated-v6|route-filter-v6|llgr-stale|no-llgr|accept-own-nexthop|blackhole|no-peer</regex>
+    <regex>local-as|no-advertise|no-export|graceful-shutdown|accept-own|route-filter-translated-v4|route-filter-v4|route-filter-translated-v6|route-filter-v6|llgr-stale|no-llgr|accept-own-nexthop|blackhole|no-peer</regex>
     <validator name="bgp-regular-community"/>
 </constraint>
         <!-- include end -->
diff --git a/interface-definitions/include/rpki/protocol-common-config.xml.i b/interface-definitions/include/rpki/protocol-common-config.xml.i
new file mode 100644
index 000000000..0b3356604
--- /dev/null
+++ b/interface-definitions/include/rpki/protocol-common-config.xml.i
@@ -0,0 +1,87 @@
+<!-- include start from rpki/protocol-common-config.xml.i -->
+<tagNode name="cache">
+  <properties>
+    <help>RPKI cache server address</help>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>IP address of RPKI server</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv6</format>
+      <description>IPv6 address of RPKI server</description>
+    </valueHelp>
+    <valueHelp>
+      <format>hostname</format>
+      <description>Fully qualified domain name of RPKI server</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ip-address"/>
+      <validator name="fqdn"/>
+    </constraint>
+  </properties>
+  <children>
+    #include <include/port-number.xml.i>
+    <leafNode name="preference">
+      <properties>
+        <help>Preference of the cache server</help>
+        <valueHelp>
+          <format>u32:1-255</format>
+          <description>Preference of the cache server</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-255"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    #include <include/source-address-ipv4.xml.i>
+    <node name="ssh">
+      <properties>
+        <help>RPKI SSH connection settings</help>
+      </properties>
+      <children>
+        #include <include/pki/openssh-key.xml.i>
+        #include <include/generic-username.xml.i>
+      </children>
+    </node>
+  </children>
+</tagNode>
+<leafNode name="expire-interval">
+  <properties>
+    <help>Interval to wait before expiring the cache</help>
+    <valueHelp>
+      <format>u32:600-172800</format>
+      <description>Interval in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 600-172800"/>
+    </constraint>
+  </properties>
+  <defaultValue>7200</defaultValue>
+</leafNode>
+<leafNode name="polling-period">
+  <properties>
+    <help>Cache polling interval</help>
+    <valueHelp>
+      <format>u32:1-86400</format>
+      <description>Interval in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-86400"/>
+    </constraint>
+  </properties>
+  <defaultValue>300</defaultValue>
+</leafNode>
+<leafNode name="retry-interval">
+  <properties>
+    <help>Retry interval to connect to the cache server</help>
+    <valueHelp>
+      <format>u32:1-7200</format>
+      <description>Interval in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-7200"/>
+    </constraint>
+  </properties>
+  <defaultValue>600</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/unformat_log2_page_size.xml.i b/interface-definitions/include/unformat_log2_page_size.xml.i
new file mode 100644
index 000000000..ce6f70dc8
--- /dev/null
+++ b/interface-definitions/include/unformat_log2_page_size.xml.i
@@ -0,0 +1,17 @@
+<!-- include start from unformat_log2_page_size.xml.i -->
+<completionHelp>
+  <list>default default-hugepage</list>
+  <script>sudo ${vyos_completion_dir}/list_mem_page_size.py</script>
+</completionHelp>
+<valueHelp>
+  <format>default</format>
+  <description>Default</description>
+</valueHelp>
+<valueHelp>
+  <format>default-hugepage</format>
+  <description>Default huge-page</description>
+</valueHelp>
+<constraint>
+  <regex>(default|default-hugepage|4K|8K|1024K|64K|256K|2048K|4096K|16384K|262144K|1048576K|16777216K|1M|2M|4M|16M|256M|1024M|16384M|1G|16G)</regex>
+</constraint>
+<!-- include end -->
diff --git a/interface-definitions/include/unformat_memory_size.xml.i b/interface-definitions/include/unformat_memory_size.xml.i
new file mode 100644
index 000000000..bb8f4ae67
--- /dev/null
+++ b/interface-definitions/include/unformat_memory_size.xml.i
@@ -0,0 +1,22 @@
+<!-- include start from unformat_memory_size.xml.i -->
+<valueHelp>
+  <format>&lt;number&gt;</format>
+  <description>byte</description>
+</valueHelp>
+<valueHelp>
+  <format>&lt;number&gt;K</format>
+  <description>Kilobyte</description>
+</valueHelp>
+<valueHelp>
+  <format>&lt;number&gt;M</format>
+  <description>Megabyte</description>
+</valueHelp>
+<valueHelp>
+  <format>&lt;number&gt;G</format>
+  <description>Gigabyte</description>
+</valueHelp>
+<constraint>
+  <validator name="numeric" argument="--range 0-4294967295"/>
+  <regex>(\d+|\d+K|\d+M|\d+G)</regex>
+</constraint>
+<!-- include end -->
diff --git a/interface-definitions/include/version/bgp-version.xml.i b/interface-definitions/include/version/bgp-version.xml.i
index 6bed7189f..c90276151 100644
--- a/interface-definitions/include/version/bgp-version.xml.i
+++ b/interface-definitions/include/version/bgp-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/bgp-version.xml.i -->
-<syntaxVersion component='bgp' version='5'></syntaxVersion>
+<syntaxVersion component='bgp' version='6'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/include/version/conntrack-version.xml.i b/interface-definitions/include/version/conntrack-version.xml.i
index 6995ce119..517424034 100644
--- a/interface-definitions/include/version/conntrack-version.xml.i
+++ b/interface-definitions/include/version/conntrack-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/conntrack-version.xml.i -->
-<syntaxVersion component='conntrack' version='5'></syntaxVersion>
+<syntaxVersion component='conntrack' version='6'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/include/version/container-version.xml.i b/interface-definitions/include/version/container-version.xml.i
index ed6e942cd..046bacfdc 100644
--- a/interface-definitions/include/version/container-version.xml.i
+++ b/interface-definitions/include/version/container-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/container-version.xml.i -->
-<syntaxVersion component='container' version='2'></syntaxVersion>
+<syntaxVersion component='container' version='3'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/include/version/firewall-version.xml.i b/interface-definitions/include/version/firewall-version.xml.i
index 1a8098297..1f3b779d5 100644
--- a/interface-definitions/include/version/firewall-version.xml.i
+++ b/interface-definitions/include/version/firewall-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/firewall-version.xml.i -->
-<syntaxVersion component='firewall' version='18'></syntaxVersion>
+<syntaxVersion component='firewall' version='19'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/include/version/ids-version.xml.i b/interface-definitions/include/version/ids-version.xml.i
index 9133be02b..6d4e92c21 100644
--- a/interface-definitions/include/version/ids-version.xml.i
+++ b/interface-definitions/include/version/ids-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/ids-version.xml.i -->
-<syntaxVersion component='ids' version='1'></syntaxVersion>
+<syntaxVersion component='ids' version='2'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/include/version/lldp-version.xml.i b/interface-definitions/include/version/lldp-version.xml.i
index b41d80451..a7110691a 100644
--- a/interface-definitions/include/version/lldp-version.xml.i
+++ b/interface-definitions/include/version/lldp-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/lldp-version.xml.i -->
-<syntaxVersion component='lldp' version='2'></syntaxVersion>
+<syntaxVersion component='lldp' version='3'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/include/version/policy-version.xml.i b/interface-definitions/include/version/policy-version.xml.i
index db727fea9..5c53a4032 100644
--- a/interface-definitions/include/version/policy-version.xml.i
+++ b/interface-definitions/include/version/policy-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/policy-version.xml.i -->
-<syntaxVersion component='policy' version='8'></syntaxVersion>
+<syntaxVersion component='policy' version='9'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/include/version/reverseproxy-version.xml.i b/interface-definitions/include/version/reverseproxy-version.xml.i
index 4f09f2848..71f7def1a 100644
--- a/interface-definitions/include/version/reverseproxy-version.xml.i
+++ b/interface-definitions/include/version/reverseproxy-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/reverseproxy-version.xml.i -->
-<syntaxVersion component='reverse-proxy' version='2'></syntaxVersion>
+<syntaxVersion component='reverse-proxy' version='3'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/include/version/system-version.xml.i b/interface-definitions/include/version/system-version.xml.i
index 3ecf124c7..5cdece74a 100644
--- a/interface-definitions/include/version/system-version.xml.i
+++ b/interface-definitions/include/version/system-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/system-version.xml.i -->
-<syntaxVersion component='system' version='28'></syntaxVersion>
+<syntaxVersion component='system' version='29'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/include/version/vpp-version.xml.i b/interface-definitions/include/version/vpp-version.xml.i
new file mode 100644
index 000000000..96a69c92f
--- /dev/null
+++ b/interface-definitions/include/version/vpp-version.xml.i
@@ -0,0 +1,3 @@
+<!-- include start from include/version/vpp-version.xml.i -->
+<syntaxVersion component='vpp' version='1'></syntaxVersion>
+<!-- include end -->
\ No newline at end of file
diff --git a/interface-definitions/include/version/wanloadbalance-version.xml.i b/interface-definitions/include/version/wanloadbalance-version.xml.i
index 59f8729cc..34c3c76ff 100644
--- a/interface-definitions/include/version/wanloadbalance-version.xml.i
+++ b/interface-definitions/include/version/wanloadbalance-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/wanloadbalance-version.xml.i -->
-<syntaxVersion component='wanloadbalance' version='3'></syntaxVersion>
+<syntaxVersion component='wanloadbalance' version='4'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/include/vpp/acl_common_interface_ip_rule.xml.i b/interface-definitions/include/vpp/acl_common_interface_ip_rule.xml.i
new file mode 100644
index 000000000..a719a6223
--- /dev/null
+++ b/interface-definitions/include/vpp/acl_common_interface_ip_rule.xml.i
@@ -0,0 +1,25 @@
+<!-- include start from vpp/acl_common_interface_ip_rule.xml.i -->
+<tagNode name="acl-tag">
+  <properties>
+    <help>ACL rule (tag) number</help>
+    <valueHelp>
+      <format>u32</format>
+      <description>Number</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-4294967295"/>
+    </constraint>
+    <constraintErrorMessage>Number must be between 1 and 4294967295</constraintErrorMessage>
+  </properties>
+  <children>
+    <leafNode name="tag-name">
+      <properties>
+        <help>ACL tag name</help>
+        <completionHelp>
+          <path>vpp acl ip tag-name</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+  </children>
+</tagNode>
+<!-- include end -->
diff --git a/interface-definitions/include/vpp/acl_port_range.xml.i b/interface-definitions/include/vpp/acl_port_range.xml.i
new file mode 100644
index 000000000..26bd2de45
--- /dev/null
+++ b/interface-definitions/include/vpp/acl_port_range.xml.i
@@ -0,0 +1,18 @@
+<!-- include start from vpp/acl_port_range.xml.i -->
+<leafNode name="port">
+  <properties>
+    <help>Port number or range</help>
+    <valueHelp>
+      <format>u32:1-65535</format>
+      <description>Numeric IP port</description>
+    </valueHelp>
+    <valueHelp>
+      <format>range</format>
+      <description>Numbered port range (e.g., 1001-1005)</description>
+    </valueHelp>
+    <constraint>
+     <validator name="port-range"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/vpp/acl_prefix.xml.i b/interface-definitions/include/vpp/acl_prefix.xml.i
new file mode 100644
index 000000000..790153c8f
--- /dev/null
+++ b/interface-definitions/include/vpp/acl_prefix.xml.i
@@ -0,0 +1,20 @@
+<!-- include start from vpp/acl_prefix.xml.i -->
+<leafNode name="prefix">
+  <properties>
+    <help>IP prefix</help>
+    <valueHelp>
+      <format>ipv4net</format>
+      <description>IPv4 prefix</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv6net</format>
+      <description>IPv6 prefix</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-prefix"/>
+      <validator name="ipv6-prefix"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
+
diff --git a/interface-definitions/include/vpp/acl_tcp_flags.xml.i b/interface-definitions/include/vpp/acl_tcp_flags.xml.i
new file mode 100644
index 000000000..da17f3fe5
--- /dev/null
+++ b/interface-definitions/include/vpp/acl_tcp_flags.xml.i
@@ -0,0 +1,50 @@
+<!-- include start from vpp/acl_tcp_flags.xml.i -->
+<leafNode name="syn">
+  <properties>
+    <help>Synchronise flag</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="ack">
+  <properties>
+    <help>Acknowledge flag</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="fin">
+  <properties>
+    <help>Finish flag</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="rst">
+  <properties>
+    <help>Reset flag</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="urg">
+  <properties>
+    <help>Urgent flag</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="psh">
+  <properties>
+    <help>Push flag</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="ecn">
+  <properties>
+    <help>Explicit Congestion Notification flag</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="cwr">
+  <properties>
+    <help>Congestion Window Reduced flag</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/vpp/iface_rx_mode.xml.i b/interface-definitions/include/vpp/iface_rx_mode.xml.i
new file mode 100644
index 000000000..374654b08
--- /dev/null
+++ b/interface-definitions/include/vpp/iface_rx_mode.xml.i
@@ -0,0 +1,25 @@
+<!-- include start from vpp/iface_rx_mode.xml.i -->
+<leafNode name="rx-mode">
+    <properties>
+        <help>Receive packet processing mode</help>
+        <completionHelp>
+            <list>polling interrupt adaptive</list>
+        </completionHelp>
+        <valueHelp>
+            <format>polling</format>
+            <description>Constantly check for new data</description>
+        </valueHelp>
+        <valueHelp>
+            <format>interrupt</format>
+            <description>Interrupt mode</description>
+        </valueHelp>
+        <valueHelp>
+            <format>adaptive</format>
+            <description>Adaptive mode</description>
+        </valueHelp>
+        <constraint>
+            <regex>(polling|interrupt|adaptive)</regex>
+        </constraint>
+    </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/vpp/nat_address_range.xml.i b/interface-definitions/include/vpp/nat_address_range.xml.i
new file mode 100644
index 000000000..48648f91a
--- /dev/null
+++ b/interface-definitions/include/vpp/nat_address_range.xml.i
@@ -0,0 +1,20 @@
+<!-- include start from vpp/nat_address_range.xml.i -->
+<leafNode name="address">
+  <properties>
+    <help>IP address or range</help>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>IPv4 address</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv4range</format>
+      <description>IPv4 address range</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-address"/>
+      <validator name="ipv4-range"/>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/vpp/nat_interface.xml.i b/interface-definitions/include/vpp/nat_interface.xml.i
new file mode 100644
index 000000000..20a7356bf
--- /dev/null
+++ b/interface-definitions/include/vpp/nat_interface.xml.i
@@ -0,0 +1,11 @@
+<!-- include start from vpp/nat_interface.xml.i -->
+<leafNode name="interface">
+  <properties>
+    <help>Add IP address from an interface</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_interfaces</script>
+    </completionHelp>
+    <multi/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/vpp/nat_protocol.xml.i b/interface-definitions/include/vpp/nat_protocol.xml.i
new file mode 100644
index 000000000..b88fd2b62
--- /dev/null
+++ b/interface-definitions/include/vpp/nat_protocol.xml.i
@@ -0,0 +1,30 @@
+<!-- include start from vpp/nat_protocol.xml.i -->
+<leafNode name="protocol">
+  <properties>
+    <help>Protocol</help>
+    <completionHelp>
+      <list>tcp udp icmp all</list>
+    </completionHelp>
+    <valueHelp>
+      <format>all</format>
+      <description>All protocols (TCP, UDP, and ICMP)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>icmp</format>
+      <description>Internet Control Message Protocol (ICMP)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>tcp</format>
+      <description>Transmission Control Protocol (TCP)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>udp</format>
+      <description>User Datagram Protocol (UDP)</description>
+    </valueHelp>
+    <constraint>
+      <regex>(tcp|udp|icmp|all)</regex>
+    </constraint>
+  </properties>
+  <defaultValue>all</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/vpp/netlink.xml.i b/interface-definitions/include/vpp/netlink.xml.i
new file mode 100644
index 000000000..903100d00
--- /dev/null
+++ b/interface-definitions/include/vpp/netlink.xml.i
@@ -0,0 +1,45 @@
+<!-- include start from vpp/netlink.xml.i -->
+<node name="netlink">
+  <properties>
+    <help>Netlink options</help>
+  </properties>
+  <children>
+   <leafNode name="rx-buffer-size">
+    <properties>
+      <help>Receive buffer size</help>
+      <valueHelp>
+        <format>u32:0-4294967295</format>
+        <description>Receive buffer size</description>
+      </valueHelp>
+      <constraint>
+        <validator name="numeric" argument="--range 0-4294967295"/>
+      </constraint>
+    </properties>
+  </leafNode>
+  <leafNode name="batch-size">
+    <properties>
+      <help>Batch size</help>
+      <valueHelp>
+        <format>u32:0-4294967295</format>
+        <description>Batch size</description>
+      </valueHelp>
+      <constraint>
+        <validator name="numeric" argument="--range 0-4294967295"/>
+      </constraint>
+    </properties>
+  </leafNode>
+  <leafNode name="batch-delay-ms">
+    <properties>
+      <help>Batch delay</help>
+      <valueHelp>
+        <format>u32:0-4294967295</format>
+        <description>Batch delay (in ms)</description>
+      </valueHelp>
+      <constraint>
+        <validator name="numeric" argument="--range 0-4294967295"/>
+      </constraint>
+    </properties>
+  </leafNode>
+</children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/vpp/vif.xml.i b/interface-definitions/include/vpp/vif.xml.i
new file mode 100644
index 000000000..8f0e9772f
--- /dev/null
+++ b/interface-definitions/include/vpp/vif.xml.i
@@ -0,0 +1,21 @@
+<!-- include start from vpp/vif.xml.i -->
+<tagNode name="vif">
+  <properties>
+    <help>Virtual Local Area Network (VLAN) ID</help>
+    <valueHelp>
+      <format>u32:0-4094</format>
+      <description>Virtual Local Area Network (VLAN) ID</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-4094"/>
+    </constraint>
+    <constraintErrorMessage>VLAN ID must be between 0 and 4094</constraintErrorMessage>
+  </properties>
+  <children>
+    #include <include/generic-description.xml.i>
+    #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
+    #include <include/interface/disable.xml.i>
+    #include <include/interface/mtu-68-16000.xml.i>
+  </children>
+</tagNode>
+<!-- include end -->