63 files changed, 269 insertions, 224 deletions
diff --git a/data/templates/dynamic-dns/ddclient.conf.tmpl b/data/templates/dynamic-dns/ddclient.conf.tmpl
index 6fbbb50c3..9d379de00 100644
--- a/data/templates/dynamic-dns/ddclient.conf.tmpl
+++ b/data/templates/dynamic-dns/ddclient.conf.tmpl
@@ -18,7 +18,7 @@ use=if, if={{ iface }}
 # RFC2136 dynamic DNS configuration for {{ rfc2136 }}, {{ config.zone }}, {{ dns_record }}
 server={{ config.server }}
 protocol=nsupdate
-password={{ config.keyfile }}
+password={{ config.key }}
 ttl={{ config.ttl }}
 zone={{ config.zone }}
 {{ dns_record }}
diff --git a/data/templates/frr/bgp.frr.tmpl b/data/templates/frr/bgp.frr.tmpl
index dafe45f59..2f67fa39e 100644
--- a/data/templates/frr/bgp.frr.tmpl
+++ b/data/templates/frr/bgp.frr.tmpl
@@ -35,6 +35,16 @@
 {%   if config.ebgp_multihop is defined and config.ebgp_multihop is not none %}
  neighbor {{ neighbor }} ebgp-multihop {{ config.ebgp_multihop }}
 {%   endif %}
+{%   if config.graceful_restart is defined and config.graceful_restart is not none %}
+{%     if config.graceful_restart == 'enable' %}
+{%       set graceful_restart = 'graceful-restart' %}
+{%     elif config.graceful_restart == 'disable' %}
+{%       set graceful_restart = 'graceful-restart-disable' %}
+{%     elif config.graceful_restart == 'restart-helper' %}
+{%       set graceful_restart = 'graceful-restart-helper' %}
+{%     endif %}
+ neighbor {{ neighbor }} {{ graceful_restart }}
+{%   endif %}
 {%   if config.local_as is defined and config.local_as is not none %}
 {%     for local_asn in config.local_as %}
  neighbor {{ neighbor }} local-as {{ local_asn }} {{ 'no-prepend' if config.local_as[local_asn].no_prepend is defined }}
diff --git a/debian/vyos-1x.postinst b/debian/vyos-1x.postinst
index 5fadddc86..8acc87cc8 100644
--- a/debian/vyos-1x.postinst
+++ b/debian/vyos-1x.postinst
@@ -11,7 +11,8 @@ fi
 
 # Add minion user for salt-minion
 if ! grep -q '^minion' /etc/passwd; then
-    adduser --quiet --firstuid 100 --system --disabled-login --ingroup vyattacfg --gecos "salt minion user" --shell /bin/vbash minion
+    adduser --quiet --firstuid 100 --system --disabled-login --ingroup vyattacfg \
+        --gecos "salt minion user" --shell /bin/vbash minion
     adduser --quiet minion frrvty
     adduser --quiet minion sudo
     adduser --quiet minion adm
@@ -27,7 +28,9 @@ fi
 
 # Add RADIUS operator user for RADIUS authenticated users to map to
 if ! grep -q '^radius_user' /etc/passwd; then
-    adduser --quiet --firstuid 1001 --disabled-login --ingroup users --gecos "radius user" --shell /bin/vbash radius_user
+    adduser --quiet --firstuid 1000 --disabled-login --ingroup vyattaop \
+        --no-create-home --gecos "radius user" \
+        --shell /sbin/radius_shell radius_user
     adduser --quiet radius_user frrvty
     adduser --quiet radius_user vyattaop
     adduser --quiet radius_user operator
@@ -38,7 +41,9 @@ fi
 
 # Add RADIUS admin user for RADIUS authenticated users to map to
 if ! grep -q '^radius_priv_user' /etc/passwd; then
-    adduser --quiet --firstuid 1001 --disabled-login --ingroup vyattacfg --gecos "radius privileged user" --shell /bin/vbash radius_priv_user
+    adduser --quiet --firstuid 1000 --disabled-login --ingroup vyattacfg \
+        --no-create-home --gecos "radius privileged user" \
+        --shell /sbin/radius_shell radius_priv_user
     adduser --quiet radius_priv_user frrvty
     adduser --quiet radius_priv_user vyattacfg
     adduser --quiet radius_priv_user sudo
diff --git a/interface-definitions/include/bgp/bgp-afi-aggregate-address.xml.i b/interface-definitions/include/bgp/afi-aggregate-address.xml.i
index c731e970b..646751c32 100644
--- a/interface-definitions/include/bgp/bgp-afi-aggregate-address.xml.i
+++ b/interface-definitions/include/bgp/afi-aggregate-address.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-afi-aggregate-address.xml.i -->
+<!-- include start from bgp/afi-aggregate-address.xml.i -->
 <leafNode name="as-set">
   <properties>
     <help>Generate AS-set path information for this aggregate address</help>
diff --git a/interface-definitions/include/bgp/bgp-afi-allowas-in.xml.i b/interface-definitions/include/bgp/afi-allowas-in.xml.i
index 738bf0211..2df4b8590 100644
--- a/interface-definitions/include/bgp/bgp-afi-allowas-in.xml.i
+++ b/interface-definitions/include/bgp/afi-allowas-in.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-afi-allowas-in.xml.i -->
+<!-- include start from bgp/afi-allowas-in.xml.i -->
 <node name="allowas-in">
   <properties>
     <help>Accept route that contains the local-as in the as-path</help>
diff --git a/interface-definitions/include/bgp/bgp-afi-attribute-unchanged.xml.i b/interface-definitions/include/bgp/afi-attribute-unchanged.xml.i
index f407c3f74..6d39e4589 100644
--- a/interface-definitions/include/bgp/bgp-afi-attribute-unchanged.xml.i
+++ b/interface-definitions/include/bgp/afi-attribute-unchanged.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-afi-attribute-unchanged.xml.i -->
+<!-- include start from bgp/afi-attribute-unchanged.xml.i -->
 <node name="attribute-unchanged">
   <properties>
     <help>BGP attributes are sent unchanged</help>
diff --git a/interface-definitions/include/bgp/bgp-afi-capability-orf.xml.i b/interface-definitions/include/bgp/afi-capability-orf.xml.i
index dd5c5f8b2..05c3368bb 100644
--- a/interface-definitions/include/bgp/bgp-afi-capability-orf.xml.i
+++ b/interface-definitions/include/bgp/afi-capability-orf.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-afi-capability-orf.xml.i -->
+<!-- include start from bgp/afi-capability-orf.xml.i -->
 <node name="orf">
   <properties>
     <help>Advertise ORF capability to this peer</help>
diff --git a/interface-definitions/include/bgp/bgp-afi-common-flowspec.xml.i b/interface-definitions/include/bgp/afi-common-flowspec.xml.i
index bb9b0a966..9582274d1 100644
--- a/interface-definitions/include/bgp/bgp-afi-common-flowspec.xml.i
+++ b/interface-definitions/include/bgp/afi-common-flowspec.xml.i
@@ -22,8 +22,8 @@
     </leafNode>
   </children>
 </node>
-#include <include/bgp/bgp-afi-route-map.xml.i>
-#include <include/bgp/bgp-afi-route-reflector-client.xml.i>
-#include <include/bgp/bgp-afi-route-server-client.xml.i>
-#include <include/bgp/bgp-afi-soft-reconfiguration.xml.i>
+#include <include/bgp/afi-route-map.xml.i>
+#include <include/bgp/afi-route-reflector-client.xml.i>
+#include <include/bgp/afi-route-server-client.xml.i>
+#include <include/bgp/afi-soft-reconfiguration.xml.i>
 <!-- included end -->
diff --git a/interface-definitions/include/bgp/bgp-afi-common-vpn.xml.i b/interface-definitions/include/bgp/afi-common-vpn.xml.i
index 162a2c805..824fb98a3 100644
--- a/interface-definitions/include/bgp/bgp-afi-common-vpn.xml.i
+++ b/interface-definitions/include/bgp/afi-common-vpn.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-afi-common-vpn.xml.i -->
+<!-- include start from bgp/afi-common-vpn.xml.i -->
 <leafNode name="addpath-tx-all">
   <properties>
     <help>Use addpath to advertise all paths to a neighbor</help>
@@ -11,14 +11,14 @@
     <valueless/>
   </properties>
 </leafNode>
-#include <include/bgp/bgp-afi-allowas-in.xml.i>
+#include <include/bgp/afi-allowas-in.xml.i>
 <leafNode name="as-override">
   <properties>
     <help>AS for routes sent to this peer to be the local AS</help>
     <valueless/>
   </properties>
 </leafNode>
-#include <include/bgp/bgp-afi-attribute-unchanged.xml.i>
+#include <include/bgp/afi-attribute-unchanged.xml.i>
 <node name="disable-send-community">
   <properties>
     <help>Disable sending community attributes to this peer</help>
@@ -110,17 +110,17 @@
     </constraint>
   </properties>
 </leafNode>
-#include <include/bgp/bgp-afi-nexthop-self.xml.i>
+#include <include/bgp/afi-nexthop-self.xml.i>
 <leafNode name="remove-private-as">
   <properties>
     <help>Remove private AS numbers from AS path in outbound route updates</help>
     <valueless/>
   </properties>
 </leafNode>
-#include <include/bgp/bgp-afi-route-map.xml.i>
-#include <include/bgp/bgp-afi-route-reflector-client.xml.i>
-#include <include/bgp/bgp-afi-route-server-client.xml.i>
-#include <include/bgp/bgp-afi-soft-reconfiguration.xml.i>
+#include <include/bgp/afi-route-map.xml.i>
+#include <include/bgp/afi-route-reflector-client.xml.i>
+#include <include/bgp/afi-route-server-client.xml.i>
+#include <include/bgp/afi-soft-reconfiguration.xml.i>
 <leafNode name="unsuppress-map">
   <properties>
     <help>Route-map to selectively unsuppress suppressed routes</help>
diff --git a/interface-definitions/include/bgp/bgp-afi-common.xml.i b/interface-definitions/include/bgp/afi-common.xml.i
index 7782e7ef2..601ffe223 100644
--- a/interface-definitions/include/bgp/bgp-afi-common.xml.i
+++ b/interface-definitions/include/bgp/afi-common.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-afi-common.xml.i -->
+<!-- include start from bgp/afi-common.xml.i -->
 <leafNode name="addpath-tx-all">
   <properties>
     <help>Use addpath to advertise all paths to a neighbor</help>
@@ -11,14 +11,14 @@
     <valueless/>
   </properties>
 </leafNode>
-#include <include/bgp/bgp-afi-allowas-in.xml.i>
+#include <include/bgp/afi-allowas-in.xml.i>
 <leafNode name="as-override">
   <properties>
     <help>AS for routes sent to this peer to be the local AS</help>
     <valueless/>
   </properties>
 </leafNode>
-#include <include/bgp/bgp-afi-attribute-unchanged.xml.i>
+#include <include/bgp/afi-attribute-unchanged.xml.i>
 <node name="disable-send-community">
   <properties>
     <help>Disable sending community attributes to this peer</help>
@@ -118,17 +118,17 @@
     </constraint>
   </properties>
 </leafNode>
-#include <include/bgp/bgp-afi-nexthop-self.xml.i>
+#include <include/bgp/afi-nexthop-self.xml.i>
 <leafNode name="remove-private-as">
   <properties>
     <help>Remove private AS numbers from AS path in outbound route updates</help>
     <valueless/>
   </properties>
 </leafNode>
-#include <include/bgp/bgp-afi-route-map.xml.i>
-#include <include/bgp/bgp-afi-route-reflector-client.xml.i>
-#include <include/bgp/bgp-afi-route-server-client.xml.i>
-#include <include/bgp/bgp-afi-soft-reconfiguration.xml.i>
+#include <include/bgp/afi-route-map.xml.i>
+#include <include/bgp/afi-route-reflector-client.xml.i>
+#include <include/bgp/afi-route-server-client.xml.i>
+#include <include/bgp/afi-soft-reconfiguration.xml.i>
 <leafNode name="unsuppress-map">
   <properties>
     <help>Route-map to selectively unsuppress suppressed routes</help>
diff --git a/interface-definitions/include/bgp/bgp-afi-ipv4-prefix-list.xml.i b/interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i
index 133b5da28..f4710e9aa 100644
--- a/interface-definitions/include/bgp/bgp-afi-ipv4-prefix-list.xml.i
+++ b/interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-afi-ipv4-prefix-list.xml.i -->
+<!-- include start from bgp/afi-ipv4-prefix-list.xml.i -->
 <node name="prefix-list">
   <properties>
     <help>IPv4-Prefix-list to filter route updates to/from this peer</help>
diff --git a/interface-definitions/include/bgp/bgp-afi-ipv6-nexthop-local.xml.i b/interface-definitions/include/bgp/afi-ipv6-nexthop-local.xml.i
index c74d81b1f..c2325458d 100644
--- a/interface-definitions/include/bgp/bgp-afi-ipv6-nexthop-local.xml.i
+++ b/interface-definitions/include/bgp/afi-ipv6-nexthop-local.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-afi-ipv6-nexthop-local.xml.i -->
+<!-- include start from bgp/afi-ipv6-nexthop-local.xml.i -->
     <node name="nexthop-local">
       <properties>
         <help>Nexthop attributes</help>
diff --git a/interface-definitions/include/bgp/bgp-afi-ipv6-prefix-list.xml.i b/interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i
index d597b7c99..bdb591290 100644
--- a/interface-definitions/include/bgp/bgp-afi-ipv6-prefix-list.xml.i
+++ b/interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-afi-ipv6-prefix-list.xml.i -->
+<!-- include start from bgp/afi-ipv6-prefix-list.xml.i -->
 <node name="prefix-list">
   <properties>
     <help>Prefix-list to filter route updates to/from this peer</help>
diff --git a/interface-definitions/include/bgp/bgp-afi-l2vpn-advertise.xml.i b/interface-definitions/include/bgp/afi-l2vpn-advertise.xml.i
index caf0b6b31..caf0b6b31 100644
--- a/interface-definitions/include/bgp/bgp-afi-l2vpn-advertise.xml.i
+++ b/interface-definitions/include/bgp/afi-l2vpn-advertise.xml.i
diff --git a/interface-definitions/include/bgp/bgp-afi-l2vpn-common.xml.i b/interface-definitions/include/bgp/afi-l2vpn-common.xml.i
index 3e7e4ef78..1673f25a5 100644
--- a/interface-definitions/include/bgp/bgp-afi-l2vpn-common.xml.i
+++ b/interface-definitions/include/bgp/afi-l2vpn-common.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-afi-l2vpn-common.xml.i -->
+<!-- include start from bgp/afi-l2vpn-common.xml.i -->
 <leafNode name="advertise-default-gw">
   <properties>
     <help>Advertise All default g/w mac-ip routes in EVPN</help>
@@ -23,5 +23,5 @@
     </constraint>
   </properties>
 </leafNode>
-#include <include/bgp/bgp-route-target.xml.i>
+#include <include/bgp/route-target.xml.i>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-afi-maximum-paths.xml.i b/interface-definitions/include/bgp/afi-maximum-paths.xml.i
index 6b220caa5..5358bb7ab 100644
--- a/interface-definitions/include/bgp/bgp-afi-maximum-paths.xml.i
+++ b/interface-definitions/include/bgp/afi-maximum-paths.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-afi-maximum-paths.xml.i -->
+<!-- include start from bgp/afi-maximum-paths.xml.i -->
 <node name="maximum-paths">
   <properties>
     <help>Forward packets over multiple paths</help>
diff --git a/interface-definitions/include/bgp/bgp-afi-nexthop-self.xml.i b/interface-definitions/include/bgp/afi-nexthop-self.xml.i
index a299f561e..36a7512ca 100644
--- a/interface-definitions/include/bgp/bgp-afi-nexthop-self.xml.i
+++ b/interface-definitions/include/bgp/afi-nexthop-self.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-afi-nexthop-self.xml.i -->
+<!-- include start from bgp/afi-nexthop-self.xml.i -->
 <node name="nexthop-self">
   <properties>
     <help>Disable the next hop calculation for this peer</help>
diff --git a/interface-definitions/include/bgp/bgp-afi-redistribute-metric-route-map.xml.i b/interface-definitions/include/bgp/afi-redistribute-metric-route-map.xml.i
index 4382901c8..d4c7ac4a0 100644
--- a/interface-definitions/include/bgp/bgp-afi-redistribute-metric-route-map.xml.i
+++ b/interface-definitions/include/bgp/afi-redistribute-metric-route-map.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-afi-redistribute-metric-route-map.xml.i -->
+<!-- include start from bgp/afi-redistribute-metric-route-map.xml.i -->
 <leafNode name="metric">
   <properties>
     <help>Metric for redistributed routes</help>
diff --git a/interface-definitions/include/bgp/bgp-afi-route-map.xml.i b/interface-definitions/include/bgp/afi-route-map.xml.i
index 7fac98586..5716668be 100644
--- a/interface-definitions/include/bgp/bgp-afi-route-map.xml.i
+++ b/interface-definitions/include/bgp/afi-route-map.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-afi-route-map.xml.i -->
+<!-- include start from bgp/afi-route-map.xml.i -->
 <node name="route-map">
   <properties>
     <help>Route-map to filter route updates to/from this peer</help>
diff --git a/interface-definitions/include/bgp/bgp-afi-route-reflector-client.xml.i b/interface-definitions/include/bgp/afi-route-reflector-client.xml.i
index 70fee40f0..dcb2d18d7 100644
--- a/interface-definitions/include/bgp/bgp-afi-route-reflector-client.xml.i
+++ b/interface-definitions/include/bgp/afi-route-reflector-client.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-afi-route-reflector-client.xml.i -->
+<!-- include start from bgp/afi-route-reflector-client.xml.i -->
 <leafNode name="route-reflector-client">
   <properties>
     <help>Peer is a route reflector client</help>
diff --git a/interface-definitions/include/bgp/bgp-afi-route-server-client.xml.i b/interface-definitions/include/bgp/afi-route-server-client.xml.i
index 29719c463..9bb628ee2 100644
--- a/interface-definitions/include/bgp/bgp-afi-route-server-client.xml.i
+++ b/interface-definitions/include/bgp/afi-route-server-client.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-afi-route-server-client.xml.i -->
+<!-- include start from bgp/afi-route-server-client.xml.i -->
 <leafNode name="route-server-client">
   <properties>
     <help>Peer is a route server client</help>
diff --git a/interface-definitions/include/bgp/bgp-afi-soft-reconfiguration.xml.i b/interface-definitions/include/bgp/afi-soft-reconfiguration.xml.i
index c3f050bb8..49336711e 100644
--- a/interface-definitions/include/bgp/bgp-afi-soft-reconfiguration.xml.i
+++ b/interface-definitions/include/bgp/afi-soft-reconfiguration.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-afi-soft-reconfiguration.xml.i -->
+<!-- include start from bgp/afi-soft-reconfiguration.xml.i -->
 <node name="soft-reconfiguration">
   <properties>
     <help>Soft reconfiguration for peer</help>
diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-l2vpn-evpn.xml.i b/interface-definitions/include/bgp/bgp-neighbor-afi-l2vpn-evpn.xml.i
deleted file mode 100644
index 0a9c599fa..000000000
--- a/interface-definitions/include/bgp/bgp-neighbor-afi-l2vpn-evpn.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from bgp-neighbor-afi-l2vpn-evpn.xml.i -->
-<node name="l2vpn-evpn">
-  <properties>
-    <help>L2VPN EVPN BGP settings</help>
-  </properties>
-  <children>
-    #include <include/bgp/bgp-afi-allowas-in.xml.i>
-    #include <include/bgp/bgp-afi-attribute-unchanged.xml.i>
-    #include <include/bgp/bgp-afi-nexthop-self.xml.i>
-    #include <include/bgp/bgp-afi-route-map.xml.i>
-    #include <include/bgp/bgp-afi-route-reflector-client.xml.i>
-    #include <include/bgp/bgp-afi-route-server-client.xml.i>
-    #include <include/bgp/bgp-afi-soft-reconfiguration.xml.i>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-flowspec.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv4-flowspec.xml.i
index 732ff1773..9c700bd11 100644
--- a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-flowspec.xml.i
+++ b/interface-definitions/include/bgp/neighbor-afi-ipv4-flowspec.xml.i
@@ -4,8 +4,8 @@
     <help>IPv4 Flow Specification BGP neighbor parameters</help>
   </properties>
   <children>
-    #include <include/bgp/bgp-afi-ipv4-prefix-list.xml.i>
-    #include <include/bgp/bgp-afi-common-flowspec.xml.i>
+    #include <include/bgp/afi-ipv4-prefix-list.xml.i>
+    #include <include/bgp/afi-common-flowspec.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-labeled-unicast.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv4-labeled-unicast.xml.i
index 9baf5380d..5d0ca81bc 100644
--- a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-labeled-unicast.xml.i
+++ b/interface-definitions/include/bgp/neighbor-afi-ipv4-labeled-unicast.xml.i
@@ -9,11 +9,11 @@
         <help>Advertise capabilities to this neighbor (IPv4)</help>
       </properties>
       <children>
-        #include <include/bgp/bgp-afi-capability-orf.xml.i>
+        #include <include/bgp/afi-capability-orf.xml.i>
       </children>
     </node>
-    #include <include/bgp/bgp-afi-ipv4-prefix-list.xml.i>
-    #include <include/bgp/bgp-afi-common.xml.i>
+    #include <include/bgp/afi-ipv4-prefix-list.xml.i>
+    #include <include/bgp/afi-common.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-multicast.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv4-multicast.xml.i
index 073e5a868..2bc974b7f 100644
--- a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-multicast.xml.i
+++ b/interface-definitions/include/bgp/neighbor-afi-ipv4-multicast.xml.i
@@ -9,11 +9,11 @@
         <help>Advertise capabilities to this neighbor (IPv4)</help>
       </properties>
       <children>
-        #include <include/bgp/bgp-afi-capability-orf.xml.i>
+        #include <include/bgp/afi-capability-orf.xml.i>
       </children>
     </node>
-    #include <include/bgp/bgp-afi-ipv4-prefix-list.xml.i>
-    #include <include/bgp/bgp-afi-common.xml.i>
+    #include <include/bgp/afi-ipv4-prefix-list.xml.i>
+    #include <include/bgp/afi-common.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-unicast.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv4-unicast.xml.i
index 945483276..3e2191e93 100644
--- a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-unicast.xml.i
+++ b/interface-definitions/include/bgp/neighbor-afi-ipv4-unicast.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-neighbor-afi-ipv4-unicast.xml.i -->
+<!-- include start from bgp/neighbor-afi-ipv4-unicast.xml.i -->
 <node name="ipv4-unicast">
   <properties>
     <help>IPv4 BGP neighbor parameters</help>
@@ -9,11 +9,11 @@
         <help>Advertise capabilities to this neighbor (IPv4)</help>
       </properties>
       <children>
-        #include <include/bgp/bgp-afi-capability-orf.xml.i>
+        #include <include/bgp/afi-capability-orf.xml.i>
       </children>
     </node>
-    #include <include/bgp/bgp-afi-ipv4-prefix-list.xml.i>
-    #include <include/bgp/bgp-afi-common.xml.i>
+    #include <include/bgp/afi-ipv4-prefix-list.xml.i>
+    #include <include/bgp/afi-common.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-vpn.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv4-vpn.xml.i
index 1ce7028b8..b5edaccf3 100644
--- a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-vpn.xml.i
+++ b/interface-definitions/include/bgp/neighbor-afi-ipv4-vpn.xml.i
@@ -4,8 +4,8 @@
     <help>IPv4 VPN BGP neighbor parameters</help>
   </properties>
   <children>
-    #include <include/bgp/bgp-afi-ipv4-prefix-list.xml.i>
-    #include <include/bgp/bgp-afi-common-vpn.xml.i>
+    #include <include/bgp/afi-ipv4-prefix-list.xml.i>
+    #include <include/bgp/afi-common-vpn.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-flowspec.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv6-flowspec.xml.i
index 3fbf785ce..692310b0c 100644
--- a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-flowspec.xml.i
+++ b/interface-definitions/include/bgp/neighbor-afi-ipv6-flowspec.xml.i
@@ -4,8 +4,8 @@
     <help>IPv6 Flow Specification BGP neighbor parameters</help>
   </properties>
   <children>
-    #include <include/bgp/bgp-afi-ipv6-prefix-list.xml.i>
-    #include <include/bgp/bgp-afi-common-flowspec.xml.i>
+    #include <include/bgp/afi-ipv6-prefix-list.xml.i>
+    #include <include/bgp/afi-common-flowspec.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-labeled-unicast.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv6-labeled-unicast.xml.i
index 1f84e7afb..c2f14570b 100644
--- a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-labeled-unicast.xml.i
+++ b/interface-definitions/include/bgp/neighbor-afi-ipv6-labeled-unicast.xml.i
@@ -9,12 +9,12 @@
         <help>Advertise capabilities to this neighbor (IPv6)</help>
       </properties>
       <children>
-        #include <include/bgp/bgp-afi-capability-orf.xml.i>
+        #include <include/bgp/afi-capability-orf.xml.i>
       </children>
     </node>
-    #include <include/bgp/bgp-afi-ipv6-nexthop-local.xml.i>
-    #include <include/bgp/bgp-afi-ipv6-prefix-list.xml.i>
-    #include <include/bgp/bgp-afi-common.xml.i>
+    #include <include/bgp/afi-ipv6-nexthop-local.xml.i>
+    #include <include/bgp/afi-ipv6-prefix-list.xml.i>
+    #include <include/bgp/afi-common.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-multicast.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv6-multicast.xml.i
index e49465ed2..4890e2b51 100644
--- a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-multicast.xml.i
+++ b/interface-definitions/include/bgp/neighbor-afi-ipv6-multicast.xml.i
@@ -4,9 +4,9 @@
     <help>IPv6 Multicast BGP neighbor parameters</help>
   </properties>
   <children>
-    #include <include/bgp/bgp-afi-ipv6-nexthop-local.xml.i>
-    #include <include/bgp/bgp-afi-ipv6-prefix-list.xml.i>
-    #include <include/bgp/bgp-afi-common.xml.i>
+    #include <include/bgp/afi-ipv6-nexthop-local.xml.i>
+    #include <include/bgp/afi-ipv6-prefix-list.xml.i>
+    #include <include/bgp/afi-common.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-unicast.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv6-unicast.xml.i
index 4cd676cb4..68f61c72a 100644
--- a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-unicast.xml.i
+++ b/interface-definitions/include/bgp/neighbor-afi-ipv6-unicast.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-neighbor-afi-ipv6-unicast.xml.i -->
+<!-- include start from bgp/neighbor-afi-ipv6-unicast.xml.i -->
 <node name="ipv6-unicast">
   <properties>
     <help>IPv6 BGP neighbor parameters</help>
@@ -9,12 +9,12 @@
         <help>Advertise capabilities to this neighbor (IPv6)</help>
       </properties>
       <children>
-        #include <include/bgp/bgp-afi-capability-orf.xml.i>
+        #include <include/bgp/afi-capability-orf.xml.i>
       </children>
     </node>
-    #include <include/bgp/bgp-afi-ipv6-nexthop-local.xml.i>
-    #include <include/bgp/bgp-afi-ipv6-prefix-list.xml.i>
-    #include <include/bgp/bgp-afi-common.xml.i>
+    #include <include/bgp/afi-ipv6-nexthop-local.xml.i>
+    #include <include/bgp/afi-ipv6-prefix-list.xml.i>
+    #include <include/bgp/afi-common.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-vpn.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv6-vpn.xml.i
index 9a7a22418..62a4345fc 100644
--- a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-vpn.xml.i
+++ b/interface-definitions/include/bgp/neighbor-afi-ipv6-vpn.xml.i
@@ -4,9 +4,9 @@
     <help>IPv6 VPN BGP neighbor parameters</help>
   </properties>
   <children>
-    #include <include/bgp/bgp-afi-ipv6-nexthop-local.xml.i>
-    #include <include/bgp/bgp-afi-ipv6-prefix-list.xml.i>
-    #include <include/bgp/bgp-afi-common-vpn.xml.i>
+    #include <include/bgp/afi-ipv6-nexthop-local.xml.i>
+    #include <include/bgp/afi-ipv6-prefix-list.xml.i>
+    #include <include/bgp/afi-common-vpn.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/neighbor-afi-l2vpn-evpn.xml.i b/interface-definitions/include/bgp/neighbor-afi-l2vpn-evpn.xml.i
new file mode 100644
index 000000000..c9f66005b
--- /dev/null
+++ b/interface-definitions/include/bgp/neighbor-afi-l2vpn-evpn.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from bgp/neighbor-afi-l2vpn-evpn.xml.i -->
+<node name="l2vpn-evpn">
+  <properties>
+    <help>L2VPN EVPN BGP settings</help>
+  </properties>
+  <children>
+    #include <include/bgp/afi-allowas-in.xml.i>
+    #include <include/bgp/afi-attribute-unchanged.xml.i>
+    #include <include/bgp/afi-nexthop-self.xml.i>
+    #include <include/bgp/afi-route-map.xml.i>
+    #include <include/bgp/afi-route-reflector-client.xml.i>
+    #include <include/bgp/afi-route-server-client.xml.i>
+    #include <include/bgp/afi-soft-reconfiguration.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-bfd.xml.i b/interface-definitions/include/bgp/neighbor-bfd.xml.i
index d918fd673..d486bdd8a 100644
--- a/interface-definitions/include/bgp/bgp-bfd.xml.i
+++ b/interface-definitions/include/bgp/neighbor-bfd.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-bfd.xml.i -->
+<!-- include start from bgp/neighbor-bfd.xml.i -->
 <node name="bfd">
   <properties>
     <help>Enable Bidirectional Forwarding Detection (BFD) support</help>
diff --git a/interface-definitions/include/bgp/bgp-capability.xml.i b/interface-definitions/include/bgp/neighbor-capability.xml.i
index 89ce19ca6..2bbfadf1f 100644
--- a/interface-definitions/include/bgp/bgp-capability.xml.i
+++ b/interface-definitions/include/bgp/neighbor-capability.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-capability.xml.i -->
+<!-- include start from bgp/neighbor-capability.xml.i -->
 <node name="capability">
   <properties>
     <help>Advertise capabilities to this peer-group</help>
diff --git a/interface-definitions/include/bgp/bgp-description.xml.i b/interface-definitions/include/bgp/neighbor-description.xml.i
index 308bbec12..3095d2560 100644
--- a/interface-definitions/include/bgp/bgp-description.xml.i
+++ b/interface-definitions/include/bgp/neighbor-description.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-description.xml.i -->
+<!-- include start from bgp/neighbor-description.xml.i -->
 <leafNode name="description">
   <properties>
     <help>Neighbor specific description</help>
diff --git a/interface-definitions/include/bgp/bgp-disable-capability-negotiation.xml.i b/interface-definitions/include/bgp/neighbor-disable-capability-negotiation.xml.i
index 74c3321d9..0c44e47b4 100644
--- a/interface-definitions/include/bgp/bgp-disable-capability-negotiation.xml.i
+++ b/interface-definitions/include/bgp/neighbor-disable-capability-negotiation.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-disable-capability-negotiation.xml.i -->
+<!-- include start from bgp/neighbor-disable-capability-negotiation.xml.i -->
 <leafNode name="disable-capability-negotiation">
   <properties>
     <help>Disable capability negotiation with this neighbor</help>
diff --git a/interface-definitions/include/bgp/bgp-disable-connected-check.xml.i b/interface-definitions/include/bgp/neighbor-disable-connected-check.xml.i
index 15142b0ac..cb8b610b4 100644
--- a/interface-definitions/include/bgp/bgp-disable-connected-check.xml.i
+++ b/interface-definitions/include/bgp/neighbor-disable-connected-check.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-disable-connected-check.xml.i -->
+<!-- include start from bgp/neighbor-disable-connected-check.xml.i -->
 <leafNode name="disable-connected-check">
   <properties>
     <help>Disable check to see if eBGP peer address is a connected route</help>
diff --git a/interface-definitions/include/bgp/bgp-ebgp-multihop.xml.i b/interface-definitions/include/bgp/neighbor-ebgp-multihop.xml.i
index 48580af3c..c053de7e1 100644
--- a/interface-definitions/include/bgp/bgp-ebgp-multihop.xml.i
+++ b/interface-definitions/include/bgp/neighbor-ebgp-multihop.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-ebgp-multihop.xml.i -->
+<!-- include start from bgp/neighbor-ebgp-multihop.xml.i -->
 <leafNode name="ebgp-multihop">
   <properties>
     <help>Allow this EBGP neighbor to not be on a directly connected network</help>
diff --git a/interface-definitions/include/bgp/neighbor-graceful-restart.xml.i b/interface-definitions/include/bgp/neighbor-graceful-restart.xml.i
new file mode 100644
index 000000000..25558cd5c
--- /dev/null
+++ b/interface-definitions/include/bgp/neighbor-graceful-restart.xml.i
@@ -0,0 +1,25 @@
+<!-- include start from bgp/neighbor-graceful-restart.xml.i -->
+<leafNode name="graceful-restart">
+  <properties>
+    <help>BGP graceful restart functionality</help>
+    <completionHelp>
+      <list>enable disable restart-helper</list>
+    </completionHelp>
+    <valueHelp>
+      <format>enable</format>
+      <description>Enable BGP graceful restart at peer level</description>
+    </valueHelp>
+    <valueHelp>
+      <format>disable</format>
+      <description>Disable BGP graceful restart at peer level</description>
+    </valueHelp>
+    <valueHelp>
+      <format>restart-helper</format>
+      <description>Enable BGP graceful restart helper only functionality</description>
+    </valueHelp>
+    <constraint>
+      <regex>^(enable|disable|restart-helper)$</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-local-as.xml.i b/interface-definitions/include/bgp/neighbor-local-as.xml.i
index 7fc896a31..28c6b72b6 100644
--- a/interface-definitions/include/bgp/bgp-local-as.xml.i
+++ b/interface-definitions/include/bgp/neighbor-local-as.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-local-as.xml.i -->
+<!-- include start from bgp/neighbor-local-as.xml.i -->
 <tagNode name="local-as">
   <properties>
     <help>Local AS number [REQUIRED]</help>
diff --git a/interface-definitions/include/bgp/bgp-override-capability.xml.i b/interface-definitions/include/bgp/neighbor-override-capability.xml.i
index 1e51a49d5..1ef28b2ac 100644
--- a/interface-definitions/include/bgp/bgp-override-capability.xml.i
+++ b/interface-definitions/include/bgp/neighbor-override-capability.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-override-capability.xml.i -->
+<!-- include start from bgp/neighbor-override-capability.xml.i -->
 <leafNode name="override-capability">
   <properties>
     <help>Ignore capability negotiation with specified neighbor</help>
diff --git a/interface-definitions/include/bgp/bgp-passive.xml.i b/interface-definitions/include/bgp/neighbor-passive.xml.i
index 033cf8231..c7d867ab2 100644
--- a/interface-definitions/include/bgp/bgp-passive.xml.i
+++ b/interface-definitions/include/bgp/neighbor-passive.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-passive.xml.i -->
+<!-- include start from bgp/neighbor-passive.xml.i -->
 <leafNode name="passive">
   <properties>
     <help>Do not initiate a session with this neighbor</help>
diff --git a/interface-definitions/include/bgp/bgp-password.xml.i b/interface-definitions/include/bgp/neighbor-password.xml.i
index f5878cce9..3a7eaaae2 100644
--- a/interface-definitions/include/bgp/bgp-password.xml.i
+++ b/interface-definitions/include/bgp/neighbor-password.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-password.xml.i -->
+<!-- include start from bgp/neighbor-password.xml.i -->
 <leafNode name="password">
   <properties>
     <help>BGP MD5 password</help>
diff --git a/interface-definitions/include/bgp/bgp-shutdown.xml.i b/interface-definitions/include/bgp/neighbor-shutdown.xml.i
index f920e9579..6d15899a6 100644
--- a/interface-definitions/include/bgp/bgp-shutdown.xml.i
+++ b/interface-definitions/include/bgp/neighbor-shutdown.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-shutdown.xml.i -->
+<!-- include start from bgp/neighbor-shutdown.xml.i -->
 <leafNode name="shutdown">
   <properties>
     <help>Administratively shut down this neighbor</help>
diff --git a/interface-definitions/include/bgp/bgp-ttl-security.xml.i b/interface-definitions/include/bgp/neighbor-ttl-security.xml.i
index 1fb1c2c55..6def1fe81 100644
--- a/interface-definitions/include/bgp/bgp-ttl-security.xml.i
+++ b/interface-definitions/include/bgp/neighbor-ttl-security.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-ttl-security.xml.i -->
+<!-- include start from bgp/neighbor-ttl-security.xml.i -->
 <node name="ttl-security">
   <properties>
     <help>Ttl security mechanism</help>
diff --git a/interface-definitions/include/bgp/bgp-update-source.xml.i b/interface-definitions/include/bgp/neighbor-update-source.xml.i
index f4ccc3553..37faf2cce 100644
--- a/interface-definitions/include/bgp/bgp-update-source.xml.i
+++ b/interface-definitions/include/bgp/neighbor-update-source.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-update-source.xml.i -->
+<!-- include start from bgp/neighbor-update-source.xml.i -->
 <leafNode name="update-source">
   <!-- Need to check format interfaces -->
   <properties>
diff --git a/interface-definitions/include/bgp/bgp-peer-group.xml.i b/interface-definitions/include/bgp/peer-group.xml.i
index 77dab4a8b..3866fc017 100644
--- a/interface-definitions/include/bgp/bgp-peer-group.xml.i
+++ b/interface-definitions/include/bgp/peer-group.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-peer-group.xml.i -->
+<!-- include start from bgp/peer-group.xml.i -->
 <leafNode name="peer-group">
   <properties>
     <help>Peer group for this peer</help>
diff --git a/interface-definitions/include/bgp/bgp-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index 66843a55f..d85ca4b79 100644
--- a/interface-definitions/include/bgp/bgp-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp/bgp-common-config.xml.i -->
+<!-- include start from bgp/protocol-common-config.xml.i -->
 <node name="address-family">
   <properties>
     <help>BGP address-family parameters</help>
@@ -21,7 +21,7 @@
             </constraint>
           </properties>
           <children>
-            #include <include/bgp/bgp-afi-aggregate-address.xml.i>
+            #include <include/bgp/afi-aggregate-address.xml.i>
           </children>
         </tagNode>
         <node name="distance">
@@ -114,7 +114,7 @@
             #include <include/route-map.xml.i>
           </children>
         </tagNode>
-        #include <include/bgp/bgp-afi-maximum-paths.xml.i>
+        #include <include/bgp/afi-maximum-paths.xml.i>
         <node name="redistribute">
           <properties>
             <help>Redistribute routes from other protocols into BGP</help>
@@ -125,7 +125,7 @@
                 <help>Redistribute connected routes into BGP</help>
               </properties>
               <children>
-                #include <include/bgp/bgp-afi-redistribute-metric-route-map.xml.i>
+                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
             <node name="isis">
@@ -133,7 +133,7 @@
                 <help>Redistribute IS-IS routes into BGP</help>
               </properties>
               <children>
-                #include <include/bgp/bgp-afi-redistribute-metric-route-map.xml.i>
+                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
             <node name="kernel">
@@ -141,7 +141,7 @@
                 <help>Redistribute kernel routes into BGP</help>
               </properties>
               <children>
-                #include <include/bgp/bgp-afi-redistribute-metric-route-map.xml.i>
+                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
             <node name="ospf">
@@ -149,7 +149,7 @@
                 <help>Redistribute OSPF routes into BGP</help>
               </properties>
               <children>
-                #include <include/bgp/bgp-afi-redistribute-metric-route-map.xml.i>
+                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
             <node name="rip">
@@ -157,7 +157,7 @@
                 <help>Redistribute RIP routes into BGP</help>
               </properties>
               <children>
-                #include <include/bgp/bgp-afi-redistribute-metric-route-map.xml.i>
+                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
             <node name="static">
@@ -165,7 +165,7 @@
                 <help>Redistribute static routes into BGP</help>
               </properties>
               <children>
-                #include <include/bgp/bgp-afi-redistribute-metric-route-map.xml.i>
+                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
             <leafNode name="table">
@@ -194,7 +194,7 @@
             </constraint>
           </properties>
           <children>
-            #include <include/bgp/bgp-afi-aggregate-address.xml.i>
+            #include <include/bgp/afi-aggregate-address.xml.i>
           </children>
         </tagNode>
         <node name="distance">
@@ -306,7 +306,7 @@
             </constraint>
           </properties>
           <children>
-            #include <include/bgp/bgp-afi-aggregate-address.xml.i>
+            #include <include/bgp/afi-aggregate-address.xml.i>
           </children>
         </tagNode>
         <tagNode name="network">
@@ -417,7 +417,7 @@
             </constraint>
           </properties>
           <children>
-            #include <include/bgp/bgp-afi-aggregate-address.xml.i>
+            #include <include/bgp/afi-aggregate-address.xml.i>
           </children>
         </tagNode>
         <node name="distance">
@@ -516,7 +516,7 @@
             #include <include/route-map.xml.i>
           </children>
         </tagNode>
-        #include <include/bgp/bgp-afi-maximum-paths.xml.i>
+        #include <include/bgp/afi-maximum-paths.xml.i>
         <node name="redistribute">
           <properties>
             <help>Redistribute routes from other protocols into BGP</help>
@@ -527,7 +527,7 @@
                 <help>Redistribute connected routes into BGP</help>
               </properties>
               <children>
-                #include <include/bgp/bgp-afi-redistribute-metric-route-map.xml.i>
+                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
             <node name="kernel">
@@ -535,7 +535,7 @@
                 <help>Redistribute kernel routes into BGP</help>
               </properties>
               <children>
-                #include <include/bgp/bgp-afi-redistribute-metric-route-map.xml.i>
+                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
             <node name="ospfv3">
@@ -543,7 +543,7 @@
                 <help>Redistribute OSPFv3 routes into BGP</help>
               </properties>
               <children>
-                #include <include/bgp/bgp-afi-redistribute-metric-route-map.xml.i>
+                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
             <node name="ripng">
@@ -551,7 +551,7 @@
                 <help>Redistribute RIPng routes into BGP</help>
               </properties>
               <children>
-                #include <include/bgp/bgp-afi-redistribute-metric-route-map.xml.i>
+                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
             <node name="static">
@@ -559,7 +559,7 @@
                 <help>Redistribute static routes into BGP</help>
               </properties>
               <children>
-                #include <include/bgp/bgp-afi-redistribute-metric-route-map.xml.i>
+                #include <include/bgp/afi-redistribute-metric-route-map.xml.i>
               </children>
             </node>
             <leafNode name="table">
@@ -588,7 +588,7 @@
             </constraint>
           </properties>
           <children>
-            #include <include/bgp/bgp-afi-aggregate-address.xml.i>
+            #include <include/bgp/afi-aggregate-address.xml.i>
           </children>
         </tagNode>
         <node name="distance">
@@ -706,7 +706,7 @@
             </constraint>
           </properties>
           <children>
-            #include <include/bgp/bgp-afi-aggregate-address.xml.i>
+            #include <include/bgp/afi-aggregate-address.xml.i>
           </children>
         </tagNode>
         <tagNode name="network">
@@ -815,7 +815,7 @@
                 <help>IPv4 address family</help>
               </properties>
               <children>
-                #include <include/bgp/bgp-afi-l2vpn-advertise.xml.i>
+                #include <include/bgp/afi-l2vpn-advertise.xml.i>
               </children>
             </node>
             <node name="ipv6">
@@ -823,7 +823,7 @@
                 <help>IPv6 address family</help>
               </properties>
               <children>
-                #include <include/bgp/bgp-afi-l2vpn-advertise.xml.i>
+                #include <include/bgp/afi-l2vpn-advertise.xml.i>
               </children>
             </node>
           </children>
@@ -834,7 +834,7 @@
             <valueless/>
           </properties>
         </leafNode>
-        #include <include/bgp/bgp-afi-l2vpn-common.xml.i>
+        #include <include/bgp/afi-l2vpn-common.xml.i>
         <leafNode name="advertise-pip">
           <properties>
             <help>EVPN system primary IP</help>
@@ -884,7 +884,7 @@
             </constraint>
           </properties>
           <children>
-            #include <include/bgp/bgp-afi-l2vpn-common.xml.i>
+            #include <include/bgp/afi-l2vpn-common.xml.i>
           </children>
         </tagNode>
       </children>
@@ -925,7 +925,7 @@
         </constraint>
       </properties>
       <children>
-        #include <include/bgp/bgp-peer-group.xml.i>
+        #include <include/bgp/peer-group.xml.i>
       </children>
     </tagNode>
   </children>
@@ -969,17 +969,17 @@
         <help>Parameters relating to IPv4 or IPv6 routes</help>
       </properties>
       <children>
-        #include <include/bgp/bgp-neighbor-afi-ipv4-unicast.xml.i>
-        #include <include/bgp/bgp-neighbor-afi-ipv6-unicast.xml.i>
-        #include <include/bgp/bgp-neighbor-afi-ipv4-labeled-unicast.xml.i>
-        #include <include/bgp/bgp-neighbor-afi-ipv6-labeled-unicast.xml.i>
-        #include <include/bgp/bgp-neighbor-afi-ipv4-vpn.xml.i>
-        #include <include/bgp/bgp-neighbor-afi-ipv6-vpn.xml.i>
-        #include <include/bgp/bgp-neighbor-afi-ipv4-flowspec.xml.i>
-        #include <include/bgp/bgp-neighbor-afi-ipv6-flowspec.xml.i>
-        #include <include/bgp/bgp-neighbor-afi-ipv4-multicast.xml.i>
-        #include <include/bgp/bgp-neighbor-afi-ipv6-multicast.xml.i>
-        #include <include/bgp/bgp-neighbor-afi-l2vpn-evpn.xml.i>
+        #include <include/bgp/neighbor-afi-ipv4-unicast.xml.i>
+        #include <include/bgp/neighbor-afi-ipv6-unicast.xml.i>
+        #include <include/bgp/neighbor-afi-ipv4-labeled-unicast.xml.i>
+        #include <include/bgp/neighbor-afi-ipv6-labeled-unicast.xml.i>
+        #include <include/bgp/neighbor-afi-ipv4-vpn.xml.i>
+        #include <include/bgp/neighbor-afi-ipv6-vpn.xml.i>
+        #include <include/bgp/neighbor-afi-ipv4-flowspec.xml.i>
+        #include <include/bgp/neighbor-afi-ipv6-flowspec.xml.i>
+        #include <include/bgp/neighbor-afi-ipv4-multicast.xml.i>
+        #include <include/bgp/neighbor-afi-ipv6-multicast.xml.i>
+        #include <include/bgp/neighbor-afi-l2vpn-evpn.xml.i>
       </children>
     </node>
     <leafNode name="advertisement-interval">
@@ -994,35 +994,36 @@
         </constraint>
       </properties>
     </leafNode>
-    #include <include/bgp/bgp-bfd.xml.i>
-    #include <include/bgp/bgp-capability.xml.i>
-    #include <include/bgp/bgp-description.xml.i>
-    #include <include/bgp/bgp-disable-capability-negotiation.xml.i>
-    #include <include/bgp/bgp-disable-connected-check.xml.i>
-    #include <include/bgp/bgp-ebgp-multihop.xml.i>
+    #include <include/bgp/neighbor-bfd.xml.i>
+    #include <include/bgp/neighbor-capability.xml.i>
+    #include <include/bgp/neighbor-description.xml.i>
+    #include <include/bgp/neighbor-disable-capability-negotiation.xml.i>
+    #include <include/bgp/neighbor-disable-connected-check.xml.i>
+    #include <include/bgp/neighbor-ebgp-multihop.xml.i>
+    #include <include/bgp/neighbor-graceful-restart.xml.i>
     <node name="interface">
       <properties>
         <help>Interface parameters</help>
       </properties>
       <children>
-        #include <include/bgp/bgp-peer-group.xml.i>
-        #include <include/bgp/bgp-remote-as.xml.i>
+        #include <include/bgp/peer-group.xml.i>
+        #include <include/bgp/remote-as.xml.i>
         <node name="v6only">
           <properties>
             <help>Enable BGP with v6 link-local only</help>
           </properties>
           <children>
-            #include <include/bgp/bgp-peer-group.xml.i>
-            #include <include/bgp/bgp-remote-as.xml.i>
+            #include <include/bgp/peer-group.xml.i>
+            #include <include/bgp/remote-as.xml.i>
           </children>
         </node>
       </children>
     </node>
-    #include <include/bgp/bgp-local-as.xml.i>
-    #include <include/bgp/bgp-override-capability.xml.i>
-    #include <include/bgp/bgp-passive.xml.i>
-    #include <include/bgp/bgp-password.xml.i>
-    #include <include/bgp/bgp-peer-group.xml.i>
+    #include <include/bgp/neighbor-local-as.xml.i>
+    #include <include/bgp/neighbor-override-capability.xml.i>
+    #include <include/bgp/neighbor-passive.xml.i>
+    #include <include/bgp/neighbor-password.xml.i>
+    #include <include/bgp/peer-group.xml.i>
     <leafNode name="port">
       <properties>
         <help>Neighbor BGP port</help>
@@ -1035,8 +1036,8 @@
         </constraint>
       </properties>
     </leafNode>
-    #include <include/bgp/bgp-remote-as.xml.i>
-    #include <include/bgp/bgp-shutdown.xml.i>
+    #include <include/bgp/remote-as.xml.i>
+    #include <include/bgp/neighbor-shutdown.xml.i>
     <leafNode name="strict-capability-match">
       <properties>
         <help>Enable strict capability negotiation</help>
@@ -1064,12 +1065,12 @@
             </constraint>
           </properties>
         </leafNode>
-        #include <include/bgp/bgp-timers-holdtime.xml.i>
-        #include <include/bgp/bgp-timers-keepalive.xml.i>
+        #include <include/bgp/timers-holdtime.xml.i>
+        #include <include/bgp/timers-keepalive.xml.i>
       </children>
     </node>
-    #include <include/bgp/bgp-ttl-security.xml.i>
-    #include <include/bgp/bgp-update-source.xml.i>
+    #include <include/bgp/neighbor-ttl-security.xml.i>
+    #include <include/bgp/neighbor-update-source.xml.i>
   </children>
 </tagNode>
 <node name="parameters">
@@ -1424,25 +1425,27 @@
         <help>BGP peer-group address-family parameters</help>
       </properties>
       <children>
-        #include <include/bgp/bgp-neighbor-afi-ipv4-unicast.xml.i>
-        #include <include/bgp/bgp-neighbor-afi-ipv6-unicast.xml.i>
-        #include <include/bgp/bgp-neighbor-afi-l2vpn-evpn.xml.i>
+        #include <include/bgp/neighbor-afi-ipv4-unicast.xml.i>
+        #include <include/bgp/neighbor-afi-ipv6-unicast.xml.i>
+        #include <include/bgp/neighbor-afi-l2vpn-evpn.xml.i>
       </children>
     </node>
-    #include <include/bgp/bgp-bfd.xml.i>
-    #include <include/bgp/bgp-capability.xml.i>
-    #include <include/bgp/bgp-description.xml.i>
-    #include <include/bgp/bgp-disable-capability-negotiation.xml.i>
-    #include <include/bgp/bgp-disable-connected-check.xml.i>
-    #include <include/bgp/bgp-ebgp-multihop.xml.i>
-    #include <include/bgp/bgp-local-as.xml.i>
-    #include <include/bgp/bgp-override-capability.xml.i>
-    #include <include/bgp/bgp-passive.xml.i>
-    #include <include/bgp/bgp-password.xml.i>
-    #include <include/bgp/bgp-remote-as.xml.i>
-    #include <include/bgp/bgp-shutdown.xml.i>
-    #include <include/bgp/bgp-ttl-security.xml.i>
-    #include <include/bgp/bgp-update-source.xml.i>
+    #include <include/bgp/neighbor-bfd.xml.i>
+    #include <include/bgp/neighbor-capability.xml.i>
+    #include <include/bgp/neighbor-description.xml.i>
+    #include <include/bgp/neighbor-disable-capability-negotiation.xml.i>
+    #include <include/bgp/neighbor-disable-connected-check.xml.i>
+    #include <include/bgp/neighbor-ebgp-multihop.xml.i>
+    #include <include/bgp/neighbor-graceful-restart.xml.i>
+    #include <include/bgp/neighbor-graceful-restart.xml.i>
+    #include <include/bgp/neighbor-local-as.xml.i>
+    #include <include/bgp/neighbor-override-capability.xml.i>
+    #include <include/bgp/neighbor-passive.xml.i>
+    #include <include/bgp/neighbor-password.xml.i>
+    #include <include/bgp/remote-as.xml.i>
+    #include <include/bgp/neighbor-shutdown.xml.i>
+    #include <include/bgp/neighbor-ttl-security.xml.i>
+    #include <include/bgp/neighbor-update-source.xml.i>
   </children>
 </tagNode>
 <node name="timers">
@@ -1450,8 +1453,8 @@
     <help>BGP protocol timers</help>
   </properties>
   <children>
-    #include <include/bgp/bgp-timers-holdtime.xml.i>
-    #include <include/bgp/bgp-timers-keepalive.xml.i>
+    #include <include/bgp/timers-holdtime.xml.i>
+    #include <include/bgp/timers-keepalive.xml.i>
   </children>
 </node>
 <!-- include end -->
 \ No newline at end of file
diff --git a/interface-definitions/include/bgp/bgp-remote-as.xml.i b/interface-definitions/include/bgp/remote-as.xml.i
index f036fe13d..11eb7c256 100644
--- a/interface-definitions/include/bgp/bgp-remote-as.xml.i
+++ b/interface-definitions/include/bgp/remote-as.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-remote-as.xml.i -->
+<!-- include start from bgp/remote-as.xml.i -->
 <leafNode name="remote-as">
   <properties>
     <help>Neighbor BGP AS number [REQUIRED]</help>
diff --git a/interface-definitions/include/bgp/bgp-route-target.xml.i b/interface-definitions/include/bgp/route-target.xml.i
index c05ac5dc2..674b6db15 100644
--- a/interface-definitions/include/bgp/bgp-route-target.xml.i
+++ b/interface-definitions/include/bgp/route-target.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-route-target.xml.i -->
+<!-- include start from bgp/route-target.xml.i -->
 <node name="route-target">
   <properties>
     <help>Route Target</help>
diff --git a/interface-definitions/include/bgp/bgp-timers-holdtime.xml.i b/interface-definitions/include/bgp/timers-holdtime.xml.i
index 9c16127b5..9e86ab13d 100644
--- a/interface-definitions/include/bgp/bgp-timers-holdtime.xml.i
+++ b/interface-definitions/include/bgp/timers-holdtime.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-timers-holdtime.xml.i -->
+<!-- include start from bgp/timers-holdtime.xml.i -->
 <leafNode name="holdtime">
   <properties>
     <help>BGP hold timer for this neighbor</help>
diff --git a/interface-definitions/include/bgp/bgp-timers-keepalive.xml.i b/interface-definitions/include/bgp/timers-keepalive.xml.i
index 8c3e66c6a..b2771e326 100644
--- a/interface-definitions/include/bgp/bgp-timers-keepalive.xml.i
+++ b/interface-definitions/include/bgp/timers-keepalive.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp-timers-keepalive.xml.i -->
+<!-- include start from bgp/timers-keepalive.xml.i -->
 <leafNode name="keepalive">
   <properties>
     <help>BGP keepalive interval for this neighbor</help>
diff --git a/interface-definitions/include/ospf/ospf-common-config.xml.i b/interface-definitions/include/ospf/ospf-common-config.xml.i
index a01d1c890..ef2b66f8b 100644
--- a/interface-definitions/include/ospf/ospf-common-config.xml.i
+++ b/interface-definitions/include/ospf/ospf-common-config.xml.i
@@ -55,14 +55,14 @@
 </tagNode>
 <tagNode name="area">
   <properties>
-    <help>OSPF Area</help>
+    <help>OSPF area settings</help>
     <valueHelp>
       <format>u32</format>
-      <description>OSPF area in decimal notation</description>
+      <description>OSPF area number in decimal notation</description>
     </valueHelp>
     <valueHelp>
       <format>ipv4</format>
-      <description>OSPF area in dotted decimal notation</description>
+      <description>OSPF area number in dotted decimal notation</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 0-4294967295"/>
@@ -83,12 +83,12 @@
         </leafNode>
         <node name="nssa">
           <properties>
-            <help>Nssa OSPF area</help>
+            <help>Not-So-Stubby OSPF area</help>
           </properties>
           <children>
             <leafNode name="default-cost">
               <properties>
-                <help>Summary-default cost of nssa area</help>
+                <help>Summary-default cost of an NSSA area</help>
                 <valueHelp>
                   <format>u32:0-16777215</format>
                   <description>Summary default cost</description>
@@ -112,15 +112,15 @@
                 </completionHelp>
                 <valueHelp>
                   <format>always</format>
-                  <description>NSSA-ABR to always translate</description>
+                  <description>Always translate LSA types</description>
                 </valueHelp>
                 <valueHelp>
                   <format>candidate</format>
-                  <description>NSSA-ABR for translate election (default)</description>
+                  <description>Translate for election (default)</description>
                 </valueHelp>
                 <valueHelp>
                   <format>never</format>
-                  <description>NSSA-ABR to never translate</description>
+                  <description>Never translate LSA types</description>
                 </valueHelp>
                 <constraint>
                   <regex>^(always|candidate|never)$</regex>
@@ -137,7 +137,7 @@
           <children>
             <leafNode name="default-cost">
               <properties>
-                <help>Summary-default cost of nssa area</help>
+                <help>Summary-default cost</help>
                 <valueHelp>
                   <format>u32:0-16777215</format>
                   <description>Summary default cost</description>
@@ -149,7 +149,7 @@
             </leafNode>
             <leafNode name="no-summary">
               <properties>
-                <help>Do not inject inter-area routes into stub</help>
+                <help>Do not inject inter-area routes into the stub</help>
                 <valueless/>
               </properties>
             </leafNode>
@@ -169,7 +169,7 @@
         </valueHelp>
         <valueHelp>
           <format>md5</format>
-          <description>Use md5 authentication</description>
+          <description>Use MD5 authentication</description>
         </valueHelp>
         <constraint>
           <regex>^(plaintext-password|md5)$</regex>
@@ -191,7 +191,7 @@
     </leafNode>
     <tagNode name="range">
       <properties>
-        <help>Summarize routes matching prefix (border routers only)</help>
+        <help>Summarize routes matching a prefix (border routers only)</help>
         <valueHelp>
           <format>ipv4net</format>
           <description>Area range prefix</description>
@@ -221,10 +221,10 @@
         </leafNode>
         <leafNode name="substitute">
           <properties>
-            <help>Announce area range as another prefix</help>
+            <help>Advertise area range as another prefix</help>
             <valueHelp>
               <format>ipv4net</format>
-              <description>Announce area range as another prefix</description>
+              <description>Advertise area range as another prefix</description>
             </valueHelp>
             <constraint>
               <validator name="ipv4-prefix"/>
@@ -297,7 +297,7 @@
 </node>
 <node name="default-information">
   <properties>
-    <help>Control distribution of default information</help>
+    <help>Default route advertisment settings</help>
   </properties>
   <children>
     <node name="originate">
@@ -307,7 +307,7 @@
       <children>
         <leafNode name="always">
           <properties>
-            <help>Always advertise default route</help>
+            <help>Always advertise a default route</help>
             <valueless/>
           </properties>
         </leafNode>
@@ -348,7 +348,7 @@
 </node>
 <tagNode name="interface">
   <properties>
-    <help>Interface related configuration</help>
+    <help>Interface configuration</help>
     <completionHelp>
       <script>${vyos_completion_dir}/list_interfaces.py</script>
     </completionHelp>
@@ -366,7 +366,7 @@
     #include <include/ospf/ospf-interface-common.xml.i>
     <leafNode name="bandwidth">
       <properties>
-        <help>Bandwidth of interface (Megabit/sec)</help>
+        <help>Interface bandwidth (Mbit/s)</help>
         <valueHelp>
           <format>u32:1-100000</format>
           <description>Bandwidth in Megabit/sec (for calculating OSPF cost)</description>
@@ -420,7 +420,7 @@
 </tagNode>
 <node name="log-adjacency-changes">
   <properties>
-    <help>Log changes in adjacency state</help>
+    <help>Log adjacency state changes</help>
   </properties>
   <children>
     <leafNode name="detail">
@@ -558,7 +558,7 @@
         </valueHelp>
         <valueHelp>
           <format>ibm</format>
-          <description>Ibm ABR type</description>
+          <description>IBM ABR type</description>
         </valueHelp>
         <valueHelp>
           <format>shortcut</format>
@@ -582,7 +582,7 @@
     </leafNode>
     <leafNode name="rfc1583-compatibility">
       <properties>
-        <help>Enable rfc1583 criteria for handling AS external routes</help>
+        <help>Enable RFC1583 criteria for handling AS external routes</help>
         <valueless/>
       </properties>
     </leafNode>
@@ -658,7 +658,7 @@
     </node>
     <node name="rip">
       <properties>
-        <help>Redistribute rip routes</help>
+        <help>Redistribute RIP routes</help>
       </properties>
       <children>
         #include <include/ospf/ospf-metric.xml.i>
@@ -714,7 +714,7 @@
           <children>
             <leafNode name="delay">
               <properties>
-                <help>Delay from first change received till SPF calculation (default: 200)</help>
+                <help>Delay from the first change received to SPF calculation (default: 200)</help>
                 <valueHelp>
                   <format>u32:0-600000</format>
                   <description>Delay in milliseconds</description>
diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in
index f4ebddb42..8589ffba5 100644
--- a/interface-definitions/protocols-bgp.xml.in
+++ b/interface-definitions/protocols-bgp.xml.in
@@ -8,7 +8,7 @@
           <priority>820</priority>
         </properties>
         <children>
-          #include <include/bgp/bgp-common-config.xml.i>
+          #include <include/bgp/protocol-common-config.xml.i>
           #include <include/route-map.xml.i>
         </children>
       </node>
diff --git a/interface-definitions/vrf.xml.in b/interface-definitions/vrf.xml.in
index a1ef45868..5b6cda29a 100644
--- a/interface-definitions/vrf.xml.in
+++ b/interface-definitions/vrf.xml.in
@@ -39,7 +39,7 @@
                   <priority>821</priority>
                 </properties>
                 <children>
-                  #include <include/bgp/bgp-common-config.xml.i>
+                  #include <include/bgp/protocol-common-config.xml.i>
                 </children>
               </node>
               <node name="isis" owner="${vyos_conf_scripts_dir}/protocols_isis.py $VAR(../../@)">
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index 5acb1fdfe..0969a5353 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -499,7 +499,7 @@ def get_accel_dict(config, base, chap_secrets):
     from vyos.util import get_half_cpus
     from vyos.template import is_ipv4
 
-    dict = config.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True)
+    dict = config.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True, no_tag_node_value_mangle=True)
 
     # We have gathered the dict representation of the CLI, but there are default
     # options which we need to update into the dictionary retrived.
diff --git a/smoketest/configs/bgp-bfd-communities b/smoketest/configs/bgp-bfd-communities
index 1a331f9ff..3b3056a51 100644
--- a/smoketest/configs/bgp-bfd-communities
+++ b/smoketest/configs/bgp-bfd-communities
@@ -421,6 +421,8 @@ protocols {
                     local 220
                 }
             }
+            graceful-restart {
+            }
         }
         peer-group DAL13 {
             address-family {
diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py
index a8c8ff2a2..aca1dbe46 100755
--- a/src/conf_mode/protocols_bgp.py
+++ b/src/conf_mode/protocols_bgp.py
@@ -161,7 +161,7 @@ def verify(bgp):
                 # Check if neighbor has both ipv4 unicast and ipv4 labeled unicast configured at the same time.
                 if 'ipv4_unicast' in peer_config['address_family'] and 'ipv4_labeled_unicast' in peer_config['address_family']:
                     raise ConfigError(f'Neighbor "{peer}" cannot have both ipv4-unicast and ipv4-labeled-unicast configured at the same time!')
-                    
+
                 # Check if neighbor has both ipv6 unicast and ipv6 labeled unicast configured at the same time.
                 if 'ipv6_unicast' in peer_config['address_family'] and 'ipv6_labeled_unicast' in peer_config['address_family']:
                     raise ConfigError(f'Neighbor "{peer}" cannot have both ipv6-unicast and ipv6-labeled-unicast configured at the same time!')
@@ -214,7 +214,7 @@ def verify(bgp):
                 if dict_search(f'parameters.distance.global.{key}', bgp) == None:
                     raise ConfigError('Missing mandatory configuration option for '\
                                      f'global administrative distance {key}!')
-        
+
     # Throw an error if the address family specific administrative distance parameters aren't all filled out.
     if dict_search('address_family', bgp) == None:
         pass
diff --git a/src/conf_mode/system-login.py b/src/conf_mode/system-login.py
index c8b81d80a..da0fc2a25 100755
--- a/src/conf_mode/system-login.py
+++ b/src/conf_mode/system-login.py
@@ -209,27 +209,27 @@ def apply(login):
         for user, user_config in login['user'].items():
             # make new user using vyatta shell and make home directory (-m),
             # default group of 100 (users)
-            command = 'useradd -m -N'
+            command = 'useradd --create-home --no-user-group'
             # check if user already exists:
             if user in get_local_users():
                 # update existing account
                 command = 'usermod'
 
             # all accounts use /bin/vbash
-            command += ' -s /bin/vbash'
+            command += ' --shell /bin/vbash'
             # we need to use '' quotes when passing formatted data to the shell
             # else it will not work as some data parts are lost in translation
             tmp = dict_search('authentication.encrypted_password', user_config)
-            if tmp: command += f" -p '{tmp}'"
+            if tmp: command += f" --password '{tmp}'"
 
             tmp = dict_search('full_name', user_config)
-            if tmp: command += f" -c '{tmp}'"
+            if tmp: command += f" --comment '{tmp}'"
 
             tmp = dict_search('home_directory', user_config)
-            if tmp: command += f" -d '{tmp}'"
-            else: command += f" -d '/home/{user}'"
+            if tmp: command += f" --home '{tmp}'"
+            else: command += f" --home '/home/{user}'"
 
-            command += f' -G frrvty,vyattacfg,sudo,adm,dip,disk {user}'
+            command += f' --groups frrvty,vyattacfg,sudo,adm,dip,disk {user}'
             try:
                 cmd(command)
 
@@ -254,7 +254,7 @@ def apply(login):
                     call(f'pkill -HUP -u {user}')
 
                 # Remove user account but leave home directory to be safe
-                call(f'userdel -r {user}', stderr=DEVNULL)
+                call(f'userdel --remove {user}', stderr=DEVNULL)
 
             except Exception as e:
                 raise ConfigError(f'Deleting user "{user}" raised exception: {e}')
diff --git a/src/conf_mode/vpn_openconnect.py b/src/conf_mode/vpn_openconnect.py
index b2aa13c0d..2986c3458 100755
--- a/src/conf_mode/vpn_openconnect.py
+++ b/src/conf_mode/vpn_openconnect.py
@@ -73,7 +73,7 @@ def verify(ocserv):
 
     # Check ssl
     if "ssl" in ocserv:
-        req_cert = ['ca_cert_file', 'cert_file', 'key_file']
+        req_cert = ['cert_file', 'key_file']
         for cert in req_cert:
             if not cert in ocserv["ssl"]:
                 raise ConfigError('openconnect ssl {0} required'.format(cert.replace('_', '-')))
diff --git a/src/pam-configs/radius b/src/pam-configs/radius
index 0e2c71e38..aaae6aeb0 100644
--- a/src/pam-configs/radius
+++ b/src/pam-configs/radius
@@ -3,18 +3,18 @@ Default: yes
 Priority: 257
 Auth-Type: Primary
 Auth:
-    [default=ignore success=1] pam_succeed_if.so uid eq 1001 quiet
-    [default=ignore success=ignore] pam_succeed_if.so uid eq 1002 quiet
+    [default=ignore success=1] pam_succeed_if.so uid eq 1000 quiet
+    [default=ignore success=ignore] pam_succeed_if.so uid eq 1001 quiet
     [authinfo_unavail=ignore success=end default=ignore] pam_radius_auth.so
 
 Account-Type: Primary
 Account:
-    [default=ignore success=1] pam_succeed_if.so uid eq 1001 quiet
-    [default=ignore success=ignore] pam_succeed_if.so uid eq 1002 quiet
+    [default=ignore success=1] pam_succeed_if.so uid eq 1000 quiet
+    [default=ignore success=ignore] pam_succeed_if.so uid eq 1001 quiet
     [authinfo_unavail=ignore success=end perm_denied=bad default=ignore] pam_radius_auth.so
 
 Session-Type: Additional
 Session:
-    [default=ignore success=1] pam_succeed_if.so uid eq 1001 quiet
-    [default=ignore success=ignore] pam_succeed_if.so uid eq 1002 quiet
+    [default=ignore success=1] pam_succeed_if.so uid eq 1000 quiet
+    [default=ignore success=ignore] pam_succeed_if.so uid eq 1001 quiet
     [authinfo_unavail=ignore success=ok default=ignore] pam_radius_auth.so