Merge branch 'master' into dev-master

diff --cc bgpd/bgp_route.c
index 36063af7cda06e2e8ab161c893e33dcf2fb61599,288271e5a15cdd570c0b4a286381899bfcfea148..b18ed9c71f2bf725777d116bfbb9e30ce297c3f1
--- 1/bgpd/bgp_route.c
--- 2/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@@ -2044,12 -2042,11 +2042,10 @@@ static void bgp_process_main_one(struc
  
        /* Do we need to allocate or free labels?
         * Right now, since we only deal with per-prefix labels, it is not
 -       * necessary
 -       * to do this upon changes to best path except of the label index
 -       * changes.
 +       * necessary to do this upon changes to best path except if the label
-        * index changes.
-        * NOTE: This is only relevant for the default instance.
++       * index changes
         */
-       if (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT
-           && safi == SAFI_UNICAST) {
+       if (bgp->allocate_mpls_labels[afi][safi]) {
                if (new_select) {
                        if (!old_select
                            || bgp_label_index_differs(new_select, old_select)

diff --cc bgpd/bgp_route.h
Simple merge

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/bgpd.c
Simple merge

diff --cc bgpd/bgpd.h
Simple merge

diff --cc isisd/isisd.c
Simple merge

diff --cc lib/command.c
index 9421fadc0b1a70f87cfb26815b5537086eef7e29,c86025a3bd12d0251f60ac12b1cfbcd3d944df7e..24095de4f01168efcab556ef051cfa8b3a5bd19e
--- 1/lib/command.c
--- 2/lib/command.c
+++ b/lib/command.c
@@@ -2621,9 -2579,8 +2641,10 @@@ void cmd_init(int terminal
  
        install_element(CONFIG_NODE, &hostname_cmd);
        install_element(CONFIG_NODE, &no_hostname_cmd);
 +      install_element(CONFIG_NODE, &domainname_cmd);
 +      install_element(CONFIG_NODE, &no_domainname_cmd);
        install_element(CONFIG_NODE, &frr_version_defaults_cmd);
+       install_element(CONFIG_NODE, &debug_memstats_cmd);
  
        if (terminal > 0) {
                install_element(CONFIG_NODE, &password_cmd);

diff --cc vtysh/vtysh.c
Simple merge

diff --cc vtysh/vtysh_config.c
Simple merge

diff --cc zebra/interface.c
Simple merge