Merging upstream version 10.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

124 files changed, 7582 insertions, 2645 deletions

diff --git a/lib/.gitignore b/lib/.gitignore
index 6176b30..1c9314b 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -1,3 +1,4 @@
+/config_paths.h
 /version.c
 /version.h
 /gitversion.h
@@ -11,3 +12,4 @@
 /grammar_sandbox
 /clippy
 /defun_lex.c
+vtysh_daemons.h
diff --git a/lib/affinitymap.c b/lib/affinitymap.c
index 17e1b2c..e53d54a 100644
--- a/lib/affinitymap.c
+++ b/lib/affinitymap.c
@@ -47,7 +47,7 @@ DEFINE_MTYPE_STATIC(LIB, AFFINITY_MAP_INDEX, "Affinity map index");
 DEFINE_QOBJ_TYPE(affinity_maps);
 DEFINE_QOBJ_TYPE(affinity_map);
 
-struct affinity_maps affinity_map_master = {NULL, NULL, NULL, NULL};
+struct affinity_maps affinity_map_master = {NULL, NULL};
 
 static void affinity_map_free(struct affinity_map *map)
 {
@@ -106,36 +106,6 @@ struct affinity_map *affinity_map_get(const char *name)
 	return NULL;
 }
 
-
-char *affinity_map_name_get(int pos)
-{
-	struct listnode *node;
-	struct affinity_map *map;
-
-	if (!affinity_map_master.maps)
-		return NULL;
-
-	for (ALL_LIST_ELEMENTS_RO(affinity_map_master.maps, node, map))
-		if (map->bit_position == pos)
-			return map->name;
-	return NULL;
-}
-
-bool affinity_map_check_use_hook(const char *affmap_name)
-{
-	if (affinity_map_master.check_use_hook)
-		return (*affinity_map_master.check_use_hook)(affmap_name);
-	return false;
-}
-
-bool affinity_map_check_update_hook(const char *affmap_name, uint16_t new_pos)
-{
-	if (affinity_map_master.check_update_hook)
-		return (*affinity_map_master.check_update_hook)(affmap_name,
-								new_pos);
-	return true;
-}
-
 void affinity_map_update_hook(const char *affmap_name, uint16_t new_pos)
 {
 	struct affinity_map *map;
@@ -153,18 +123,6 @@ void affinity_map_update_hook(const char *affmap_name, uint16_t new_pos)
 					   new_pos);
 }
 
-
-void affinity_map_set_check_use_hook(bool (*func)(const char *affmap_name))
-{
-	affinity_map_master.check_use_hook = func;
-}
-
-void affinity_map_set_check_update_hook(bool (*func)(const char *affmap_name,
-						     uint16_t new_pos))
-{
-	affinity_map_master.check_update_hook = func;
-}
-
 void affinity_map_set_update_hook(void (*func)(const char *affmap_name,
 					       uint16_t old_pos,
 					       uint16_t new_pos))
diff --git a/lib/affinitymap.h b/lib/affinitymap.h
index 19edf5a..ebe2659 100644
--- a/lib/affinitymap.h
+++ b/lib/affinitymap.h
@@ -50,8 +50,6 @@ DECLARE_QOBJ_TYPE(affinity_map);
 struct affinity_maps {
 	struct list *maps;
 
-	bool (*check_use_hook)(const char *affmap_name);
-	bool (*check_update_hook)(const char *affmap_name, uint16_t new_pos);
 	void (*update_hook)(const char *affmap_name, uint16_t old_pos,
 			    uint16_t new_pos);
 
@@ -60,26 +58,18 @@ struct affinity_maps {
 DECLARE_QOBJ_TYPE(affinity_maps);
 
 extern const struct frr_yang_module_info frr_affinity_map_info;
+extern const struct frr_yang_module_info frr_affinity_map_cli_info;
 
 void affinity_map_set(const char *name, int pos);
 void affinity_map_unset(const char *name);
 struct affinity_map *affinity_map_get(const char *name);
-char *affinity_map_name_get(const int pos);
 
-bool affinity_map_check_use_hook(const char *affmap_name);
-bool affinity_map_check_update_hook(const char *affmap_name, uint16_t new_pos);
 void affinity_map_update_hook(const char *affmap_name, uint16_t new_pos);
 
-void affinity_map_set_check_use_hook(bool (*func)(const char *affmap_name));
-void affinity_map_set_check_update_hook(bool (*func)(const char *affmap_name,
-						     uint16_t new_pos));
 void affinity_map_set_update_hook(void (*func)(const char *affmap_name,
 					       uint16_t old_pos,
 					       uint16_t new_pos));
 
-void cli_show_affinity_map(struct vty *vty, const struct lyd_node *dnode,
-			   bool show_defaults);
-
 void affinity_map_init(void);
 
 
diff --git a/lib/affinitymap_cli.c b/lib/affinitymap_cli.c
index a2d5e8e..73b91e7 100644
--- a/lib/affinitymap_cli.c
+++ b/lib/affinitymap_cli.c
@@ -30,15 +30,6 @@
 #include "lib/affinitymap.h"
 #include "lib/affinitymap_cli_clippy.c"
 
-/* Route map node structure. */
-static int affinity_map_config_write(struct vty *vty);
-static struct cmd_node affinitymap_node = {
-	.name = "affinity-map",
-	.node = AFFMAP_NODE,
-	.prompt = "",
-	.config_write = affinity_map_config_write,
-};
-
 /* max value is EXT_ADMIN_GROUP_MAX_POSITIONS - 1 */
 DEFPY_YANG_NOSH(affinity_map, affinity_map_cmd,
 		"affinity-map NAME$name bit-position (0-1023)$position",
@@ -75,33 +66,32 @@ DEFPY_YANG_NOSH(no_affinity_map, no_affinity_map_cmd,
 	return nb_cli_apply_changes(vty, NULL);
 }
 
-static int affinity_map_config_write(struct vty *vty)
-{
-	const struct lyd_node *dnode;
-	int written = 0;
-
-	dnode = yang_dnode_get(running_config->dnode, "/frr-affinity-map:lib");
-	if (dnode) {
-		nb_cli_show_dnode_cmds(vty, dnode, false);
-		written = 1;
-	}
-
-	return written;
-}
-
-void cli_show_affinity_map(struct vty *vty, const struct lyd_node *dnode,
+static void cli_show_affinity_map(struct vty *vty, const struct lyd_node *dnode,
 			   bool show_defaults __attribute__((__unused__)))
 {
 	vty_out(vty, "affinity-map %s bit-position %u\n",
-		yang_dnode_get_string(dnode, "./name"),
-		yang_dnode_get_uint16(dnode, "./value"));
+		yang_dnode_get_string(dnode, "name"),
+		yang_dnode_get_uint16(dnode, "value"));
 }
 
+const struct frr_yang_module_info frr_affinity_map_cli_info = {
+	.name = "frr-affinity-map",
+	.ignore_cfg_cbs = true,
+	.nodes = {
+		{
+			.xpath = "/frr-affinity-map:lib/affinity-maps/affinity-map",
+			.cbs.cli_show = cli_show_affinity_map,
+		},
+		{
+			.xpath = NULL,
+		},
+	}
+};
+
 /* Initialization of affinity map vector. */
 void affinity_map_init(void)
 {
 	/* CLI commands. */
-	install_node(&affinitymap_node);
 	install_element(CONFIG_NODE, &affinity_map_cmd);
 	install_element(CONFIG_NODE, &no_affinity_map_cmd);
 }
diff --git a/lib/affinitymap_northbound.c b/lib/affinitymap_northbound.c
index 331075f..003e0c1 100644
--- a/lib/affinitymap_northbound.c
+++ b/lib/affinitymap_northbound.c
@@ -47,11 +47,6 @@ static int lib_affinity_map_destroy(struct nb_cb_destroy_args *args)
 
 	switch (args->event) {
 	case NB_EV_VALIDATE:
-		if (!affinity_map_check_use_hook(name))
-			break;
-		snprintf(args->errmsg, args->errmsg_len,
-			 "affinity-map %s is used", name);
-		return NB_ERR_VALIDATION;
 	case NB_EV_PREPARE:
 	case NB_EV_ABORT:
 		break;
@@ -68,7 +63,6 @@ static int lib_affinity_map_destroy(struct nb_cb_destroy_args *args)
 static int lib_affinity_map_value_modify(struct nb_cb_modify_args *args)
 {
 	const char *name;
-	char *map_name;
 	uint16_t pos;
 
 	name = yang_dnode_get_string(
@@ -79,20 +73,6 @@ static int lib_affinity_map_value_modify(struct nb_cb_modify_args *args)
 
 	switch (args->event) {
 	case NB_EV_VALIDATE:
-		map_name = affinity_map_name_get(pos);
-		if (map_name &&
-		    strncmp(map_name, name, AFFINITY_NAME_SIZE) != 0) {
-			snprintf(args->errmsg, args->errmsg_len,
-				 "bit-position is used by %s.", map_name);
-			return NB_ERR_VALIDATION;
-		}
-		if (!affinity_map_check_update_hook(name, pos)) {
-			snprintf(
-				args->errmsg, args->errmsg_len,
-				"affinity-map new bit-position > 31 but is used with standard admin-groups");
-			return NB_ERR_VALIDATION;
-		}
-		break;
 	case NB_EV_PREPARE:
 	case NB_EV_ABORT:
 		break;
@@ -105,11 +85,6 @@ static int lib_affinity_map_value_modify(struct nb_cb_modify_args *args)
 	return NB_OK;
 }
 
-static int lib_affinity_map_value_destroy(struct nb_cb_destroy_args *args)
-{
-	return NB_OK;
-}
-
 /* clang-format off */
 const struct frr_yang_module_info frr_affinity_map_info = {
 	.name = "frr-affinity-map",
@@ -119,14 +94,13 @@ const struct frr_yang_module_info frr_affinity_map_info = {
 			.cbs = {
 				.create = lib_affinity_map_create,
 				.destroy = lib_affinity_map_destroy,
-				.cli_show = cli_show_affinity_map,
-			}
+			},
+			.priority = NB_DFLT_PRIORITY - 1,
 		},
 		{
 			.xpath = "/frr-affinity-map:lib/affinity-maps/affinity-map/value",
 			.cbs = {
 				.modify = lib_affinity_map_value_modify,
-				.destroy = lib_affinity_map_value_destroy,
 			}
 		},
 		{
diff --git a/lib/agentx.c b/lib/agentx.c
index 45f14c2..70ee675 100644
--- a/lib/agentx.c
+++ b/lib/agentx.c
@@ -4,12 +4,14 @@
  */
 
 #include <zebra.h>
+#include <fcntl.h>
 
 #ifdef SNMP_AGENTX
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 #include <net-snmp/agent/snmp_vars.h>
+#include <net-snmp/library/large_fd_set.h>
 
 #include "command.h"
 #include "smux.h"
@@ -43,7 +45,7 @@ static void agentx_timeout(struct event *t)
 
 static void agentx_read(struct event *t)
 {
-	fd_set fds;
+	netsnmp_large_fd_set lfds;
 	int flags, new_flags = 0;
 	int nonblock = false;
 	struct listnode *ln = EVENT_ARG(t);
@@ -68,9 +70,9 @@ static void agentx_read(struct event *t)
 		flog_err(EC_LIB_SYSTEM_CALL, "Failed to set snmp fd non blocking: %s(%d)",
 			 strerror(errno), errno);
 
-	FD_ZERO(&fds);
-	FD_SET(EVENT_FD(t), &fds);
-	snmp_read(&fds);
+	netsnmp_large_fd_set_init(&lfds, FD_SETSIZE);
+	netsnmp_large_fd_setfd(t->u.fd, &lfds);
+	snmp_read2(&lfds);
 
 	/* Reset the flag */
 	if (!nonblock) {
@@ -85,6 +87,7 @@ static void agentx_read(struct event *t)
 
 	netsnmp_check_outstanding_agent_requests();
 	agentx_events_update();
+	netsnmp_large_fd_set_cleanup(&lfds);
 }
 
 static void agentx_events_update(void)
@@ -92,15 +95,15 @@ static void agentx_events_update(void)
 	int maxfd = 0;
 	int block = 1;
 	struct timeval timeout = {.tv_sec = 0, .tv_usec = 0};
-	fd_set fds;
+	netsnmp_large_fd_set lfds;
 	struct listnode *ln;
 	struct event **thr;
 	int fd, thr_fd;
 
 	event_cancel(&timeout_thr);
 
-	FD_ZERO(&fds);
-	snmp_select_info(&maxfd, &fds, &timeout, &block);
+	netsnmp_large_fd_set_init(&lfds, FD_SETSIZE);
+	snmp_select_info2(&maxfd, &lfds, &timeout, &block);
 
 	if (!block) {
 		event_add_timer_tv(agentx_tm, agentx_timeout, NULL, &timeout,
@@ -118,7 +121,7 @@ static void agentx_events_update(void)
 		/* caught up */
 		if (thr_fd == fd) {
 			struct listnode *nextln = listnextnode(ln);
-			if (!FD_ISSET(fd, &fds)) {
+			if (!netsnmp_large_fd_is_set(fd, &lfds)) {
 				event_cancel(thr);
 				XFREE(MTYPE_TMP, thr);
 				list_delete_node(events, ln);
@@ -128,7 +131,7 @@ static void agentx_events_update(void)
 			thr_fd = thr ? EVENT_FD(*thr) : -1;
 		}
 		/* need listener, but haven't hit one where it would be */
-		else if (FD_ISSET(fd, &fds)) {
+		else if (netsnmp_large_fd_is_set(fd, &lfds)) {
 			struct listnode *newln;
 
 			thr = XCALLOC(MTYPE_TMP, sizeof(struct event *));
@@ -147,6 +150,7 @@ static void agentx_events_update(void)
 		list_delete_node(events, ln);
 		ln = nextln;
 	}
+	netsnmp_large_fd_set_cleanup(&lfds);
 }
 
 /* AgentX node. */
diff --git a/lib/base64.c b/lib/base64.c
index 1507b02..ee2e838 100644
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -9,6 +9,7 @@
 #endif
 
 #include "base64.h"
+#include "compiler.h"
 
 static const int CHARS_PER_LINE = 72;
 static const char *ENCODING =
@@ -41,6 +42,7 @@ int base64_encode_block(const char *plaintext_in, int length_in, char *code_out,
 
 	switch (state_in->step) {
 		while (1) {
+			fallthrough;
 			case step_A:
 				if (plainchar == plaintextend) {
 					state_in->result = result;
@@ -51,7 +53,7 @@ int base64_encode_block(const char *plaintext_in, int length_in, char *code_out,
 				result = (fragment & 0x0fc) >> 2;
 				*codechar++ = base64_encode_value(result);
 				result = (fragment & 0x003) << 4;
-				/* fall through */
+				fallthrough;
 			case step_B:
 				if (plainchar == plaintextend) {
 					state_in->result = result;
@@ -62,7 +64,7 @@ int base64_encode_block(const char *plaintext_in, int length_in, char *code_out,
 				result |= (fragment & 0x0f0) >> 4;
 				*codechar++ = base64_encode_value(result);
 				result = (fragment & 0x00f) << 2;
-				/* fall through */
+				fallthrough;
 			case step_C:
 				if (plainchar == plaintextend) {
 					state_in->result = result;
@@ -146,6 +148,7 @@ int base64_decode_block(const char *code_in, int length_in, char *plaintext_out,
 
 	switch (state_in->step) {
 		while (1) {
+			fallthrough;
 			case step_a:
 				do {
 					if (codec == code_in+length_in) {
@@ -156,7 +159,7 @@ int base64_decode_block(const char *code_in, int length_in, char *plaintext_out,
 					fragmt = base64_decode_value(*codec++);
 				} while (fragmt < 0);
 				*plainc = (fragmt & 0x03f) << 2;
-				/* fall through */
+				fallthrough;
 			case step_b:
 				do {
 					if (codec == code_in+length_in) {
@@ -168,7 +171,7 @@ int base64_decode_block(const char *code_in, int length_in, char *plaintext_out,
 				} while (fragmt < 0);
 				*plainc++ |= (fragmt & 0x030) >> 4;
 				*plainc = (fragmt & 0x00f) << 4;
-				/* fall through */
+				fallthrough;
 			case step_c:
 				do {
 					if (codec == code_in+length_in) {
@@ -180,7 +183,7 @@ int base64_decode_block(const char *code_in, int length_in, char *plaintext_out,
 				} while (fragmt < 0);
 				*plainc++ |= (fragmt & 0x03c) >> 2;
 				*plainc = (fragmt & 0x003) << 6;
-				/* fall through */
+				fallthrough;
 			case step_d:
 				do {
 					if (codec == code_in+length_in) {
diff --git a/lib/bfd.c b/lib/bfd.c
index 8c3246f..2222bb9 100644
--- a/lib/bfd.c
+++ b/lib/bfd.c
@@ -1282,7 +1282,6 @@ static bool bfd_source_cache_update(struct bfd_source_cache *source,
 		const struct zapi_nexthop *nh = &route->nexthops[nh_index];
 		const struct interface *interface;
 		const struct connected *connected;
-		const struct listnode *node;
 
 		interface = if_lookup_by_index(nh->ifindex, nh->vrf_id);
 		if (interface == NULL) {
@@ -1291,8 +1290,7 @@ static bool bfd_source_cache_update(struct bfd_source_cache *source,
 			continue;
 		}
 
-		for (ALL_LIST_ELEMENTS_RO(interface->connected, node,
-					  connected)) {
+		frr_each (if_connected_const, interface->connected, connected) {
 			if (source->address.family !=
 			    connected->address->family)
 				continue;
diff --git a/lib/bitfield.h b/lib/bitfield.h
index cc8c311..3fda627 100644
--- a/lib/bitfield.h
+++ b/lib/bitfield.h
@@ -116,6 +116,7 @@ DECLARE_MTYPE(BITFIELD);
 			(v).m = (v).m + 1;                                     \
 			(v).data = XREALLOC(MTYPE_BITFIELD, (v).data,          \
 					    (v).m * sizeof(word_t));           \
+			(v).data[(v).m - 1] = 0;                               \
 		}                                                              \
 	} while (0)
 
diff --git a/lib/buffer.h b/lib/buffer.h
index 5d98c31..a0b82d2 100644
--- a/lib/buffer.h
+++ b/lib/buffer.h
@@ -14,21 +14,21 @@ extern "C" {
 /* Create a new buffer.  Memory will be allocated in chunks of the given
    size.  If the argument is 0, the library will supply a reasonable
    default size suitable for buffering socket I/O. */
-extern struct buffer *buffer_new(size_t);
+extern struct buffer *buffer_new(size_t size);
 
 /* Free all data in the buffer. */
-extern void buffer_reset(struct buffer *);
+extern void buffer_reset(struct buffer *b);
 
 /* This function first calls buffer_reset to release all buffered data.
    Then it frees the struct buffer itself. */
-extern void buffer_free(struct buffer *);
+extern void buffer_free(struct buffer *b);
 
 /* Add the given data to the end of the buffer. */
-extern void buffer_put(struct buffer *, const void *, size_t);
+extern void buffer_put(struct buffer *b, const void *p, size_t size);
 /* Add a single character to the end of the buffer. */
-extern void buffer_putc(struct buffer *, uint8_t);
+extern void buffer_putc(struct buffer *b, uint8_t c);
 /* Add a NUL-terminated string to the end of the buffer. */
-extern void buffer_putstr(struct buffer *, const char *);
+extern void buffer_putstr(struct buffer *b, const char *str);
 /* Add given data, inline-expanding \n to \r\n */
 extern void buffer_put_crlf(struct buffer *b, const void *p, size_t size);
 
@@ -36,10 +36,10 @@ extern void buffer_put_crlf(struct buffer *b, const void *p, size_t size);
    single NUL-terminated string allocated using XMALLOC(MTYPE_TMP).  Note
    that this function does not alter the state of the buffer, so the data
    is still inside waiting to be flushed. */
-char *buffer_getstr(struct buffer *);
+char *buffer_getstr(struct buffer *b);
 
 /* Returns 1 if there is no pending data in the buffer.  Otherwise returns 0. */
-int buffer_empty(struct buffer *);
+int buffer_empty(struct buffer *b);
 
 typedef enum {
 	/* An I/O error occurred.  The buffer should be destroyed and the
@@ -59,12 +59,12 @@ typedef enum {
 
 /* Try to write this data to the file descriptor.  Any data that cannot
    be written immediately is added to the buffer queue. */
-extern buffer_status_t buffer_write(struct buffer *, int fd, const void *,
-				    size_t);
+extern buffer_status_t buffer_write(struct buffer *b, int fd, const void *p,
+				    size_t size);
 
 /* This function attempts to flush some (but perhaps not all) of
    the queued data to the given file descriptor. */
-extern buffer_status_t buffer_flush_available(struct buffer *, int fd);
+extern buffer_status_t buffer_flush_available(struct buffer *b, int fd);
 
 /* The following 2 functions (buffer_flush_all and buffer_flush_window)
    are for use in lib/vty.c only.  They should not be used elsewhere. */
@@ -72,7 +72,7 @@ extern buffer_status_t buffer_flush_available(struct buffer *, int fd);
 /* Call buffer_flush_available repeatedly until either all data has been
    flushed, or an I/O error has been encountered, or the operation would
    block. */
-extern buffer_status_t buffer_flush_all(struct buffer *, int fd);
+extern buffer_status_t buffer_flush_all(struct buffer *b, int fd);
 
 /* Attempt to write enough data to the given fd to fill a window of the
    given width and height (and remove the data written from the buffer).
@@ -85,7 +85,7 @@ extern buffer_status_t buffer_flush_all(struct buffer *, int fd);
    to return -1 (because the logic for handling the erase and more features
    is too complicated to retry the write later).
 */
-extern buffer_status_t buffer_flush_window(struct buffer *, int fd, int width,
+extern buffer_status_t buffer_flush_window(struct buffer *b, int fd, int width,
 					   int height, int erase, int no_more);
 
 #ifdef __cplusplus
diff --git a/lib/command.c b/lib/command.c
index 86da488..fa26072 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -10,6 +10,10 @@
  */
 
 #include <zebra.h>
+#include <sys/utsname.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 #include <lib/version.h>
 
 #include "command.h"
@@ -39,6 +43,8 @@
 
 #include "frrscript.h"
 
+#include "lib/config_paths.h"
+
 DEFINE_MTYPE_STATIC(LIB, HOST, "Host config");
 DEFINE_MTYPE(LIB, COMPLETION, "Completion item");
 
@@ -1629,6 +1635,10 @@ static int vty_write_config(struct vty *vty)
 	return CMD_SUCCESS;
 }
 
+/* cross-reference frr_daemon_state_save in libfrr.c
+ * the code there is similar but not identical (state files always use the same
+ * name for the new write, and don't keep a backup of previous state.)
+ */
 static int file_write_config(struct vty *vty)
 {
 	int fd, dirfd;
diff --git a/lib/command.h b/lib/command.h
index 718d34b..04c66ad 100644
--- a/lib/command.h
+++ b/lib/command.h
@@ -82,12 +82,16 @@ enum node_type {
 	AUTH_ENABLE_NODE,	/* Authentication mode for change enable. */
 	ENABLE_NODE,		 /* Enable node. */
 	CONFIG_NODE,		 /* Config node. Default mode of config file. */
+	PREFIX_NODE, /* ip prefix-list node. */
+	PREFIX_IPV6_NODE, /* ipv6 prefix-list node. */
 	DEBUG_NODE,		 /* Debug node. */
 	VRF_DEBUG_NODE,		 /* Vrf Debug node. */
 	NORTHBOUND_DEBUG_NODE,	 /* Northbound Debug node. */
 	DEBUG_VNC_NODE,		 /* Debug VNC node. */
 	RMAP_DEBUG_NODE,         /* Route-map debug node */
 	RESOLVER_DEBUG_NODE,	 /* Resolver debug node */
+	MGMT_BE_DEBUG_NODE,	 /* mgmtd backend-client debug node */
+	MGMT_FE_DEBUG_NODE,	 /* mgmtd frontend-client debug node */
 	AAA_NODE,		 /* AAA node. */
 	EXTLOG_NODE,		 /* RFC5424 & co. extended syslog */
 	KEYCHAIN_NODE,		 /* Key-chain node. */
@@ -131,10 +135,8 @@ enum node_type {
 	ISIS_NODE,		 /* ISIS protocol mode */
 	ISIS_FLEX_ALGO_NODE,    /* ISIS Flex Algo mode */
 	ACCESS_NODE,		 /* Access list node. */
-	PREFIX_NODE,		 /* Prefix list node. */
 	ACCESS_IPV6_NODE,	/* Access list node. */
 	ACCESS_MAC_NODE,	 /* MAC access list node*/
-	PREFIX_IPV6_NODE,	/* Prefix list node. */
 	AS_LIST_NODE,		 /* AS list node. */
 	COMMUNITY_LIST_NODE,     /* Community list node. */
 	COMMUNITY_ALIAS_NODE, /* Community alias node. */
@@ -158,6 +160,7 @@ enum node_type {
 	SRV6_NODE,		 /* SRv6 node */
 	SRV6_LOCS_NODE,		 /* SRv6 locators node */
 	SRV6_LOC_NODE,		 /* SRv6 locator node */
+	SRV6_ENCAP_NODE,		 /* SRv6 encapsulation node */
 	VTY_NODE,		 /* Vty node. */
 	FPM_NODE,		 /* Dataplane FPM node. */
 	LINK_PARAMS_NODE,	/* Link-parameters node */
@@ -174,6 +177,8 @@ enum node_type {
 	BMP_NODE,		/* BMP config under router bgp */
 	ISIS_SRV6_NODE,    /* ISIS SRv6 node */
 	ISIS_SRV6_NODE_MSD_NODE,    /* ISIS SRv6 Node MSDs node */
+	MGMTD_NODE,		 /* MGMTD node. */
+	RPKI_VRF_NODE,  /* RPKI node for VRF */
 	NODE_TYPE_MAX, /* maximum */
 };
 /* clang-format on */
@@ -286,6 +291,10 @@ struct cmd_node {
 #define DEFPY_YANG(funcname, cmdname, cmdstr, helpstr)                         \
 	DEFPY_ATTR(funcname, cmdname, cmdstr, helpstr, CMD_ATTR_YANG)
 
+#define DEFPY_YANG_HIDDEN(funcname, cmdname, cmdstr, helpstr)                  \
+	DEFPY_ATTR(funcname, cmdname, cmdstr, helpstr,                         \
+		   CMD_ATTR_YANG | CMD_ATTR_HIDDEN)
+
 #define DEFPY_YANG_NOSH(funcname, cmdname, cmdstr, helpstr)                    \
 	DEFPY_ATTR(funcname, cmdname, cmdstr, helpstr,                         \
 		   CMD_ATTR_YANG | CMD_ATTR_NOSH)
@@ -310,6 +319,10 @@ struct cmd_node {
 #define DEFUN_NOSH(funcname, cmdname, cmdstr, helpstr)                         \
 	DEFUN_ATTR(funcname, cmdname, cmdstr, helpstr, CMD_ATTR_NOSH)
 
+#define DEFUN_YANG_HIDDEN(funcname, cmdname, cmdstr, helpstr)                  \
+	DEFUN_ATTR(funcname, cmdname, cmdstr, helpstr,                         \
+		   CMD_ATTR_YANG | CMD_ATTR_HIDDEN)
+
 #define DEFUN_YANG_NOSH(funcname, cmdname, cmdstr, helpstr)                    \
 	DEFUN_ATTR(funcname, cmdname, cmdstr, helpstr,                         \
 		   CMD_ATTR_YANG | CMD_ATTR_NOSH)
diff --git a/lib/command_match.c b/lib/command_match.c
index f740b72..97e6aeb 100644
--- a/lib/command_match.c
+++ b/lib/command_match.c
@@ -405,10 +405,10 @@ enum matcher_rv command_complete(struct graph *graph, vector vline,
 				listnode_add(next, newstack);
 				break;
 			case partly_match:
-				trace_matcher("trivial_match\n");
+				trace_matcher("partly_match\n");
 				if (exact_match_exists && !last_token)
 					break;
-			/* fallthru */
+				fallthrough;
 			case exact_match:
 				trace_matcher("exact_match\n");
 				if (last_token) {
diff --git a/lib/compiler.h b/lib/compiler.h
index ce67276..0326105 100644
--- a/lib/compiler.h
+++ b/lib/compiler.h
@@ -32,8 +32,8 @@ extern "C" {
 #if __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 5)
 #  define _RET_NONNULL    , returns_nonnull
 #endif
-#if __has_attribute(fallthrough)
-#  define _FALLTHROUGH __attribute__((fallthrough));
+#if __has_attribute(fallthrough) && !defined(__cplusplus)
+#  define fallthrough __attribute__((fallthrough));
 #endif
 # define _CONSTRUCTOR(x)  constructor(x)
 # define _DEPRECATED(x) deprecated(x)
@@ -56,8 +56,8 @@ extern "C" {
 #if __GNUC__ < 5
 #  define __has_attribute(x) 0
 #endif
-#if __GNUC__ >= 7
-#  define _FALLTHROUGH __attribute__((fallthrough));
+#if __GNUC__ >= 7 && !defined(__cplusplus)
+#  define fallthrough __attribute__((fallthrough));
 #endif
 #endif
 
@@ -112,8 +112,8 @@ extern "C" {
 #ifndef _ALLOC_SIZE
 # define _ALLOC_SIZE(x)
 #endif
-#ifndef _FALLTHROUGH
-#define _FALLTHROUGH
+#if !defined(fallthrough) && !defined(__cplusplus)
+#define fallthrough
 #endif
 #ifndef _DEPRECATED
 #define _DEPRECATED(x) deprecated
@@ -424,10 +424,10 @@ _Static_assert(sizeof(_uint64_t) == 8 && sizeof(_int64_t) == 8,
  * type.)
  */
 #ifndef __cplusplus
-#define prefixtype(uname, typename, fieldname) typename *fieldname;
+#define uniontype(uname, typename, fieldname) typename *fieldname;
 #define TRANSPARENT_UNION __attribute__((transparent_union))
 #else
-#define prefixtype(uname, typename, fieldname)                                 \
+#define uniontype(uname, typename, fieldname)                                  \
 	typename *fieldname;                                                   \
 	uname(typename *x)                                                     \
 	{                                                                      \
diff --git a/lib/config_paths.h.in b/lib/config_paths.h.in
new file mode 100644
index 0000000..cc40905
--- /dev/null
+++ b/lib/config_paths.h.in
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/* autogenerated by configure / config.status */
+
+/* IF YOU ARE INCLUDING THIS FILE FROM A DAEMON OR ZEBRA, YOU ARE PROBABLY
+ * DOING SOMETHING WRONG.  Check for / add a library function that retrieves
+ * the path you need.
+ *
+ * Only libfrr and watchfrr should be including this file.
+ */
+
+/* the replacements for these are emitted by AX_SUBST_EXPANDED, which also
+ * adds the e_ prefix
+ */
+#define FRR_RUNSTATE_PATH	"@e_frr_runstatedir@"
+#define FRR_LIBSTATE_PATH	"@e_frr_libstatedir@"
+#define YANG_MODELS_PATH	"@e_yangmodelsdir@"
+#define MODULE_PATH		"@e_moduledir@"
+#define SCRIPT_PATH		"@e_scriptdir@"
+
+/* for extra footgunning, this one has a trailing slash */
+#define SYSCONFDIR		"@e_frr_sysconfdir@/"
+
+#define VTYSH_BIN_PATH		"@e_vtysh_bin@"
+#define WATCHFRR_SH_PATH	"@e_watchfrr_sh@"
diff --git a/lib/darr.c b/lib/darr.c
index bef51b8..7a01274 100644
--- a/lib/darr.c
+++ b/lib/darr.c
@@ -9,7 +9,8 @@
 #include "darr.h"
 #include "memory.h"
 
-DEFINE_MTYPE_STATIC(LIB, DARR, "Dynamic Array");
+DEFINE_MTYPE(LIB, DARR, "Dynamic Array");
+DEFINE_MTYPE(LIB, DARR_STR, "Dynamic Array String");
 
 static uint _msb(uint count)
 {
@@ -52,29 +53,75 @@ static size_t darr_size(uint count, size_t esize)
 	return count * esize + sizeof(struct darr_metadata);
 }
 
-void *__darr_resize(void *a, uint count, size_t esize)
+char *__darr_in_vsprintf(char **sp, bool concat, const char *fmt, va_list ap)
+{
+	size_t inlen = concat ? darr_strlen(*sp) : 0;
+	size_t capcount = strlen(fmt) + MIN(inlen + 64, 128);
+	ssize_t len;
+	va_list ap_copy;
+
+	darr_ensure_cap(*sp, capcount);
+
+	if (!concat)
+		darr_reset(*sp);
+
+	/* code below counts on having a NUL terminated string */
+	if (darr_len(*sp) == 0)
+		*darr_append(*sp) = 0;
+again:
+	va_copy(ap_copy, ap);
+	len = vsnprintf(darr_last(*sp), darr_avail(*sp) + 1, fmt, ap_copy);
+	va_end(ap_copy);
+	if (len < 0)
+		darr_in_strcat(*sp, fmt);
+	else if ((size_t)len <= darr_avail(*sp))
+		_darr_len(*sp) += len;
+	else {
+		darr_ensure_cap(*sp, darr_len(*sp) + (size_t)len);
+		goto again;
+	}
+	return *sp;
+}
+
+char *__darr_in_sprintf(char **sp, bool concat, const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	(void)__darr_in_vsprintf(sp, concat, fmt, ap);
+	va_end(ap);
+	return *sp;
+}
+
+
+void *__darr_resize(void *a, uint count, size_t esize, struct memtype *mtype)
 {
 	uint ncount = darr_next_count(count, esize);
 	size_t osz = (a == NULL) ? 0 : darr_size(darr_cap(a), esize);
 	size_t sz = darr_size(ncount, esize);
-	struct darr_metadata *dm = XREALLOC(MTYPE_DARR,
-					    a ? _darr_meta(a) : NULL, sz);
+	struct darr_metadata *dm;
 
-	if (sz > osz)
-		memset((char *)dm + osz, 0, sz - osz);
+	if (a) {
+		dm = XREALLOC(_darr_meta(a)->mtype, _darr_meta(a), sz);
+		if (sz > osz)
+			memset((char *)dm + osz, 0, sz - osz);
+	} else {
+		dm = XCALLOC(mtype, sz);
+		dm->mtype = mtype;
+	}
 	dm->cap = ncount;
 	return (void *)(dm + 1);
 }
 
 
-void *__darr_insert_n(void *a, uint at, uint count, size_t esize, bool zero)
+void *__darr_insert_n(void *a, uint at, uint count, size_t esize, bool zero,
+		      struct memtype *mtype)
 {
-
 	struct darr_metadata *dm;
 	uint olen, nlen;
 
 	if (!a)
-		a = __darr_resize(NULL, at + count, esize);
+		a = __darr_resize(NULL, at + count, esize, mtype);
 	dm = (struct darr_metadata *)a - 1;
 	olen = dm->len;
 
@@ -89,7 +136,7 @@ void *__darr_insert_n(void *a, uint at, uint count, size_t esize, bool zero)
 		nlen = olen + count;
 
 	if (nlen > dm->cap) {
-		a = __darr_resize(a, nlen, esize);
+		a = __darr_resize(a, nlen, esize, mtype);
 		dm = (struct darr_metadata *)a - 1;
 	}
 
diff --git a/lib/darr.h b/lib/darr.h
index ca46fb3..404869d 100644
--- a/lib/darr.h
+++ b/lib/darr.h
@@ -3,22 +3,37 @@
  * June 23 2023, Christian Hopps <chopps@labn.net>
  *
  * Copyright (c) 2023, LabN Consulting, L.L.C.
- *
+ */
+#ifndef _FRR_DARR_H_
+#define _FRR_DARR_H_
+
+/*
  * API functions:
  * ==============
  *  - darr_append
+ *  - darr_append_mt
  *  - darr_append_n
+ *  - darr_append_n_mt
  *  - darr_append_nz
+ *  - darr_append_nz_mt
  *  - darr_cap
+ *  - darr_ensure_avail
+ *  - darr_ensure_avail_mt
  *  - darr_ensure_cap
+ *  - darr_ensure_cap_mt
  *  - darr_ensure_i
- *  - darr_foreach_i
- *  - darr_foreach_p
+ *  - darr_ensure_i_mt
  *  - darr_free
  *  - darr_insert
+ *  - darr_insert_mt
  *  - darr_insertz
+ *  - darr_insertz_mt
  *  - darr_insert_n
+ *  - darr_insert_n_mt
  *  - darr_insert_nz
+ *  - darr_insert_nz_mt
+ *  - darr_last
+ *  - darr_lasti
  *  - darr_len
  *  - darr_maxi
  *  - darr_pop
@@ -28,38 +43,81 @@
  *  - darr_remove_n
  *  - darr_reset
  *  - darr_setlen
+ *
+ * Iteration
+ * ---------
+ *  - darr_foreach_i
+ *  - darr_foreach_p
+ *
+ * String Utilities
+ * ----------------
+ *  - darr_in_strcat_tail
+ *  - darr_in_strcatf, darr_in_vstrcatf
+ *  - darr_in_strdup
+ *  - darr_in_strdup_cap
+ *  - darr_in_sprintf, darr_in_vsprintf
+ *  - darr_set_strlen
+ *  - darr_strdup
+ *  - darr_strdup_cap
+ *  - darr_strlen
+ *  - darr_strnul
+ *  - darr_sprintf, darr_vsprintf
  */
 /*
  * A few assured items
  *
  * - DAs will never have capacity 0 unless they are NULL pointers.
  */
+
+/*
+ * NOTE: valgrind by default enables a "length64" heuristic (among others) which
+ * identifies "interior-pointer" 8 bytes forward of a "start-pointer" as a
+ * "start-pointer". This should cause what normally would be "possibly-lost"
+ * errors to instead be definite for dynamic arrays. This is b/c the header is 8 bytes
+ */
+
 #include <zebra.h>
+#include <limits.h>
+#include "memory.h"
+
+DECLARE_MTYPE(DARR);
+DECLARE_MTYPE(DARR_STR);
 
 struct darr_metadata {
-	uint len;
-	uint cap;
+	uint32_t len;
+	uint32_t cap;
+	struct memtype *mtype;
 };
-void *__darr_insert_n(void *a, uint at, uint count, size_t esize, bool zero);
-void *__darr_resize(void *a, uint count, size_t esize);
 
-#define _darr_esize(A)	   sizeof((A)[0])
-#define darr_esize(A)	   sizeof((A)[0])
-#define _darr_len(A)	   _darr_meta(A)->len
-#define _darr_meta(A)	   (((struct darr_metadata *)(A)) - 1)
-#define _darr_resize(A, C) ({ (A) = __darr_resize((A), C, _darr_esize(A)); })
+void *__darr_insert_n(void *a, uint at, uint count, size_t esize, bool zero,
+		      struct memtype *mt);
+char *__darr_in_sprintf(char **sp, bool concat, const char *fmt, ...)
+	PRINTFRR(3, 4);
+char *__darr_in_vsprintf(char **sp, bool concat, const char *fmt, va_list ap)
+	PRINTFRR(3, 0);
+void *__darr_resize(void *a, uint count, size_t esize, struct memtype *mt);
+
+
+#define _darr_esize(A) sizeof((A)[0])
+#define darr_esize(A)  sizeof((A)[0])
+#define _darr_len(A)   _darr_meta(A)->len
+#define _darr_meta(A)  (((struct darr_metadata *)(A)) - 1)
+#define _darr_resize_mt(A, C, MT)                                              \
+	({ (A) = __darr_resize(A, C, _darr_esize(A), MT); })
+#define _darr_resize(A, C) _darr_resize_mt(A, C, MTYPE_DARR)
 
 /* Get the current capacity of the array */
 #define darr_cap(A) (((A) == NULL) ? 0 : _darr_meta(A)->cap)
 
+/* Get the current available expansion space */
+#define darr_avail(A) (((A) == NULL) ? 0 : (darr_cap(A) - darr_len(A)))
+
 /* Get the largest possible index one can `darr_ensure_i` w/o resizing */
 #define darr_maxi(A) ((int)darr_cap(A) - 1)
 
 /**
- * Get the current length of the array.
- *
- * As long as `A` is non-NULL, this macro may be used as an L-value to modify
- * the length of the array.
+ * darr_len() - Get the current length of the array as a unsigned int.
+ * darr_ilen() - Get the current length of the array as an int.
  *
  * Args:
  *	A: The dynamic array, can be NULL.
@@ -67,7 +125,19 @@ void *__darr_resize(void *a, uint count, size_t esize);
  * Return:
  *      The current length of the array.
  */
-#define darr_len(A) (((A) == NULL) ? 0 : _darr_meta(A)->len)
+#define darr_len(A)  (((A) == NULL) ? 0 : _darr_meta(A)->len)
+#define darr_ilen(A) (((A) == NULL) ? 0 : (ssize_t)_darr_meta(A)->len)
+
+/**
+ * darr_lasti() - Get the last element's index.
+ *
+ * Args:
+ *	A: The dynamic array, can be NULL.
+ *
+ * Return:
+ *      The current last element index, or -1 for none.
+ */
+#define darr_lasti(A) (darr_ilen(A) - 1)
 
 /**
  * Set the current length of the array `A` to 0.
@@ -96,12 +166,42 @@ void *__darr_resize(void *a, uint count, size_t esize);
 		assert((A) || !(L));                                           \
 		if ((A)) {                                                     \
 			/* have to cast to avoid compiler warning for "0" */   \
-			assert((long long)darr_cap(A) >= (L));                 \
+			assert((long long)darr_cap(A) >= (long long)(L));      \
 			_darr_len(A) = (L);                                    \
 		}                                                              \
 	} while (0)
 
 /**
+ * Set the string length of the array `S` to `L`, and NUL
+ * terminate the string at L. The dynamic array length will be `L` + 1.
+ *
+ * Thus after calling:
+ *
+ *    darr_len(S) == L + 1
+ *    darr_strlen(S) == L
+ *    S[L] == 0
+ *
+ * This function does *not* guarantee the `L` + 1 memory is allocated to
+ * the array, use `darr_ensure` or `*_cap` functions for that.
+ *
+ * Args:
+ *	S: The dynamic array, cannot be NULL.
+ *      L: The new str length of the array, will set
+ *
+ * Return:
+ *      A pointer to the end of S (i.e., pointing to the NUL byte).
+ */
+#define darr_set_strlen(S, L)                                                  \
+	({                                                                     \
+		assert((S));                                                   \
+		/* have to cast to avoid compiler warning for "0" */           \
+		assert((long long)darr_cap(S) >= (long long)(L));              \
+		_darr_len(S) = (L) + 1;                                        \
+		*darr_last(S) = 0;                                             \
+		darr_last(S);                                                  \
+	})
+
+/**
  * Free memory allocated for the dynamic array `A`
  *
  * Args:
@@ -111,31 +211,65 @@ void *__darr_resize(void *a, uint count, size_t esize);
 #define darr_free(A)                                                           \
 	do {                                                                   \
 		if ((A)) {                                                     \
-			free(_darr_meta(A));                                   \
+			struct darr_metadata *__meta = _darr_meta(A);          \
+			XFREE(__meta->mtype, __meta);                          \
 			(A) = NULL;                                            \
 		}                                                              \
 	} while (0)
 
 /**
+ * Make sure that there is room in the dynamic array `A` to add `C` elements.
+ *
+ * Available space is `darr_cap(a) - darr_len(a)`.
+ *
+ * The value `A` may be changed as a result of this call in which case any
+ * pointers into the previous memory block are no longer valid. The `A` value
+ * is guaranteed not to change if there is sufficient capacity in the array.
+ *
+ * Args:
+ *	A: (IN/OUT) the dynamic array, can be NULL.
+ *	S: Amount of free space to guarantee.
+ *
+ * Return:
+ *      A pointer to the (possibly moved) array.
+ */
+#define darr_ensure_avail_mt(A, S, MT)                                         \
+	({                                                                     \
+		ssize_t need = (ssize_t)(S) -                                  \
+			       (ssize_t)(darr_cap(A) - darr_len(A));           \
+		if (need > 0)                                                  \
+			_darr_resize_mt((A), darr_cap(A) + need, MT);          \
+		(A);                                                           \
+	})
+#define darr_ensure_avail(A, S) darr_ensure_avail_mt(A, S, MTYPE_DARR)
+
+/**
  * Make sure that there is room in the dynamic array `A` for `C` elements.
  *
  * The value `A` may be changed as a result of this call in which case any
  * pointers into the previous memory block are no longer valid. The `A` value
  * is guaranteed not to change if there is sufficient capacity in the array.
  *
+ * The exception to the no-change rule is if @C is passed as 0, it will be
+ * considered 1 so that an array is always allocated if currently NULL,
+ * i.e., @A will never be NULL after a call to darr_ensure_cap_mt()
+ *
  * Args:
  *	A: (IN/OUT) the dynamic array, can be NULL.
- *	I: the index to guarantee memory exists for
+ *	C: Total capacity to guarantee.
  *
  * Return:
  *      A pointer to the (possibly moved) array.
  */
-#define darr_ensure_cap(A, C)                                                  \
+#define darr_ensure_cap_mt(A, C, MT)                                           \
 	({                                                                     \
-		if (darr_cap(A) < (C))                                         \
-			_darr_resize((A), (C));                                \
+		/* Cast to avoid warning when C == 0 */                        \
+		uint _c = (C) > 0 ? (C) : 1;                                   \
+		if ((size_t)darr_cap(A) < _c)                                  \
+			_darr_resize_mt((A), _c, MT);                          \
 		(A);                                                           \
 	})
+#define darr_ensure_cap(A, C) darr_ensure_cap_mt(A, C, MTYPE_DARR)
 
 /**
  * Return a pointer to the (I)th element of array `A`, making sure there is
@@ -155,18 +289,22 @@ void *__darr_resize(void *a, uint count, size_t esize);
  * Return:
  *      A pointer to the (I)th element in `A`
  */
-#define darr_ensure_i(A, I)                                                    \
+#define darr_ensure_i_mt(A, I, MT)                                             \
 	({                                                                     \
-		if ((int)(I) > darr_maxi(A))                                   \
-			_darr_resize((A), (I) + 1);                            \
-		if ((I) + 1 > _darr_len(A))                                    \
-			_darr_len(A) = (I) + 1;                                \
-		&(A)[I];                                                       \
+		assert((int)(I) >= 0 && (uint)(I) <= INT_MAX);                 \
+		int _i = (int)(I);                                             \
+		if (_i > darr_maxi(A))                                         \
+			_darr_resize_mt((A), _i + 1, MT);                      \
+		assert((A) != NULL);                                           \
+		if ((uint)_i + 1 > _darr_len(A))                               \
+			_darr_len(A) = _i + 1;                                 \
+		&(A)[_i];                                                      \
 	})
+#define darr_ensure_i(A, I) darr_ensure_i_mt(A, I, MTYPE_DARR)
 
-#define _darr_insert_n(A, I, N, Z)                                             \
+#define _darr_insert_n(A, I, N, Z, MT)                                         \
 	({                                                                     \
-		(A) = __darr_insert_n(A, I, N, _darr_esize(A), Z);             \
+		(A) = __darr_insert_n(A, I, N, _darr_esize(A), Z, MT);         \
 		&(A)[I];                                                       \
 	})
 /**
@@ -187,8 +325,10 @@ void *__darr_resize(void *a, uint count, size_t esize);
  * Return:
  *      A pointer to the first inserted element in the array.
  */
-#define darr_insert_n(A, I, N)	_darr_insert_n(A, I, N, false)
-#define darr_insert_nz(A, I, N) _darr_insert_n(A, I, N, true)
+#define darr_insert_n(A, I, N)	   _darr_insert_n(A, I, N, false, MTYPE_DARR)
+#define darr_insert_n_mt(A, I, N)  _darr_insert_n(A, I, N, false, MT)
+#define darr_insert_nz(A, I, N)	   _darr_insert_n(A, I, N, true, MTYPE_DARR)
+#define darr_insert_nz_mt(A, I, N) _darr_insert_n(A, I, N, true, MT)
 
 /**
  * Insert an uninitialized element in the array at index `I`.
@@ -208,8 +348,10 @@ void *__darr_resize(void *a, uint count, size_t esize);
  * Return:
  *      A pointer to the element in the array.
  */
-#define darr_insert(A, I)  _darr_insert_n(A, I, 1, false)
-#define darr_insertz(A, I) _darr_insert_n(A, I, 1, true)
+#define darr_insert(A, I)     _darr_insert_n(A, I, 1, false, MTYPE_DARR)
+#define darr_insert_mt(A, I)  _darr_insert_n(A, I, 1, false, MT)
+#define darr_insertz(A, I)    _darr_insert_n(A, I, 1, true, MTYPE_DARR)
+#define darr_insertz_mt(A, I) _darr_insert_n(A, I, 1, true, MT)
 
 /**
  * Remove `N` elements from the array starting at index `I`.
@@ -247,10 +389,10 @@ void *__darr_resize(void *a, uint count, size_t esize);
 #define darr_remove(A, I) darr_remove_n(A, I, 1)
 
 
-#define _darr_append_n(A, N, Z)                                                \
+#define _darr_append_n(A, N, Z, MT)                                            \
 	({                                                                     \
 		uint __len = darr_len(A);                                      \
-		darr_ensure_cap(A, __len + (N));                               \
+		darr_ensure_cap_mt(A, __len + (N), MT);                        \
 		_darr_len(A) = __len + (N);                                    \
 		if (Z)                                                         \
 			memset(&(A)[__len], 0, (N)*_darr_esize(A));            \
@@ -267,8 +409,10 @@ void *__darr_resize(void *a, uint count, size_t esize);
  * Return:
  *	A pointer to the first of the added elements at the end of the array.
  */
-#define darr_append_n(A, N)  _darr_append_n(A, N, false)
-#define darr_append_nz(A, N) _darr_append_n(A, N, true)
+#define darr_append_n(A, N)	    _darr_append_n(A, N, false, MTYPE_DARR)
+#define darr_append_n_mt(A, N, MT)  _darr_append_n(A, N, false, MT)
+#define darr_append_nz(A, N)	    _darr_append_n(A, N, true, MTYPE_DARR)
+#define darr_append_nz_mt(A, N, MT) _darr_append_n(A, N, true, MT)
 
 /**
  * Extending the array's length by 1.
@@ -281,8 +425,10 @@ void *__darr_resize(void *a, uint count, size_t esize);
  * Return:
  *	A pointer to the new element at the end of the array.
  */
-#define darr_append(A)	_darr_append_n(A, 1, false)
-#define darr_appendz(A) _darr_append_n(A, 1, true)
+#define darr_append(A)	       _darr_append_n(A, 1, false, MTYPE_DARR)
+#define darr_append_mt(A, MT)  _darr_append_n(A, 1, false, MT)
+#define darr_appendz(A)	       _darr_append_n(A, 1, true, MTYPE_DARR)
+#define darr_appendz_mt(A, MT) _darr_append_n(A, 1, true, MT)
 
 /**
  * Append an element `E` onto the array `A`, extending it's length by 1.
@@ -295,8 +441,10 @@ void *__darr_resize(void *a, uint count, size_t esize);
  * Return:
  *	A pointer to the element in the array.
  */
-#define darr_push(A, E) (*darr_append(A) = (E))
-#define darr_pushz(A)	(darr_appendz(A))
+#define darr_push(A, E)	       (*darr_append(A) = (E))
+#define darr_push_mt(A, E, MT) (*darr_append_mt(A, MT) = (E))
+#define darr_pushz(A)	       (darr_appendz(A))
+#define darr_pushz_mt(A, MT)   (darr_appendz_mt(A, MT))
 
 
 /**
@@ -345,6 +493,246 @@ void *__darr_resize(void *a, uint count, size_t esize);
 #define darr_end(A) ((A) + darr_len(A))
 
 /**
+ * darr_last() - Get a pointer to the last element of the array.
+ * darr_strnul() - Get a pointer to the NUL byte of the darr string or NULL.
+ *
+ * Args:
+ *	A: The dynamic array, can be NULL.
+ *
+ * Return:
+ *      A pointer to the last element of the array or NULL if the array is
+ *      empty.
+ */
+#define darr_last(A)                                                           \
+	({                                                                     \
+		uint __len = darr_len(A);                                      \
+		((__len > 0) ? &(A)[__len - 1] : NULL);                        \
+	})
+#define darr_strnul(S) darr_last(S)
+
+/**
+ * darr_in_sprintf() - sprintf into D.
+ *
+ * Args:
+ *      D: The destination darr, D's value may be NULL.
+ *      F: The format string
+ *      ...: variable arguments for format string.
+ *
+ * Return:
+ *	The dynamic_array D with the new string content.
+ */
+#define darr_in_sprintf(D, F, ...) __darr_in_sprintf(&(D), 0, F, __VA_ARGS__)
+
+
+/**
+ * darr_in_strcat() - concat a string into a darr string.
+ *
+ * Args:
+ *      D: The destination darr, D's value may be NULL.
+ *      S: The string to concat onto D.
+ *
+ * Return:
+ *	The dynamic_array D with the new string content.
+ */
+#define darr_in_strcat(D, S)                                                   \
+	({                                                                     \
+		uint __dlen = darr_strlen(D);                                  \
+		uint __slen = strlen(S);                                       \
+		darr_ensure_cap_mt(D, __dlen + __slen + 1, MTYPE_DARR_STR);    \
+		if (darr_len(D) == 0)                                          \
+			*darr_append(D) = 0;                                   \
+		memcpy(darr_last(D), (S), __slen + 1);                         \
+		_darr_len(D) += __slen;                                        \
+		D;                                                             \
+	})
+
+/**
+ * darr_in_strcatf() - concat a formatted string into a darr string.
+ *
+ * Args:
+ *      D: The destination darr, D's value may be NULL.
+ *      F: The format string to concat onto D after adding arguments.
+ *    ...: The arguments for the format string.
+ * Return:
+ *	The dynamic_array D with the new string content.
+ */
+#define darr_in_strcatf(D, F, ...)                                             \
+	__darr_in_sprintf(&(D), true, (F), __VA_ARGS__)
+
+/**
+ * darr_in_strcat_tail() - copies end of one darr str to another.
+ *
+ * This is a rather specialized function, it takes 2 darr's, a destination and a
+ * source. If the source is not longer than the destination nothing is done.
+ * Otherwise the characters in the source that lie beyond the length of the dest
+ * are added to the dest. No checking is done to make sure the common prefix
+ * matches. For example:
+ *
+ *     D: "/foo"
+ *     S: "/foo/bar"
+ *  -> D: "/foo/bar"
+ *
+ *     perhaps surprising results:
+ *     D: "/foo"
+ *     S: "/zoo/bar"
+ *  -> D: "/foo/bar"
+ *
+ * Args:
+ *      D: The destination darr, D's value may be NULL.
+ *      S: The string to copy the tail from.
+ *
+ * Return:
+ *	The dynamic_array D with the extended string content.
+ */
+#define darr_in_strcat_tail(D, S)                                              \
+	({                                                                     \
+		int __dsize, __ssize, __extra;                                 \
+									       \
+		if (darr_len(D) == 0)                                          \
+			*darr_append(D) = 0;                                   \
+		__dsize = darr_ilen(D);                                        \
+		__ssize = darr_ilen(S);                                        \
+		__extra = __ssize - __dsize;                                   \
+		if (__extra > 0) {                                             \
+			darr_ensure_cap_mt(D, (uint)__ssize, MTYPE_DARR_STR);  \
+			memcpy(darr_last(D), (S) + __dsize - 1, __extra + 1);  \
+			_darr_len(D) += __extra;                               \
+		}                                                              \
+		D;                                                             \
+	})
+
+/**
+ * darr_in_strdup_cap() - duplicate the string into a darr reserving capacity.
+ * darr_in_strdup() - duplicate the string into a darr.
+ *
+ * Args:
+ *      D: The destination darr, D's value may be NULL.
+ *      S: The string to duplicate.
+ *      C: The capacity to reserve.
+ *
+ * Return:
+ *	The dynamic_array D with the duplicated string.
+ */
+#define darr_in_strdup_cap(D, S, C)                                            \
+	({                                                                     \
+		size_t __size = strlen(S) + 1;                                 \
+		darr_reset(D);                                                 \
+		darr_ensure_cap_mt(D,                                          \
+				   ((size_t)(C) > __size) ? (size_t)(C)        \
+							  : __size,            \
+				   MTYPE_DARR_STR);                            \
+		strlcpy(D, (S), darr_cap(D));                                  \
+		darr_setlen((D), (size_t)__size);                              \
+		D;                                                             \
+	})
+#define darr_in_strdup(D, S) darr_in_strdup_cap(D, S, 1)
+
+/**
+ * darr_in_vsprintf() - vsprintf into D.
+ *
+ * Args:
+ *      D: The destination darr, D's value may be NULL.
+ *      F: The format string
+ *      A: Varargs
+ *
+ * Return:
+ *	The dynamic_array D with the new string content.
+ */
+#define darr_in_vsprintf(D, F, A) __darr_in_vsprintf(&(D), 0, F, A)
+
+/**
+ * darr_in_vstrcatf() - concat a formatted string into a darr string.
+ *
+ * Args:
+ *      D: The destination darr, D's value may be NULL.
+ *      F: The format string to concat onto D after adding arguments.
+ *      A: Varargs
+ *
+ * Return:
+ *	The dynamic_array D with the new string content.
+ */
+#define darr_in_vstrcatf(D, F, A) __darr_in_vsprintf(&(D), true, (F), (A))
+
+/**
+ * darr_sprintf() - sprintf into a new dynamic array.
+ *
+ * Args:
+ *      F: The format string
+ *      ...: variable arguments for format string.
+ *
+ * Return:
+ *	A char * dynamic_array with the new string content.
+ */
+#define darr_sprintf(F, ...)                                                   \
+	({                                                                     \
+		char *d = NULL;                                                \
+		__darr_in_sprintf(&d, false, F, __VA_ARGS__);                  \
+		d;                                                             \
+	})
+
+/**
+ * darr_strdup_cap() - duplicate the string reserving capacity.
+ * darr_strdup() - duplicate the string into a dynamic array.
+ *
+ * Args:
+ *      S: The string to duplicate.
+ *      C: The capacity to reserve.
+ *
+ * Return:
+ *	The dynamic_array with the duplicated string.
+ */
+#define darr_strdup_cap(S, C)                                                  \
+	({                                                                     \
+		size_t __size = strlen(S) + 1;                                 \
+		char *__s = NULL;                                              \
+		/* Cast to ssize_t to avoid warning when C == 0 */             \
+		darr_ensure_cap_mt(__s,                                        \
+				   ((ssize_t)(C) > (ssize_t)__size)            \
+					   ? (size_t)(C)                       \
+					   : __size,                           \
+				   MTYPE_DARR_STR);                            \
+		strlcpy(__s, (S), darr_cap(__s));                              \
+		darr_setlen(__s, (size_t)__size);                              \
+		__s;                                                           \
+	})
+#define darr_strdup(S) darr_strdup_cap(S, 0)
+
+/**
+ * darr_strlen() - get the length of the NUL terminated string in a darr.
+ *
+ * Args:
+ *      S: The string to measure, value may be NULL.
+ *
+ * Return:
+ *	The length of the NUL terminated string in @S
+ */
+#define darr_strlen(S)                                                         \
+	({                                                                     \
+		uint __size = darr_len(S);                                     \
+		if (__size)                                                    \
+			__size -= 1;                                           \
+		assert(!(S) || ((char *)(S))[__size] == 0);                    \
+		__size;                                                        \
+	})
+
+/**
+ * darr_vsprintf() - vsprintf into a new dynamic array.
+ *
+ * Args:
+ *      F: The format string
+ *      A: Varargs
+ *
+ * Return:
+ *	The dynamic_array D with the new string content.
+ */
+#define darr_vsprintf(F, A)                                                    \
+	({                                                                     \
+		char *d = NULL;                                                \
+		darr_in_vsprintf(d, F, A);                                     \
+		d;                                                             \
+	})
+
+/**
  * Iterate over array `A` using a pointer to each element in `P`.
  *
  * Args:
@@ -361,3 +749,5 @@ void *__darr_resize(void *a, uint count, size_t esize);
  *	I: A uint variable to store the current element index in.
  */
 #define darr_foreach_i(A, I) for ((I) = 0; (I) < darr_len(A); (I)++)
+
+#endif /* _FRR_DARR_H_ */
diff --git a/lib/defun_lex.l b/lib/defun_lex.l
index 124f864..3104e48 100644
--- a/lib/defun_lex.l
+++ b/lib/defun_lex.l
@@ -140,6 +140,7 @@ SPECIAL		[(),]
 "DEFPY_ATTR"			value = strdup(yytext); return DEFUNNY;
 "DEFPY_HIDDEN"			value = strdup(yytext); return DEFUNNY;
 "DEFPY_YANG"			value = strdup(yytext); return DEFUNNY;
+"DEFPY_YANG_HIDDEN"		value = strdup(yytext); return DEFUNNY;
 "DEFPY_YANG_NOSH"		value = strdup(yytext); return DEFUNNY;
 "ALIAS"				value = strdup(yytext); return DEFUNNY;
 "ALIAS_HIDDEN"			value = strdup(yytext); return DEFUNNY;
diff --git a/lib/distribute.c b/lib/distribute.c
index 6548767..ccd1f13 100644
--- a/lib/distribute.c
+++ b/lib/distribute.c
@@ -17,8 +17,6 @@ DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE, "Distribute list");
 DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE_IFNAME, "Dist-list ifname");
 DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE_NAME, "Dist-list name");
 
-static struct list *dist_ctx_list;
-
 static struct distribute *distribute_new(void)
 {
 	return XCALLOC(MTYPE_DISTRIBUTE, sizeof(struct distribute));
@@ -244,11 +242,10 @@ static enum distribute_type distribute_direction(const char *dir, bool v4)
 	__builtin_unreachable();
 }
 
-int distribute_list_parser(bool prefix, bool v4, const char *dir,
-			   const char *list, const char *ifname)
+int distribute_list_parser(struct distribute_ctx *ctx, bool prefix, bool v4,
+			   const char *dir, const char *list, const char *ifname)
 {
 	enum distribute_type type = distribute_direction(dir, v4);
-	struct distribute_ctx *ctx = listnode_head(dist_ctx_list);
 
 	void (*distfn)(struct distribute_ctx *, const char *,
 		       enum distribute_type, const char *) =
@@ -259,12 +256,12 @@ int distribute_list_parser(bool prefix, bool v4, const char *dir,
 	return CMD_SUCCESS;
 }
 
-int distribute_list_no_parser(struct vty *vty, bool prefix, bool v4,
-			      const char *dir, const char *list,
-			      const char *ifname)
+
+int distribute_list_no_parser(struct distribute_ctx *ctx, struct vty *vty,
+			      bool prefix, bool v4, const char *dir,
+			      const char *list, const char *ifname)
 {
 	enum distribute_type type = distribute_direction(dir, v4);
-	struct distribute_ctx *ctx = listnode_head(dist_ctx_list);
 	int ret;
 
 	int (*distfn)(struct distribute_ctx *, const char *,
@@ -274,7 +271,8 @@ int distribute_list_no_parser(struct vty *vty, bool prefix, bool v4,
 
 	ret = distfn(ctx, ifname, type, list);
 	if (!ret) {
-		vty_out(vty, "distribute list doesn't exist\n");
+		if (vty)
+			vty_out(vty, "distribute list doesn't exist\n");
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
@@ -443,17 +441,130 @@ int config_write_distribute(struct vty *vty,
 	return write;
 }
 
+/* ---------- */
+/* Northbound */
+/* ---------- */
+
+int group_distribute_list_create_helper(
+	struct nb_cb_create_args *args, struct distribute_ctx *ctx)
+{
+	nb_running_set_entry(args->dnode, ctx);
+	return NB_OK;
+}
+
+/*
+ * XPath: /frr-ripd:ripd/instance/distribute-lists/distribute-list/{in,out}/{access,prefix}-list
+ */
+
+int group_distribute_list_destroy(struct nb_cb_destroy_args *args)
+{
+	nb_running_unset_entry(args->dnode);
+	return NB_OK;
+}
+
+static int distribute_list_leaf_update(const struct lyd_node *dnode,
+				       int ip_version, bool no)
+{
+	struct distribute_ctx *ctx;
+	struct lyd_node *dir_node = lyd_parent(dnode);
+	struct lyd_node_inner *list_node = dir_node->parent;
+	struct lyd_node *intf_key = list_node->child;
+	bool ipv4 = ip_version == 4 ? true : false;
+	bool prefix;
+
+	ctx = nb_running_get_entry_non_rec(&list_node->node, NULL, false);
+
+	prefix = dnode->schema->name[0] == 'p' ? true : false;
+	if (no)
+		distribute_list_no_parser(ctx, NULL, prefix, ipv4,
+					  dir_node->schema->name,
+					  lyd_get_value(dnode),
+					  lyd_get_value(intf_key));
+	else
+		distribute_list_parser(ctx, prefix, ipv4,
+				       dir_node->schema->name,
+				       lyd_get_value(dnode),
+				       lyd_get_value(intf_key));
+	return NB_OK;
+}
+
+static int distribute_list_leaf_modify(struct nb_cb_modify_args *args,
+				       int ip_version)
+{
+	if (args->event != NB_EV_APPLY)
+		return NB_OK;
+	return distribute_list_leaf_update(args->dnode, ip_version, false);
+}
+
+static int distribute_list_leaf_destroy(struct nb_cb_destroy_args *args,
+					int ip_version)
+{
+	if (args->event != NB_EV_APPLY)
+		return NB_OK;
+	return distribute_list_leaf_update(args->dnode, ip_version, true);
+}
+
+int group_distribute_list_ipv4_modify(struct nb_cb_modify_args *args)
+{
+	return distribute_list_leaf_modify(args, 4);
+}
+int group_distribute_list_ipv4_destroy(struct nb_cb_destroy_args *args)
+{
+	return distribute_list_leaf_destroy(args, 4);
+}
+int group_distribute_list_ipv6_modify(struct nb_cb_modify_args *args)
+{
+	return distribute_list_leaf_modify(args, 6);
+}
+int group_distribute_list_ipv6_destroy(struct nb_cb_destroy_args *args)
+{
+	return distribute_list_leaf_destroy(args, 6);
+}
+
+static int distribute_list_leaf_cli_show(struct vty *vty,
+					 const struct lyd_node *dnode,
+					 int ip_version)
+{
+	struct lyd_node *dir_node = lyd_parent(dnode);
+	struct lyd_node_inner *list_node = dir_node->parent;
+	struct lyd_node *intf_key = list_node->child;
+	bool ipv6 = ip_version == 6 ? true : false;
+	bool prefix;
+
+	prefix = dnode->schema->name[0] == 'p' ? true : false;
+	vty_out(vty,
+		" %sdistribute-list %s%s %s %s\n",
+		ipv6 ? "ipv6 " : "",
+		prefix ? "prefix " : "",
+		lyd_get_value(dnode),
+		dir_node->schema->name,
+		lyd_get_value(intf_key));
+
+	return NB_OK;
+}
+
+void group_distribute_list_ipv4_cli_show(struct vty *vty,
+					 const struct lyd_node *dnode,
+					 bool show_defaults)
+{
+	distribute_list_leaf_cli_show(vty, dnode, 4);
+}
+void group_distribute_list_ipv6_cli_show(struct vty *vty,
+					 const struct lyd_node *dnode,
+					 bool show_defaults)
+{
+	distribute_list_leaf_cli_show(vty, dnode, 6);
+}
+
+/* ------------- */
+/* Setup/Cleanup */
+/* ------------- */
+
 void distribute_list_delete(struct distribute_ctx **ctx)
 {
 	hash_clean_and_free(&(*ctx)->disthash,
 			    (void (*)(void *))distribute_free);
 
-	if (dist_ctx_list) {
-		listnode_delete(dist_ctx_list, *ctx);
-		if (list_isempty(dist_ctx_list))
-			list_delete(&dist_ctx_list);
-	}
-
 	XFREE(MTYPE_DISTRIBUTE_CTX, (*ctx));
 }
 
@@ -464,11 +575,9 @@ struct distribute_ctx *distribute_list_ctx_create(struct vrf *vrf)
 
 	ctx = XCALLOC(MTYPE_DISTRIBUTE_CTX, sizeof(struct distribute_ctx));
 	ctx->vrf = vrf;
-	ctx->disthash = hash_create(
-		distribute_hash_make,
-		(bool (*)(const void *, const void *))distribute_cmp, NULL);
-	if (!dist_ctx_list)
-		dist_ctx_list = list_new();
-	listnode_add(dist_ctx_list, ctx);
+	ctx->disthash =
+		hash_create(distribute_hash_make,
+			    (bool (*)(const void *, const void *))distribute_cmp,
+			    NULL);
 	return ctx;
 }
diff --git a/lib/distribute.h b/lib/distribute.h
index 7578371..a0bc348 100644
--- a/lib/distribute.h
+++ b/lib/distribute.h
@@ -9,6 +9,7 @@
 #include <zebra.h>
 #include "if.h"
 #include "filter.h"
+#include "northbound.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -69,11 +70,43 @@ extern enum filter_type distribute_apply_in(struct interface *,
 extern enum filter_type distribute_apply_out(struct interface *,
 					     struct prefix *);
 
-extern int distribute_list_parser(bool prefix, bool v4, const char *dir,
-				  const char *list, const char *ifname);
-extern int distribute_list_no_parser(struct vty *vty, bool prefix, bool v4,
+extern int distribute_list_parser(struct distribute_ctx *ctx, bool prefix,
+				  bool v4, const char *dir, const char *list,
+				  const char *ifname);
+extern int distribute_list_no_parser(struct distribute_ctx *ctx,
+				     struct vty *vty, bool prefix, bool v4,
 				     const char *dir, const char *list,
 				     const char *ifname);
+
+/*
+ * Northbound
+ */
+
+/*
+ * Define your own create callback and then call thes helper with your
+ * distribute list context when a list entry is created. Additionally, plug the
+ * destroy callback into the frr_module_yang_info struct, or call it if you have
+ * your own callback destroy function.
+ */
+extern int group_distribute_list_create_helper(struct nb_cb_create_args *args,
+					       struct distribute_ctx *ctx);
+extern int group_distribute_list_destroy(struct nb_cb_destroy_args *args);
+
+/*
+ * Plug 3 of these handlers in for your distribute-list for all the northbound
+ * distribute_list leaf callbacks. If you need multi-protocol then use the
+ * grouping twice under 2 different containers.
+ */
+extern int group_distribute_list_ipv4_modify(struct nb_cb_modify_args *args);
+extern int group_distribute_list_ipv4_destroy(struct nb_cb_destroy_args *args);
+extern void group_distribute_list_ipv4_cli_show(struct vty *vty,
+						const struct lyd_node *dnode,
+						bool show_defaults);
+extern int group_distribute_list_ipv6_modify(struct nb_cb_modify_args *args);
+extern int group_distribute_list_ipv6_destroy(struct nb_cb_destroy_args *args);
+extern void group_distribute_list_ipv6_cli_show(struct vty *vty,
+						const struct lyd_node *dnode,
+						bool show_defaults);
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/event.c b/lib/event.c
index d3bc020..fc46a11 100644
--- a/lib/event.c
+++ b/lib/event.c
@@ -6,6 +6,8 @@
 /* #define DEBUG */
 
 #include <zebra.h>
+
+#include <signal.h>
 #include <sys/resource.h>
 
 #include "frrevent.h"
@@ -55,11 +57,6 @@ static int event_timer_cmp(const struct event *a, const struct event *b)
 
 DECLARE_HEAP(event_timer_list, struct event, timeritem, event_timer_cmp);
 
-#if defined(__APPLE__)
-#include <mach/mach.h>
-#include <mach/mach_time.h>
-#endif
-
 #define AWAKEN(m)                                                              \
 	do {                                                                   \
 		const unsigned char wakebyte = 0x01;                           \
@@ -216,7 +213,7 @@ static void cpu_record_print(struct vty *vty, uint8_t filter)
 				"Active   Runtime(ms)   Invoked Avg uSec Max uSecs");
 			vty_out(vty, " Avg uSec Max uSecs");
 			vty_out(vty,
-				"  CPU_Warn Wall_Warn Starv_Warn Type   Thread\n");
+				"  CPU_Warn Wall_Warn Starv_Warn   Type  Event\n");
 
 			if (cpu_records_count(m->cpu_records)) {
 				struct cpu_event_history *rec;
@@ -232,13 +229,13 @@ static void cpu_record_print(struct vty *vty, uint8_t filter)
 	}
 
 	vty_out(vty, "\n");
-	vty_out(vty, "Total thread statistics\n");
+	vty_out(vty, "Total Event statistics\n");
 	vty_out(vty, "-------------------------\n");
 	vty_out(vty, "%30s %18s %18s\n", "",
 		"CPU (user+system):", "Real (wall-clock):");
 	vty_out(vty, "Active   Runtime(ms)   Invoked Avg uSec Max uSecs");
-	vty_out(vty, " Avg uSec Max uSecs  CPU_Warn Wall_Warn");
-	vty_out(vty, "  Type  Thread\n");
+	vty_out(vty, " Avg uSec Max uSecs  CPU_Warn Wall_Warn Starv_Warn");
+	vty_out(vty, "   Type  Event\n");
 
 	if (tmp.total_calls > 0)
 		vty_out_cpu_event_history(vty, &tmp);
@@ -307,13 +304,16 @@ static uint8_t parse_filter(const char *filterstr)
 	return filter;
 }
 
-DEFUN_NOSH (show_thread_cpu,
-	    show_thread_cpu_cmd,
-	    "show thread cpu [FILTER]",
-	    SHOW_STR
-	    "Thread information\n"
-	    "Thread CPU usage\n"
-	    "Display filter (rwtex)\n")
+#if CONFDATE > 20240707
+	CPP_NOTICE("Remove `show thread ...` commands")
+#endif
+DEFUN_NOSH (show_event_cpu,
+            show_event_cpu_cmd,
+            "show event cpu [FILTER]",
+            SHOW_STR
+            "Event information\n"
+            "Event CPU usage\n"
+            "Display filter (rwtexb)\n")
 {
 	uint8_t filter = (uint8_t)-1U;
 	int idx = 0;
@@ -332,6 +332,14 @@ DEFUN_NOSH (show_thread_cpu,
 	return CMD_SUCCESS;
 }
 
+ALIAS(show_event_cpu,
+      show_thread_cpu_cmd,
+      "show thread cpu [FILTER]",
+      SHOW_STR
+      "Thread information\n"
+      "Thread CPU usage\n"
+      "Display filter (rwtex)\n")
+
 DEFPY (service_cputime_stats,
        service_cputime_stats_cmd,
        "[no] service cputime-stats",
@@ -373,7 +381,7 @@ DEFPY (service_walltime_warning,
 	return CMD_SUCCESS;
 }
 
-static void show_thread_poll_helper(struct vty *vty, struct event_loop *m)
+static void show_event_poll_helper(struct vty *vty, struct event_loop *m)
 {
 	const char *name = m->name ? m->name : "main";
 	char underline[strlen(name) + 1];
@@ -414,24 +422,30 @@ static void show_thread_poll_helper(struct vty *vty, struct event_loop *m)
 	}
 }
 
-DEFUN_NOSH (show_thread_poll,
-	    show_thread_poll_cmd,
-	    "show thread poll",
-	    SHOW_STR
-	    "Thread information\n"
-	    "Show poll FD's and information\n")
+DEFUN_NOSH (show_event_poll,
+            show_event_poll_cmd,
+            "show event poll",
+            SHOW_STR
+            "Event information\n"
+            "Event Poll Information\n")
 {
 	struct listnode *node;
 	struct event_loop *m;
 
 	frr_with_mutex (&masters_mtx) {
 		for (ALL_LIST_ELEMENTS_RO(masters, node, m))
-			show_thread_poll_helper(vty, m);
+			show_event_poll_helper(vty, m);
 	}
 
 	return CMD_SUCCESS;
 }
 
+ALIAS(show_event_poll,
+      show_thread_poll_cmd,
+      "show thread poll",
+      SHOW_STR
+      "Thread information\n"
+      "Show poll FD's and information\n")
 
 DEFUN (clear_thread_cpu,
        clear_thread_cpu_cmd,
@@ -458,7 +472,7 @@ DEFUN (clear_thread_cpu,
 	return CMD_SUCCESS;
 }
 
-static void show_thread_timers_helper(struct vty *vty, struct event_loop *m)
+static void show_event_timers_helper(struct vty *vty, struct event_loop *m)
 {
 	const char *name = m->name ? m->name : "main";
 	char underline[strlen(name) + 1];
@@ -475,28 +489,37 @@ static void show_thread_timers_helper(struct vty *vty, struct event_loop *m)
 	}
 }
 
-DEFPY_NOSH (show_thread_timers,
-	    show_thread_timers_cmd,
-	    "show thread timers",
-	    SHOW_STR
-	    "Thread information\n"
-	    "Show all timers and how long they have in the system\n")
+DEFPY_NOSH (show_event_timers,
+            show_event_timers_cmd,
+            "show event timers",
+            SHOW_STR
+            "Event information\n"
+            "Show all timers and how long they have in the system\n")
 {
 	struct listnode *node;
 	struct event_loop *m;
 
 	frr_with_mutex (&masters_mtx) {
 		for (ALL_LIST_ELEMENTS_RO(masters, node, m))
-			show_thread_timers_helper(vty, m);
+			show_event_timers_helper(vty, m);
 	}
 
 	return CMD_SUCCESS;
 }
 
+ALIAS(show_event_timers,
+      show_thread_timers_cmd,
+      "show thread timers",
+      SHOW_STR
+      "Thread information\n"
+      "Show all timers and how long they have in the system\n")
+
 void event_cmd_init(void)
 {
 	install_element(VIEW_NODE, &show_thread_cpu_cmd);
+	install_element(VIEW_NODE, &show_event_cpu_cmd);
 	install_element(VIEW_NODE, &show_thread_poll_cmd);
+	install_element(VIEW_NODE, &show_event_poll_cmd);
 	install_element(ENABLE_NODE, &clear_thread_cpu_cmd);
 
 	install_element(CONFIG_NODE, &service_cputime_stats_cmd);
@@ -504,6 +527,7 @@ void event_cmd_init(void)
 	install_element(CONFIG_NODE, &service_walltime_warning_cmd);
 
 	install_element(VIEW_NODE, &show_thread_timers_cmd);
+	install_element(VIEW_NODE, &show_event_timers_cmd);
 }
 /* CLI end ------------------------------------------------------------------ */
 
@@ -519,6 +543,7 @@ static void initializer(void)
 	pthread_key_create(&thread_current, NULL);
 }
 
+#define STUPIDLY_LARGE_FD_SIZE 100000
 struct event_loop *event_master_create(const char *name)
 {
 	struct event_loop *rv;
@@ -545,6 +570,13 @@ struct event_loop *event_master_create(const char *name)
 		rv->fd_limit = (int)limit.rlim_cur;
 	}
 
+	if (rv->fd_limit > STUPIDLY_LARGE_FD_SIZE) {
+		zlog_warn("FD Limit set: %u is stupidly large.  Is this what you intended?  Consider using --limit-fds also limiting size to %u",
+			  rv->fd_limit, STUPIDLY_LARGE_FD_SIZE);
+
+		rv->fd_limit = STUPIDLY_LARGE_FD_SIZE;
+	}
+
 	rv->read = XCALLOC(MTYPE_EVENT_POLL,
 			   sizeof(struct event *) * rv->fd_limit);
 
@@ -1594,12 +1626,70 @@ static int thread_process_io_helper(struct event_loop *m, struct event *thread,
 	return 1;
 }
 
+static inline void thread_process_io_inner_loop(struct event_loop *m,
+						unsigned int num,
+						struct pollfd *pfds, nfds_t *i,
+						uint32_t *ready)
+{
+	/* no event for current fd? immediately continue */
+	if (pfds[*i].revents == 0)
+		return;
+
+	*ready = *ready + 1;
+
+	/*
+	 * Unless someone has called event_cancel from another
+	 * pthread, the only thing that could have changed in
+	 * m->handler.pfds while we were asleep is the .events
+	 * field in a given pollfd. Barring event_cancel() that
+	 * value should be a superset of the values we have in our
+	 * copy, so there's no need to update it. Similarily,
+	 * barring deletion, the fd should still be a valid index
+	 * into the master's pfds.
+	 *
+	 * We are including POLLERR here to do a READ event
+	 * this is because the read should fail and the
+	 * read function should handle it appropriately
+	 */
+	if (pfds[*i].revents & (POLLIN | POLLHUP | POLLERR)) {
+		thread_process_io_helper(m, m->read[pfds[*i].fd], POLLIN,
+					 pfds[*i].revents, *i);
+	}
+	if (pfds[*i].revents & POLLOUT)
+		thread_process_io_helper(m, m->write[pfds[*i].fd], POLLOUT,
+					 pfds[*i].revents, *i);
+
+	/*
+	 * if one of our file descriptors is garbage, remove the same
+	 * from both pfds + update sizes and index
+	 */
+	if (pfds[*i].revents & POLLNVAL) {
+		memmove(m->handler.pfds + *i, m->handler.pfds + *i + 1,
+			(m->handler.pfdcount - *i - 1) * sizeof(struct pollfd));
+		m->handler.pfdcount--;
+		m->handler.pfds[m->handler.pfdcount].fd = 0;
+		m->handler.pfds[m->handler.pfdcount].events = 0;
+
+		memmove(pfds + *i, pfds + *i + 1,
+			(m->handler.copycount - *i - 1) * sizeof(struct pollfd));
+		m->handler.copycount--;
+		m->handler.copy[m->handler.copycount].fd = 0;
+		m->handler.copy[m->handler.copycount].events = 0;
+
+		*i = *i - 1;
+	}
+}
+
 /**
  * Process I/O events.
  *
  * Walks through file descriptor array looking for those pollfds whose .revents
  * field has something interesting. Deletes any invalid file descriptors.
  *
+ * Try to impart some impartiality to handling of io.  The event
+ * system will cycle through the fd's available for io
+ * giving each one a chance to go first.
+ *
  * @param m the thread master
  * @param num the number of active file descriptors (return value of poll())
  */
@@ -1607,58 +1697,15 @@ static void thread_process_io(struct event_loop *m, unsigned int num)
 {
 	unsigned int ready = 0;
 	struct pollfd *pfds = m->handler.copy;
+	nfds_t i, last_read = m->last_read % m->handler.copycount;
 
-	for (nfds_t i = 0; i < m->handler.copycount && ready < num; ++i) {
-		/* no event for current fd? immediately continue */
-		if (pfds[i].revents == 0)
-			continue;
+	for (i = last_read; i < m->handler.copycount && ready < num; ++i)
+		thread_process_io_inner_loop(m, num, pfds, &i, &ready);
 
-		ready++;
+	for (i = 0; i < last_read && ready < num; ++i)
+		thread_process_io_inner_loop(m, num, pfds, &i, &ready);
 
-		/*
-		 * Unless someone has called event_cancel from another
-		 * pthread, the only thing that could have changed in
-		 * m->handler.pfds while we were asleep is the .events
-		 * field in a given pollfd. Barring event_cancel() that
-		 * value should be a superset of the values we have in our
-		 * copy, so there's no need to update it. Similarily,
-		 * barring deletion, the fd should still be a valid index
-		 * into the master's pfds.
-		 *
-		 * We are including POLLERR here to do a READ event
-		 * this is because the read should fail and the
-		 * read function should handle it appropriately
-		 */
-		if (pfds[i].revents & (POLLIN | POLLHUP | POLLERR)) {
-			thread_process_io_helper(m, m->read[pfds[i].fd], POLLIN,
-						 pfds[i].revents, i);
-		}
-		if (pfds[i].revents & POLLOUT)
-			thread_process_io_helper(m, m->write[pfds[i].fd],
-						 POLLOUT, pfds[i].revents, i);
-
-		/*
-		 * if one of our file descriptors is garbage, remove the same
-		 * from both pfds + update sizes and index
-		 */
-		if (pfds[i].revents & POLLNVAL) {
-			memmove(m->handler.pfds + i, m->handler.pfds + i + 1,
-				(m->handler.pfdcount - i - 1)
-					* sizeof(struct pollfd));
-			m->handler.pfdcount--;
-			m->handler.pfds[m->handler.pfdcount].fd = 0;
-			m->handler.pfds[m->handler.pfdcount].events = 0;
-
-			memmove(pfds + i, pfds + i + 1,
-				(m->handler.copycount - i - 1)
-					* sizeof(struct pollfd));
-			m->handler.copycount--;
-			m->handler.copy[m->handler.copycount].fd = 0;
-			m->handler.copy[m->handler.copycount].events = 0;
-
-			i--;
-		}
-	}
+	m->last_read++;
 }
 
 /* Add all timers that have popped to the ready list. */
@@ -1838,12 +1885,6 @@ struct event *event_fetch(struct event_loop *m, struct event *fetch)
 	return fetch;
 }
 
-static unsigned long timeval_elapsed(struct timeval a, struct timeval b)
-{
-	return (((a.tv_sec - b.tv_sec) * TIMER_SECOND_MICRO)
-		+ (a.tv_usec - b.tv_usec));
-}
-
 unsigned long event_consumed_time(RUSAGE_T *now, RUSAGE_T *start,
 				  unsigned long *cputime)
 {
diff --git a/lib/filter.c b/lib/filter.c
index f86adab..5a0790f 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -410,7 +410,10 @@ void access_list_filter_add(struct access_list *access,
 		filter->prev = access->tail;
 		access->tail = filter;
 	}
+}
 
+void access_list_filter_update(struct access_list *access)
+{
 	/* Run hook function. */
 	if (access->master->add_hook)
 		(*access->master->add_hook)(access);
@@ -885,7 +888,7 @@ static void access_list_init_ipv6(void)
 	install_element(ENABLE_NODE, &show_ipv6_access_list_name_cmd);
 }
 
-void access_list_init(void)
+void access_list_init_new(bool in_backend)
 {
 	cmd_variable_handler_register(access_list_handlers);
 
@@ -893,7 +896,15 @@ void access_list_init(void)
 	access_list_init_ipv6();
 	access_list_init_mac();
 
-	filter_cli_init();
+	if (!in_backend) {
+		/* we do not want to handle config commands in the backend */
+		filter_cli_init();
+	}
+}
+
+void access_list_init(void)
+{
+	access_list_init_new(false);
 }
 
 void access_list_reset(void)
diff --git a/lib/filter.h b/lib/filter.h
index e092f07..4fa482b 100644
--- a/lib/filter.h
+++ b/lib/filter.h
@@ -114,6 +114,7 @@ struct access_master {
 
 /* Prototypes for access-list. */
 extern void access_list_init(void);
+extern void access_list_init_new(bool in_backend);
 extern void access_list_reset(void);
 extern void access_list_add_hook(void (*func)(struct access_list *));
 extern void access_list_delete_hook(void (*func)(struct access_list *));
@@ -124,13 +125,14 @@ extern enum filter_type access_list_apply(struct access_list *access,
 struct access_list *access_list_get(afi_t afi, const char *name);
 void access_list_delete(struct access_list *access);
 struct filter *filter_new(void);
-void access_list_filter_add(struct access_list *access,
-			    struct filter *filter);
+void access_list_filter_add(struct access_list *access, struct filter *filter);
 void access_list_filter_delete(struct access_list *access,
 			       struct filter *filter);
+void access_list_filter_update(struct access_list *access);
 int64_t filter_new_seq_get(struct access_list *access);
 
 extern const struct frr_yang_module_info frr_filter_info;
+extern const struct frr_yang_module_info frr_filter_cli_info;
 
 
 /* filter_nb.c */
diff --git a/lib/filter_cli.c b/lib/filter_cli.c
index 5c3dc5e..c40c2a7 100644
--- a/lib/filter_cli.c
+++ b/lib/filter_cli.c
@@ -69,59 +69,66 @@ static int64_t acl_get_seq(struct vty *vty, const char *xpath, bool is_remove)
 	return seq;
 }
 
-static int acl_remove_if_empty(struct vty *vty, const char *iptype,
-			       const char *name)
+/**
+ * Remove main data structure filter list if there are no more entries or
+ * remark. This fixes compatibility with old CLI and tests.
+ */
+static int filter_remove_check_empty(struct vty *vty, const char *ftype,
+				     const char *iptype, const char *name,
+				     uint32_t del_seq, bool del_remark)
 {
+	const struct lyd_node *remark_dnode = NULL;
+	const struct lyd_node *entry_dnode = NULL;
 	char xpath[XPATH_MAXLEN];
+	uint32_t count;
+
+	/* Count existing entries */
+	count = yang_dnode_count(vty->candidate_config->dnode,
+				 "/frr-filter:lib/%s-list[type='%s'][name='%s']/entry",
+				 ftype, iptype, name);
+
+	/* Check entry-to-delete actually exists */
+	if (del_seq) {
+		snprintf(xpath, sizeof(xpath),
+			 "/frr-filter:lib/%s-list[type='%s'][name='%s']/entry[sequence='%u']",
+			 ftype, iptype, name, del_seq);
+		entry_dnode = yang_dnode_get(vty->candidate_config->dnode,
+					     xpath);
+
+		/* If exists, delete and don't count it, we need only remaining entries */
+		if (entry_dnode) {
+			nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
+			count--;
+		}
+	}
 
+	/* Delete the remark, or check whether it exists if we're keeping it */
 	snprintf(xpath, sizeof(xpath),
-		 "/frr-filter:lib/access-list[type='%s'][name='%s']/remark",
+		 "/frr-filter:lib/%s-list[type='%s'][name='%s']/remark", ftype,
 		 iptype, name);
-	/* List is not empty if there is a remark, check that: */
-	if (yang_dnode_exists(vty->candidate_config->dnode, xpath))
-		return CMD_SUCCESS;
-
-	/* Check if we have any entries: */
-	snprintf(xpath, sizeof(xpath),
-		 "/frr-filter:lib/access-list[type='%s'][name='%s']", iptype,
-		 name);
-	/*
-	 * NOTE: if the list is empty it will return the first sequence
-	 * number: 5.
-	 */
-	if (acl_get_seq(vty, xpath, true) != 5)
-		return CMD_SUCCESS;
+	if (del_remark)
+		nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
+	else
+		remark_dnode = yang_dnode_get(vty->candidate_config->dnode,
+					      xpath);
+
+	/* If there are no entries left and no remark, delete the whole list */
+	if (count == 0 && !remark_dnode) {
+		snprintf(xpath, sizeof(xpath),
+			 "/frr-filter:lib/%s-list[type='%s'][name='%s']", ftype,
+			 iptype, name);
+		nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
+	}
 
-	/* Nobody is using this list, lets remove it. */
-	nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
 	return nb_cli_apply_changes(vty, NULL);
 }
 
-static int acl_remove(struct vty *vty, const char *iptype, const char *name,
-		      int64_t sseq)
-{
-	char xpath[XPATH_MAXLEN];
-	int rv;
-
-	snprintfrr(
-		xpath, sizeof(xpath),
-		"/frr-filter:lib/access-list[type='%s'][name='%s']/entry[sequence='%" PRId64 "']",
-		iptype, name, sseq);
-	nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
-
-	rv = nb_cli_apply_changes(vty, NULL);
-	if (rv == CMD_SUCCESS)
-		return acl_remove_if_empty(vty, iptype, name);
-
-	return rv;
-}
-
 /*
  * Cisco (legacy) access lists.
  */
 DEFPY_YANG(
 	access_list_std, access_list_std_cmd,
-	"access-list WORD$name [seq (1-4294967295)$seq] <deny|permit>$action <[host] A.B.C.D$host|A.B.C.D$host A.B.C.D$mask>",
+	"access-list ACCESSLIST4_NAME$name [seq (1-4294967295)$seq] <deny|permit>$action <[host] A.B.C.D$host|A.B.C.D$host A.B.C.D$mask>",
 	ACCESS_LIST_STR
 	ACCESS_LIST_ZEBRA_STR
 	ACCESS_LIST_SEQ_STR
@@ -197,7 +204,7 @@ DEFPY_YANG(
 
 DEFPY_YANG(
 	no_access_list_std, no_access_list_std_cmd,
-	"no access-list WORD$name [seq (1-4294967295)$seq] <deny|permit>$action <[host] A.B.C.D$host|A.B.C.D$host A.B.C.D$mask>",
+	"no access-list ACCESSLIST4_NAME$name [seq (1-4294967295)$seq] <deny|permit>$action <[host] A.B.C.D$host|A.B.C.D$host A.B.C.D$mask>",
 	NO_STR
 	ACCESS_LIST_STR
 	ACCESS_LIST_ZEBRA_STR
@@ -213,7 +220,8 @@ DEFPY_YANG(
 
 	/* If the user provided sequence number, then just go for it. */
 	if (seq_str != NULL)
-		return acl_remove(vty, "ipv4", name, seq);
+		return filter_remove_check_empty(vty, "access", "ipv4", name,
+						 seq, false);
 
 	/* Otherwise, to keep compatibility, we need to figure it out. */
 	ada.ada_type = "ipv4";
@@ -237,12 +245,13 @@ DEFPY_YANG(
 	else
 		return CMD_WARNING_CONFIG_FAILED;
 
-	return acl_remove(vty, "ipv4", name, sseq);
+	return filter_remove_check_empty(vty, "access", "ipv4", name, sseq,
+					 false);
 }
 
 DEFPY_YANG(
 	access_list_ext, access_list_ext_cmd,
-	"access-list WORD$name [seq (1-4294967295)$seq] <deny|permit>$action ip <A.B.C.D$src A.B.C.D$src_mask|host A.B.C.D$src|any> <A.B.C.D$dst A.B.C.D$dst_mask|host A.B.C.D$dst|any>",
+	"access-list ACCESSLIST4_NAME$name [seq (1-4294967295)$seq] <deny|permit>$action ip <A.B.C.D$src A.B.C.D$src_mask|host A.B.C.D$src|any> <A.B.C.D$dst A.B.C.D$dst_mask|host A.B.C.D$dst|any>",
 	ACCESS_LIST_STR
 	ACCESS_LIST_ZEBRA_STR
 	ACCESS_LIST_SEQ_STR
@@ -360,7 +369,7 @@ DEFPY_YANG(
 
 DEFPY_YANG(
 	no_access_list_ext, no_access_list_ext_cmd,
-	"no access-list WORD$name [seq (1-4294967295)$seq] <deny|permit>$action ip <A.B.C.D$src A.B.C.D$src_mask|host A.B.C.D$src|any> <A.B.C.D$dst A.B.C.D$dst_mask|host A.B.C.D$dst|any>",
+	"no access-list ACCESSLIST4_NAME$name [seq (1-4294967295)$seq] <deny|permit>$action ip <A.B.C.D$src A.B.C.D$src_mask|host A.B.C.D$src|any> <A.B.C.D$dst A.B.C.D$dst_mask|host A.B.C.D$dst|any>",
 	NO_STR
 	ACCESS_LIST_STR
 	ACCESS_LIST_ZEBRA_STR
@@ -384,7 +393,8 @@ DEFPY_YANG(
 
 	/* If the user provided sequence number, then just go for it. */
 	if (seq_str != NULL)
-		return acl_remove(vty, "ipv4", name, seq);
+		return filter_remove_check_empty(vty, "access", "ipv4", name,
+						 seq, false);
 
 	/* Otherwise, to keep compatibility, we need to figure it out. */
 	ada.ada_type = "ipv4";
@@ -429,7 +439,8 @@ DEFPY_YANG(
 	else
 		return CMD_WARNING_CONFIG_FAILED;
 
-	return acl_remove(vty, "ipv4", name, sseq);
+	return filter_remove_check_empty(vty, "access", "ipv4", name, sseq,
+					 false);
 }
 
 /*
@@ -437,7 +448,7 @@ DEFPY_YANG(
  */
 DEFPY_YANG(
 	access_list, access_list_cmd,
-	"access-list WORD$name [seq (1-4294967295)$seq] <deny|permit>$action <A.B.C.D/M$prefix [exact-match$exact]|any>",
+	"access-list ACCESSLIST4_NAME$name [seq (1-4294967295)$seq] <deny|permit>$action <A.B.C.D/M$prefix [exact-match$exact]|any>",
 	ACCESS_LIST_STR
 	ACCESS_LIST_ZEBRA_STR
 	ACCESS_LIST_SEQ_STR
@@ -510,7 +521,7 @@ DEFPY_YANG(
 
 DEFPY_YANG(
 	no_access_list, no_access_list_cmd,
-	"no access-list WORD$name [seq (1-4294967295)$seq] <deny|permit>$action <A.B.C.D/M$prefix [exact-match$exact]|any>",
+	"no access-list ACCESSLIST4_NAME$name [seq (1-4294967295)$seq] <deny|permit>$action <A.B.C.D/M$prefix [exact-match$exact]|any>",
 	NO_STR
 	ACCESS_LIST_STR
 	ACCESS_LIST_ZEBRA_STR
@@ -525,7 +536,8 @@ DEFPY_YANG(
 
 	/* If the user provided sequence number, then just go for it. */
 	if (seq_str != NULL)
-		return acl_remove(vty, "ipv4", name, seq);
+		return filter_remove_check_empty(vty, "access", "ipv4", name,
+						 seq, false);
 
 	/* Otherwise, to keep compatibility, we need to figure it out. */
 	ada.ada_type = "ipv4";
@@ -549,12 +561,13 @@ DEFPY_YANG(
 	else
 		return CMD_WARNING_CONFIG_FAILED;
 
-	return acl_remove(vty, "ipv4", name, sseq);
+	return filter_remove_check_empty(vty, "access", "ipv4", name, sseq,
+					 false);
 }
 
 DEFPY_YANG(
 	no_access_list_all, no_access_list_all_cmd,
-	"no access-list WORD$name",
+	"no access-list ACCESSLIST4_NAME$name",
 	NO_STR
 	ACCESS_LIST_STR
 	ACCESS_LIST_ZEBRA_STR)
@@ -570,7 +583,7 @@ DEFPY_YANG(
 
 DEFPY_YANG(
 	access_list_remark, access_list_remark_cmd,
-	"access-list WORD$name remark LINE...",
+	"access-list ACCESSLIST4_NAME$name remark LINE...",
 	ACCESS_LIST_STR
 	ACCESS_LIST_ZEBRA_STR
 	ACCESS_LIST_REMARK_STR
@@ -594,30 +607,18 @@ DEFPY_YANG(
 
 DEFPY_YANG(
 	no_access_list_remark, no_access_list_remark_cmd,
-	"no access-list WORD$name remark",
+	"no access-list ACCESSLIST4_NAME$name remark",
 	NO_STR
 	ACCESS_LIST_STR
 	ACCESS_LIST_ZEBRA_STR
 	ACCESS_LIST_REMARK_STR)
 {
-	char xpath[XPATH_MAXLEN];
-	int rv;
-
-	snprintf(xpath, sizeof(xpath),
-		 "/frr-filter:lib/access-list[type='ipv4'][name='%s']/remark",
-		 name);
-	nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
-
-	rv = nb_cli_apply_changes(vty, NULL);
-	if (rv == CMD_SUCCESS)
-		return acl_remove_if_empty(vty, "ipv4", name);
-
-	return rv;
+	return filter_remove_check_empty(vty, "access", "ipv4", name, 0, true);
 }
 
 ALIAS(
 	no_access_list_remark, no_access_list_remark_line_cmd,
-	"no access-list WORD$name remark LINE...",
+	"no access-list ACCESSLIST4_NAME$name remark LINE...",
 	NO_STR
 	ACCESS_LIST_STR
 	ACCESS_LIST_ZEBRA_STR
@@ -626,7 +627,7 @@ ALIAS(
 
 DEFPY_YANG(
 	ipv6_access_list, ipv6_access_list_cmd,
-	"ipv6 access-list WORD$name [seq (1-4294967295)$seq] <deny|permit>$action <X:X::X:X/M$prefix [exact-match$exact]|any>",
+	"ipv6 access-list ACCESSLIST6_NAME$name [seq (1-4294967295)$seq] <deny|permit>$action <X:X::X:X/M$prefix [exact-match$exact]|any>",
 	IPV6_STR
 	ACCESS_LIST_STR
 	ACCESS_LIST_ZEBRA_STR
@@ -700,7 +701,7 @@ DEFPY_YANG(
 
 DEFPY_YANG(
 	no_ipv6_access_list, no_ipv6_access_list_cmd,
-	"no ipv6 access-list WORD$name [seq (1-4294967295)$seq] <deny|permit>$action <X:X::X:X/M$prefix [exact-match$exact]|any>",
+	"no ipv6 access-list ACCESSLIST6_NAME$name [seq (1-4294967295)$seq] <deny|permit>$action <X:X::X:X/M$prefix [exact-match$exact]|any>",
 	NO_STR
 	IPV6_STR
 	ACCESS_LIST_STR
@@ -716,7 +717,8 @@ DEFPY_YANG(
 
 	/* If the user provided sequence number, then just go for it. */
 	if (seq_str != NULL)
-		return acl_remove(vty, "ipv6", name, seq);
+		return filter_remove_check_empty(vty, "access", "ipv6", name,
+						 seq, false);
 
 	/* Otherwise, to keep compatibility, we need to figure it out. */
 	ada.ada_type = "ipv6";
@@ -740,12 +742,13 @@ DEFPY_YANG(
 	else
 		return CMD_WARNING_CONFIG_FAILED;
 
-	return acl_remove(vty, "ipv6", name, sseq);
+	return filter_remove_check_empty(vty, "access", "ipv6", name, sseq,
+					 false);
 }
 
 DEFPY_YANG(
 	no_ipv6_access_list_all, no_ipv6_access_list_all_cmd,
-	"no ipv6 access-list WORD$name",
+	"no ipv6 access-list ACCESSLIST6_NAME$name",
 	NO_STR
 	IPV6_STR
 	ACCESS_LIST_STR
@@ -762,7 +765,7 @@ DEFPY_YANG(
 
 DEFPY_YANG(
 	ipv6_access_list_remark, ipv6_access_list_remark_cmd,
-	"ipv6 access-list WORD$name remark LINE...",
+	"ipv6 access-list ACCESSLIST6_NAME$name remark LINE...",
 	IPV6_STR
 	ACCESS_LIST_STR
 	ACCESS_LIST_ZEBRA_STR
@@ -787,26 +790,14 @@ DEFPY_YANG(
 
 DEFPY_YANG(
 	no_ipv6_access_list_remark, no_ipv6_access_list_remark_cmd,
-	"no ipv6 access-list WORD$name remark",
+	"no ipv6 access-list ACCESSLIST6_NAME$name remark",
 	NO_STR
 	IPV6_STR
 	ACCESS_LIST_STR
 	ACCESS_LIST_ZEBRA_STR
 	ACCESS_LIST_REMARK_STR)
 {
-	char xpath[XPATH_MAXLEN];
-	int rv;
-
-	snprintf(xpath, sizeof(xpath),
-		 "/frr-filter:lib/access-list[type='ipv6'][name='%s']/remark",
-		 name);
-	nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
-
-	rv = nb_cli_apply_changes(vty, NULL);
-	if (rv == CMD_SUCCESS)
-		return acl_remove_if_empty(vty, "ipv6", name);
-
-	return rv;
+	return filter_remove_check_empty(vty, "access", "ipv6", name, 0, true);
 }
 
 ALIAS(
@@ -902,7 +893,8 @@ DEFPY_YANG(
 
 	/* If the user provided sequence number, then just go for it. */
 	if (seq_str != NULL)
-		return acl_remove(vty, "mac", name, seq);
+		return filter_remove_check_empty(vty, "access", "mac", name,
+						 seq, false);
 
 	/* Otherwise, to keep compatibility, we need to figure it out. */
 	ada.ada_type = "mac";
@@ -922,7 +914,8 @@ DEFPY_YANG(
 	else
 		return CMD_WARNING_CONFIG_FAILED;
 
-	return acl_remove(vty, "mac", name, sseq);
+	return filter_remove_check_empty(vty, "access", "mac", name, sseq,
+					 false);
 }
 
 DEFPY_YANG(
@@ -976,19 +969,7 @@ DEFPY_YANG(
 	ACCESS_LIST_ZEBRA_STR
 	ACCESS_LIST_REMARK_STR)
 {
-	char xpath[XPATH_MAXLEN];
-	int rv;
-
-	snprintf(xpath, sizeof(xpath),
-		 "/frr-filter:lib/access-list[type='mac'][name='%s']/remark",
-		 name);
-	nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
-
-	rv = nb_cli_apply_changes(vty, NULL);
-	if (rv == CMD_SUCCESS)
-		return acl_remove_if_empty(vty, "mac", name);
-
-	return rv;
+	return filter_remove_check_empty(vty, "access", "mac", name, 0, true);
 }
 
 ALIAS(
@@ -1004,8 +985,8 @@ ALIAS(
 int access_list_cmp(const struct lyd_node *dnode1,
 		    const struct lyd_node *dnode2)
 {
-	uint32_t seq1 = yang_dnode_get_uint32(dnode1, "./sequence");
-	uint32_t seq2 = yang_dnode_get_uint32(dnode2, "./sequence");
+	uint32_t seq1 = yang_dnode_get_uint32(dnode1, "sequence");
+	uint32_t seq2 = yang_dnode_get_uint32(dnode2, "sequence");
 
 	return seq1 - seq2;
 }
@@ -1022,23 +1003,23 @@ void access_list_show(struct vty *vty, const struct lyd_node *dnode,
 	struct in_addr addr, mask;
 	char macstr[PREFIX2STR_BUFFER];
 
-	is_any = yang_dnode_exists(dnode, "./any");
+	is_any = yang_dnode_exists(dnode, "any");
 	switch (type) {
 	case YALT_IPV4:
 		if (is_any)
 			break;
 
-		if (yang_dnode_exists(dnode, "./host")
-		    || yang_dnode_exists(dnode, "./network/address")
-		    || yang_dnode_exists(dnode, "./source-any")) {
+		if (yang_dnode_exists(dnode, "host")
+		    || yang_dnode_exists(dnode, "network/address")
+		    || yang_dnode_exists(dnode, "source-any")) {
 			cisco_style = true;
-			if (yang_dnode_exists(dnode, "./destination-host")
+			if (yang_dnode_exists(dnode, "destination-host")
 			    || yang_dnode_exists(
 				    dnode, "./destination-network/address")
-			    || yang_dnode_exists(dnode, "./destination-any"))
+			    || yang_dnode_exists(dnode, "destination-any"))
 				cisco_extended = true;
 		} else {
-			yang_dnode_get_prefix(&p, dnode, "./ipv4-prefix");
+			yang_dnode_get_prefix(&p, dnode, "ipv4-prefix");
 			is_exact = yang_dnode_get_bool(dnode,
 						       "./ipv4-exact-match");
 		}
@@ -1048,39 +1029,39 @@ void access_list_show(struct vty *vty, const struct lyd_node *dnode,
 		if (is_any)
 			break;
 
-		yang_dnode_get_prefix(&p, dnode, "./ipv6-prefix");
-		is_exact = yang_dnode_get_bool(dnode, "./ipv6-exact-match");
+		yang_dnode_get_prefix(&p, dnode, "ipv6-prefix");
+		is_exact = yang_dnode_get_bool(dnode, "ipv6-exact-match");
 		break;
 	case YALT_MAC: /* mac */
 		vty_out(vty, "mac ");
 		if (is_any)
 			break;
 
-		yang_dnode_get_prefix(&p, dnode, "./mac");
+		yang_dnode_get_prefix(&p, dnode, "mac");
 		break;
 	}
 
 	vty_out(vty, "access-list %s seq %s %s",
 		yang_dnode_get_string(dnode, "../name"),
-		yang_dnode_get_string(dnode, "./sequence"),
-		yang_dnode_get_string(dnode, "./action"));
+		yang_dnode_get_string(dnode, "sequence"),
+		yang_dnode_get_string(dnode, "action"));
 
 	/* Handle Cisco style access lists. */
 	if (cisco_style) {
 		if (cisco_extended)
 			vty_out(vty, " ip");
 
-		if (yang_dnode_exists(dnode, "./network")) {
-			yang_dnode_get_ipv4(&addr, dnode, "./network/address");
-			yang_dnode_get_ipv4(&mask, dnode, "./network/mask");
+		if (yang_dnode_exists(dnode, "network")) {
+			yang_dnode_get_ipv4(&addr, dnode, "network/address");
+			yang_dnode_get_ipv4(&mask, dnode, "network/mask");
 			vty_out(vty, " %pI4 %pI4", &addr, &mask);
-		} else if (yang_dnode_exists(dnode, "./host")) {
+		} else if (yang_dnode_exists(dnode, "host")) {
 			if (cisco_extended)
 				vty_out(vty, " host");
 
 			vty_out(vty, " %s",
-				yang_dnode_get_string(dnode, "./host"));
-		} else if (yang_dnode_exists(dnode, "./source-any"))
+				yang_dnode_get_string(dnode, "host"));
+		} else if (yang_dnode_exists(dnode, "source-any"))
 			vty_out(vty, " any");
 
 		/* Not extended, exit earlier. */
@@ -1090,17 +1071,17 @@ void access_list_show(struct vty *vty, const struct lyd_node *dnode,
 		}
 
 		/* Handle destination address. */
-		if (yang_dnode_exists(dnode, "./destination-network")) {
+		if (yang_dnode_exists(dnode, "destination-network")) {
 			yang_dnode_get_ipv4(&addr, dnode,
 					    "./destination-network/address");
 			yang_dnode_get_ipv4(&mask, dnode,
 					    "./destination-network/mask");
 			vty_out(vty, " %pI4 %pI4", &addr, &mask);
-		} else if (yang_dnode_exists(dnode, "./destination-host"))
+		} else if (yang_dnode_exists(dnode, "destination-host"))
 			vty_out(vty, " host %s",
 				yang_dnode_get_string(dnode,
 						      "./destination-host"));
-		else if (yang_dnode_exists(dnode, "./destination-any"))
+		else if (yang_dnode_exists(dnode, "destination-any"))
 			vty_out(vty, " any");
 
 		vty_out(vty, "\n");
@@ -1149,62 +1130,17 @@ void access_list_remark_show(struct vty *vty, const struct lyd_node *dnode,
  * Prefix lists.
  */
 
-/**
- * Remove main data structure prefix list if there are no more entries or
- * remark. This fixes compatibility with old CLI and tests.
- */
-static int plist_remove_if_empty(struct vty *vty, const char *iptype,
-				 const char *name)
-{
-	char xpath[XPATH_MAXLEN];
-
-	snprintf(xpath, sizeof(xpath),
-		 "/frr-filter:lib/prefix-list[type='%s'][name='%s']/remark",
-		 iptype, name);
-	/* List is not empty if there is a remark, check that: */
-	if (yang_dnode_exists(vty->candidate_config->dnode, xpath))
-		return CMD_SUCCESS;
-
-	/* Check if we have any entries: */
-	snprintf(xpath, sizeof(xpath),
-		 "/frr-filter:lib/prefix-list[type='%s'][name='%s']", iptype,
-		 name);
-	/*
-	 * NOTE: if the list is empty it will return the first sequence
-	 * number: 5.
-	 */
-	if (acl_get_seq(vty, xpath, true) != 5)
-		return CMD_SUCCESS;
-
-	/* Nobody is using this list, lets remove it. */
-	nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
-	return nb_cli_apply_changes(vty, NULL);
-}
-
 static int plist_remove(struct vty *vty, const char *iptype, const char *name,
-			const char *seq, const char *action,
+			uint32_t seq, const char *action,
 			union prefixconstptr prefix, int ge, int le)
 {
 	int64_t sseq;
 	struct plist_dup_args pda = {};
-	char xpath[XPATH_MAXLEN];
-	char xpath_entry[XPATH_MAXLEN + 32];
-	int rv;
 
 	/* If the user provided sequence number, then just go for it. */
-	if (seq != NULL) {
-		snprintf(
-			xpath, sizeof(xpath),
-			"/frr-filter:lib/prefix-list[type='%s'][name='%s']/entry[sequence='%s']",
-			iptype, name, seq);
-		nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
-
-		rv = nb_cli_apply_changes(vty, NULL);
-		if (rv == CMD_SUCCESS)
-			return plist_remove_if_empty(vty, iptype, name);
-
-		return rv;
-	}
+	if (seq != 0)
+		return filter_remove_check_empty(vty, "prefix", iptype, name,
+						 seq, false);
 
 	/* Otherwise, to keep compatibility, we need to figure it out. */
 	pda.pda_type = iptype;
@@ -1224,22 +1160,13 @@ static int plist_remove(struct vty *vty, const char *iptype, const char *name,
 	else
 		return CMD_WARNING_CONFIG_FAILED;
 
-	snprintfrr(
-		xpath_entry, sizeof(xpath_entry),
-		"/frr-filter:lib/prefix-list[type='%s'][name='%s']/entry[sequence='%" PRId64 "']",
-		iptype, name, sseq);
-	nb_cli_enqueue_change(vty, xpath_entry, NB_OP_DESTROY, NULL);
-
-	rv = nb_cli_apply_changes(vty, NULL);
-	if (rv == CMD_SUCCESS)
-		return plist_remove_if_empty(vty, iptype, name);
-
-	return rv;
+	return filter_remove_check_empty(vty, "prefix", iptype, name, sseq,
+					 false);
 }
 
 DEFPY_YANG(
 	ip_prefix_list, ip_prefix_list_cmd,
-	"ip prefix-list WORD$name [seq (1-4294967295)$seq] <deny|permit>$action <any|A.B.C.D/M$prefix [{ge (0-32)$ge|le (0-32)$le}]>",
+	"ip prefix-list PREFIXLIST4_NAME$name [seq (1-4294967295)$seq] <deny|permit>$action <any|A.B.C.D/M$prefix [{ge (0-32)$ge|le (0-32)$le}]>",
 	IP_STR
 	PREFIX_LIST_STR
 	PREFIX_LIST_NAME_STR
@@ -1333,7 +1260,7 @@ DEFPY_YANG(
 
 DEFPY_YANG(
 	no_ip_prefix_list, no_ip_prefix_list_cmd,
-	"no ip prefix-list WORD$name [seq (1-4294967295)$seq] <deny|permit>$action <any|A.B.C.D/M$prefix [{ge (0-32)|le (0-32)}]>",
+	"no ip prefix-list PREFIXLIST4_NAME$name [seq (1-4294967295)$seq] <deny|permit>$action <any|A.B.C.D/M$prefix [{ge (0-32)|le (0-32)}]>",
 	NO_STR
 	IP_STR
 	PREFIX_LIST_STR
@@ -1347,25 +1274,25 @@ DEFPY_YANG(
 	"Maximum prefix length to be matched\n"
 	"Maximum prefix length\n")
 {
-	return plist_remove(vty, "ipv4", name, seq_str, action,
+	return plist_remove(vty, "ipv4", name, seq, action,
 			    prefix_str ? prefix : NULL, ge, le);
 }
 
 DEFPY_YANG(
 	no_ip_prefix_list_seq, no_ip_prefix_list_seq_cmd,
-	"no ip prefix-list WORD$name seq (1-4294967295)$seq",
+	"no ip prefix-list PREFIXLIST4_NAME$name seq (1-4294967295)$seq",
 	NO_STR
 	IP_STR
 	PREFIX_LIST_STR
 	PREFIX_LIST_NAME_STR
 	ACCESS_LIST_SEQ_STR)
 {
-	return plist_remove(vty, "ipv4", name, seq_str, NULL, NULL, 0, 0);
+	return plist_remove(vty, "ipv4", name, seq, NULL, NULL, 0, 0);
 }
 
 DEFPY_YANG(
 	no_ip_prefix_list_all, no_ip_prefix_list_all_cmd,
-	"no ip prefix-list WORD$name",
+	"no ip prefix-list PREFIXLIST4_NAME$name",
 	NO_STR
 	IP_STR
 	PREFIX_LIST_STR
@@ -1382,7 +1309,7 @@ DEFPY_YANG(
 
 DEFPY_YANG(
 	ip_prefix_list_remark, ip_prefix_list_remark_cmd,
-	"ip prefix-list WORD$name description LINE...",
+	"ip prefix-list PREFIXLIST4_NAME$name description LINE...",
 	IP_STR
 	PREFIX_LIST_STR
 	PREFIX_LIST_NAME_STR
@@ -1407,31 +1334,19 @@ DEFPY_YANG(
 
 DEFPY_YANG(
 	no_ip_prefix_list_remark, no_ip_prefix_list_remark_cmd,
-	"no ip prefix-list WORD$name description",
+	"no ip prefix-list PREFIXLIST4_NAME$name description",
 	NO_STR
 	IP_STR
 	PREFIX_LIST_STR
 	PREFIX_LIST_NAME_STR
 	ACCESS_LIST_REMARK_STR)
 {
-	char xpath[XPATH_MAXLEN];
-	int rv;
-
-	snprintf(xpath, sizeof(xpath),
-		 "/frr-filter:lib/prefix-list[type='ipv4'][name='%s']/remark",
-		 name);
-	nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
-
-	rv = nb_cli_apply_changes(vty, NULL);
-	if (rv == CMD_SUCCESS)
-		return plist_remove_if_empty(vty, "ipv4", name);
-
-	return rv;
+	return filter_remove_check_empty(vty, "prefix", "ipv4", name, 0, true);
 }
 
 ALIAS(
 	no_ip_prefix_list_remark, no_ip_prefix_list_remark_line_cmd,
-	"no ip prefix-list WORD$name description LINE...",
+	"no ip prefix-list PREFIXLIST4_NAME$name description LINE...",
 	NO_STR
 	IP_STR
 	PREFIX_LIST_STR
@@ -1441,7 +1356,7 @@ ALIAS(
 
 DEFPY_YANG(
 	ipv6_prefix_list, ipv6_prefix_list_cmd,
-	"ipv6 prefix-list WORD$name [seq (1-4294967295)] <deny|permit>$action <any|X:X::X:X/M$prefix [{ge (0-128)$ge|le (0-128)$le}]>",
+	"ipv6 prefix-list PREFIXLIST6_NAME$name [seq (1-4294967295)] <deny|permit>$action <any|X:X::X:X/M$prefix [{ge (0-128)$ge|le (0-128)$le}]>",
 	IPV6_STR
 	PREFIX_LIST_STR
 	PREFIX_LIST_NAME_STR
@@ -1535,7 +1450,7 @@ DEFPY_YANG(
 
 DEFPY_YANG(
 	no_ipv6_prefix_list, no_ipv6_prefix_list_cmd,
-	"no ipv6 prefix-list WORD$name [seq (1-4294967295)$seq] <deny|permit>$action <any|X:X::X:X/M$prefix [{ge (0-128)$ge|le (0-128)$le}]>",
+	"no ipv6 prefix-list PREFIXLIST6_NAME$name [seq (1-4294967295)$seq] <deny|permit>$action <any|X:X::X:X/M$prefix [{ge (0-128)$ge|le (0-128)$le}]>",
 	NO_STR
 	IPV6_STR
 	PREFIX_LIST_STR
@@ -1549,25 +1464,25 @@ DEFPY_YANG(
 	"Minimum prefix length to be matched\n"
 	"Minimum prefix length\n")
 {
-	return plist_remove(vty, "ipv6", name, seq_str, action,
+	return plist_remove(vty, "ipv6", name, seq, action,
 			    prefix_str ? prefix : NULL, ge, le);
 }
 
 DEFPY_YANG(
 	no_ipv6_prefix_list_seq, no_ipv6_prefix_list_seq_cmd,
-	"no ipv6 prefix-list WORD$name seq (1-4294967295)$seq",
+	"no ipv6 prefix-list PREFIXLIST6_NAME$name seq (1-4294967295)$seq",
 	NO_STR
 	IPV6_STR
 	PREFIX_LIST_STR
 	PREFIX_LIST_NAME_STR
 	ACCESS_LIST_SEQ_STR)
 {
-	return plist_remove(vty, "ipv6", name, seq_str, NULL, NULL, 0, 0);
+	return plist_remove(vty, "ipv6", name, seq, NULL, NULL, 0, 0);
 }
 
 DEFPY_YANG(
 	no_ipv6_prefix_list_all, no_ipv6_prefix_list_all_cmd,
-	"no ipv6 prefix-list WORD$name",
+	"no ipv6 prefix-list PREFIXLIST6_NAME$name",
 	NO_STR
 	IPV6_STR
 	PREFIX_LIST_STR
@@ -1584,7 +1499,7 @@ DEFPY_YANG(
 
 DEFPY_YANG(
 	ipv6_prefix_list_remark, ipv6_prefix_list_remark_cmd,
-	"ipv6 prefix-list WORD$name description LINE...",
+	"ipv6 prefix-list PREFIXLIST6_NAME$name description LINE...",
 	IPV6_STR
 	PREFIX_LIST_STR
 	PREFIX_LIST_NAME_STR
@@ -1609,31 +1524,19 @@ DEFPY_YANG(
 
 DEFPY_YANG(
 	no_ipv6_prefix_list_remark, no_ipv6_prefix_list_remark_cmd,
-	"no ipv6 prefix-list WORD$name description",
+	"no ipv6 prefix-list PREFIXLIST6_NAME$name description",
 	NO_STR
 	IPV6_STR
 	PREFIX_LIST_STR
 	PREFIX_LIST_NAME_STR
 	ACCESS_LIST_REMARK_STR)
 {
-	char xpath[XPATH_MAXLEN];
-	int rv;
-
-	snprintf(xpath, sizeof(xpath),
-		 "/frr-filter:lib/prefix-list[type='ipv6'][name='%s']/remark",
-		 name);
-	nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
-
-	rv = nb_cli_apply_changes(vty, NULL);
-	if (rv == CMD_SUCCESS)
-		return plist_remove_if_empty(vty, "ipv6", name);
-
-	return rv;
+	return filter_remove_check_empty(vty, "prefix", "ipv6", name, 0, true);
 }
 
 ALIAS(
 	no_ipv6_prefix_list_remark, no_ipv6_prefix_list_remark_line_cmd,
-	"no ipv6 prefix-list WORD$name description LINE...",
+	"no ipv6 prefix-list PREFIXLIST6_NAME$name description LINE...",
 	NO_STR
 	IPV6_STR
 	PREFIX_LIST_STR
@@ -1644,8 +1547,8 @@ ALIAS(
 int prefix_list_cmp(const struct lyd_node *dnode1,
 		    const struct lyd_node *dnode2)
 {
-	uint32_t seq1 = yang_dnode_get_uint32(dnode1, "./sequence");
-	uint32_t seq2 = yang_dnode_get_uint32(dnode2, "./sequence");
+	uint32_t seq1 = yang_dnode_get_uint32(dnode1, "sequence");
+	uint32_t seq2 = yang_dnode_get_uint32(dnode2, "sequence");
 
 	return seq1 - seq2;
 }
@@ -1658,11 +1561,11 @@ void prefix_list_show(struct vty *vty, const struct lyd_node *dnode,
 	bool is_any;
 	struct prefix p;
 
-	is_any = yang_dnode_exists(dnode, "./any");
+	is_any = yang_dnode_exists(dnode, "any");
 	switch (type) {
 	case YPLT_IPV4:
 		if (!is_any)
-			yang_dnode_get_prefix(&p, dnode, "./ipv4-prefix");
+			yang_dnode_get_prefix(&p, dnode, "ipv4-prefix");
 		if (yang_dnode_exists(dnode,
 				      "./ipv4-prefix-length-greater-or-equal"))
 			ge_str = yang_dnode_get_string(
@@ -1692,8 +1595,8 @@ void prefix_list_show(struct vty *vty, const struct lyd_node *dnode,
 
 	vty_out(vty, "prefix-list %s seq %s %s",
 		yang_dnode_get_string(dnode, "../name"),
-		yang_dnode_get_string(dnode, "./sequence"),
-		yang_dnode_get_string(dnode, "./action"));
+		yang_dnode_get_string(dnode, "sequence"),
+		yang_dnode_get_string(dnode, "action"));
 
 	if (is_any) {
 		vty_out(vty, " any\n");
diff --git a/lib/filter_nb.c b/lib/filter_nb.c
index 9511b8f..39042d3 100644
--- a/lib/filter_nb.c
+++ b/lib/filter_nb.c
@@ -17,23 +17,6 @@
 #include "lib/plist_int.h"
 #include "lib/routemap.h"
 
-/* Helper function. */
-static void acl_notify_route_map(struct access_list *acl, int route_map_event)
-{
-	switch (route_map_event) {
-	case RMAP_EVENT_FILTER_ADDED:
-		if (acl->master->add_hook)
-			(*acl->master->add_hook)(acl);
-		break;
-	case RMAP_EVENT_FILTER_DELETED:
-		if (acl->master->delete_hook)
-			(*acl->master->delete_hook)(acl);
-		break;
-	}
-
-	route_map_notify_dependencies(acl->name, route_map_event);
-}
-
 static enum nb_error prefix_list_length_validate(struct nb_cb_modify_args *args)
 {
 	int type = yang_dnode_get_enum(args->dnode, "../../type");
@@ -112,7 +95,7 @@ prefix_list_nb_validate_v4_af_type(const struct lyd_node *plist_dnode,
 {
 	int af_type;
 
-	af_type = yang_dnode_get_enum(plist_dnode, "./type");
+	af_type = yang_dnode_get_enum(plist_dnode, "type");
 	if (af_type != YPLT_IPV4) {
 		snprintf(errmsg, errmsg_len,
 			 "prefix-list type %u is mismatched.", af_type);
@@ -128,7 +111,7 @@ prefix_list_nb_validate_v6_af_type(const struct lyd_node *plist_dnode,
 {
 	int af_type;
 
-	af_type = yang_dnode_get_enum(plist_dnode, "./type");
+	af_type = yang_dnode_get_enum(plist_dnode, "type");
 	if (af_type != YPLT_IPV6) {
 		snprintf(errmsg, errmsg_len,
 			 "prefix-list type %u is mismatched.", af_type);
@@ -153,9 +136,6 @@ static int lib_prefix_list_entry_prefix_length_greater_or_equal_modify(
 
 	ple->ge = yang_dnode_get_uint8(args->dnode, NULL);
 
-	/* Finish prefix entry update procedure. */
-	prefix_list_entry_update_finish(ple);
-
 	return NB_OK;
 }
 
@@ -174,9 +154,6 @@ static int lib_prefix_list_entry_prefix_length_lesser_or_equal_modify(
 
 	ple->le = yang_dnode_get_uint8(args->dnode, NULL);
 
-	/* Finish prefix entry update procedure. */
-	prefix_list_entry_update_finish(ple);
-
 	return NB_OK;
 }
 
@@ -195,9 +172,6 @@ static int lib_prefix_list_entry_prefix_length_greater_or_equal_destroy(
 
 	ple->ge = 0;
 
-	/* Finish prefix entry update procedure. */
-	prefix_list_entry_update_finish(ple);
-
 	return NB_OK;
 }
 
@@ -216,9 +190,6 @@ static int lib_prefix_list_entry_prefix_length_lesser_or_equal_destroy(
 
 	ple->le = 0;
 
-	/* Finish prefix entry update procedure. */
-	prefix_list_entry_update_finish(ple);
-
 	return NB_OK;
 }
 
@@ -381,14 +352,14 @@ static void plist_dnode_to_prefix(const struct lyd_node *dnode, bool *any,
 	*ge = 0;
 	*le = 0;
 
-	if (yang_dnode_exists(dnode, "./any")) {
+	if (yang_dnode_exists(dnode, "any")) {
 		*any = true;
 		return;
 	}
 
 	switch (yang_dnode_get_enum(dnode, "../type")) {
 	case YPLT_IPV4:
-		yang_dnode_get_prefix(p, dnode, "./ipv4-prefix");
+		yang_dnode_get_prefix(p, dnode, "ipv4-prefix");
 		if (yang_dnode_exists(dnode,
 				      "./ipv4-prefix-length-greater-or-equal"))
 			*ge = yang_dnode_get_uint8(
@@ -399,7 +370,7 @@ static void plist_dnode_to_prefix(const struct lyd_node *dnode, bool *any,
 				dnode, "./ipv4-prefix-length-lesser-or-equal");
 		break;
 	case YPLT_IPV6:
-		yang_dnode_get_prefix(p, dnode, "./ipv6-prefix");
+		yang_dnode_get_prefix(p, dnode, "ipv6-prefix");
 		if (yang_dnode_exists(dnode,
 				      "./ipv6-prefix-length-greater-or-equal"))
 			*ge = yang_dnode_get_uint8(
@@ -468,8 +439,8 @@ static int lib_access_list_create(struct nb_cb_create_args *args)
 	if (args->event != NB_EV_APPLY)
 		return NB_OK;
 
-	type = yang_dnode_get_enum(args->dnode, "./type");
-	acl_name = yang_dnode_get_string(args->dnode, "./name");
+	type = yang_dnode_get_enum(args->dnode, "type");
+	acl_name = yang_dnode_get_string(args->dnode, "name");
 
 	switch (type) {
 	case YALT_IPV4:
@@ -550,7 +521,7 @@ static int lib_access_list_entry_create(struct nb_cb_create_args *args)
 		return NB_OK;
 
 	f = filter_new();
-	f->seq = yang_dnode_get_uint32(args->dnode, "./sequence");
+	f->seq = yang_dnode_get_uint32(args->dnode, "sequence");
 
 	acl = nb_running_get_entry(args->dnode, NULL, true);
 	f->acl = acl;
@@ -575,6 +546,15 @@ static int lib_access_list_entry_destroy(struct nb_cb_destroy_args *args)
 	return NB_OK;
 }
 
+static void
+lib_access_list_entry_apply_finish(struct nb_cb_apply_finish_args *args)
+{
+	struct filter *f;
+
+	f = nb_running_get_entry(args->dnode, NULL, true);
+	access_list_filter_update(f->acl);
+}
+
 /*
  * XPath: /frr-filter:lib/access-list/entry/action
  */
@@ -594,8 +574,6 @@ lib_access_list_entry_action_modify(struct nb_cb_modify_args *args)
 	else
 		f->type = FILTER_DENY;
 
-	acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);
-
 	return NB_OK;
 }
 
@@ -629,8 +607,6 @@ lib_access_list_entry_ipv4_prefix_modify(struct nb_cb_modify_args *args)
 	fz = &f->u.zfilter;
 	yang_dnode_get_prefix(&fz->prefix, args->dnode, NULL);
 
-	acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);
-
 	return NB_OK;
 }
 
@@ -647,8 +623,6 @@ lib_access_list_entry_ipv4_prefix_destroy(struct nb_cb_destroy_args *args)
 	fz = &f->u.zfilter;
 	memset(&fz->prefix, 0, sizeof(fz->prefix));
 
-	acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_DELETED);
-
 	return NB_OK;
 }
 
@@ -681,8 +655,6 @@ lib_access_list_entry_ipv4_exact_match_modify(struct nb_cb_modify_args *args)
 	fz = &f->u.zfilter;
 	fz->exact = yang_dnode_get_bool(args->dnode, NULL);
 
-	acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);
-
 	return NB_OK;
 }
 
@@ -699,8 +671,6 @@ lib_access_list_entry_ipv4_exact_match_destroy(struct nb_cb_destroy_args *args)
 	fz = &f->u.zfilter;
 	fz->exact = 0;
 
-	acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_DELETED);
-
 	return NB_OK;
 }
 
@@ -733,8 +703,6 @@ lib_access_list_entry_host_modify(struct nb_cb_modify_args *args)
 	yang_dnode_get_ipv4(&fc->addr, args->dnode, NULL);
 	fc->addr_mask.s_addr = CISCO_BIN_HOST_WILDCARD_MASK;
 
-	acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);
-
 	return NB_OK;
 }
 
@@ -751,7 +719,29 @@ lib_access_list_entry_host_destroy(struct nb_cb_destroy_args *args)
 	fc = &f->u.cfilter;
 	cisco_unset_addr_mask(&fc->addr, &fc->addr_mask);
 
-	acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_DELETED);
+	return NB_OK;
+}
+
+/*
+ * XPath: /frr-filter:lib/access-list/entry/network
+ */
+static int lib_access_list_entry_network_create(struct nb_cb_create_args *args)
+{
+	/* Nothing to do here, everything is done in children callbacks */
+	return NB_OK;
+}
+
+static int lib_access_list_entry_network_destroy(struct nb_cb_destroy_args *args)
+{
+	struct filter_cisco *fc;
+	struct filter *f;
+
+	if (args->event != NB_EV_APPLY)
+		return NB_OK;
+
+	f = nb_running_get_entry(args->dnode, NULL, true);
+	fc = &f->u.cfilter;
+	cisco_unset_addr_mask(&fc->addr, &fc->addr_mask);
 
 	return NB_OK;
 }
@@ -784,8 +774,6 @@ lib_access_list_entry_network_address_modify(struct nb_cb_modify_args *args)
 	fc = &f->u.cfilter;
 	yang_dnode_get_ipv4(&fc->addr, args->dnode, NULL);
 
-	acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);
-
 	return NB_OK;
 }
 
@@ -817,8 +805,6 @@ lib_access_list_entry_network_mask_modify(struct nb_cb_modify_args *args)
 	fc = &f->u.cfilter;
 	yang_dnode_get_ipv4(&fc->addr_mask, args->dnode, NULL);
 
-	acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);
-
 	return NB_OK;
 }
 
@@ -851,8 +837,6 @@ lib_access_list_entry_source_any_create(struct nb_cb_create_args *args)
 	fc->addr.s_addr = INADDR_ANY;
 	fc->addr_mask.s_addr = CISCO_BIN_ANY_WILDCARD_MASK;
 
-	acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);
-
 	return NB_OK;
 }
 
@@ -869,8 +853,6 @@ lib_access_list_entry_source_any_destroy(struct nb_cb_destroy_args *args)
 	fc = &f->u.cfilter;
 	cisco_unset_addr_mask(&fc->addr, &fc->addr_mask);
 
-	acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_DELETED);
-
 	return NB_OK;
 }
 
@@ -903,8 +885,6 @@ static int lib_access_list_entry_destination_host_modify(
 	yang_dnode_get_ipv4(&fc->mask, args->dnode, NULL);
 	fc->mask_mask.s_addr = CISCO_BIN_HOST_WILDCARD_MASK;
 
-	acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);
-
 	return NB_OK;
 }
 
@@ -922,7 +902,32 @@ static int lib_access_list_entry_destination_host_destroy(
 	fc->extended = 0;
 	cisco_unset_addr_mask(&fc->mask, &fc->mask_mask);
 
-	acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_DELETED);
+	return NB_OK;
+}
+
+/*
+ * XPath: /frr-filter:lib/access-list/entry/destination-network
+ */
+static int
+lib_access_list_entry_destination_network_create(struct nb_cb_create_args *args)
+{
+	/* Nothing to do here, everything is done in children callbacks */
+	return NB_OK;
+}
+
+static int lib_access_list_entry_destination_network_destroy(
+	struct nb_cb_destroy_args *args)
+{
+	struct filter_cisco *fc;
+	struct filter *f;
+
+	if (args->event != NB_EV_APPLY)
+		return NB_OK;
+
+	f = nb_running_get_entry(args->dnode, NULL, true);
+	fc = &f->u.cfilter;
+	fc->extended = 0;
+	cisco_unset_addr_mask(&fc->mask, &fc->mask_mask);
 
 	return NB_OK;
 }
@@ -955,8 +960,6 @@ static int lib_access_list_entry_destination_network_address_modify(
 	fc->extended = 1;
 	yang_dnode_get_ipv4(&fc->mask, args->dnode, NULL);
 
-	acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);
-
 	return NB_OK;
 }
 
@@ -988,8 +991,6 @@ static int lib_access_list_entry_destination_network_mask_modify(
 	fc->extended = 1;
 	yang_dnode_get_ipv4(&fc->mask_mask, args->dnode, NULL);
 
-	acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);
-
 	return NB_OK;
 }
 
@@ -1022,8 +1023,6 @@ static int lib_access_list_entry_destination_any_create(
 	fc->mask.s_addr = INADDR_ANY;
 	fc->mask_mask.s_addr = CISCO_BIN_ANY_WILDCARD_MASK;
 
-	acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);
-
 	return NB_OK;
 }
 
@@ -1041,8 +1040,6 @@ static int lib_access_list_entry_destination_any_destroy(
 	fc->extended = 0;
 	cisco_unset_addr_mask(&fc->mask, &fc->mask_mask);
 
-	acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_DELETED);
-
 	return NB_OK;
 }
 
@@ -1089,8 +1086,6 @@ static int lib_access_list_entry_any_create(struct nb_cb_create_args *args)
 		break;
 	}
 
-	acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);
-
 	return NB_OK;
 }
 
@@ -1106,8 +1101,6 @@ static int lib_access_list_entry_any_destroy(struct nb_cb_destroy_args *args)
 	fz = &f->u.zfilter;
 	fz->prefix.family = AF_UNSPEC;
 
-	acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_DELETED);
-
 	return NB_OK;
 }
 
@@ -1123,8 +1116,8 @@ static int lib_prefix_list_create(struct nb_cb_create_args *args)
 	if (args->event != NB_EV_APPLY)
 		return NB_OK;
 
-	type = yang_dnode_get_enum(args->dnode, "./type");
-	name = yang_dnode_get_string(args->dnode, "./name");
+	type = yang_dnode_get_enum(args->dnode, "type");
+	name = yang_dnode_get_string(args->dnode, "name");
 	switch (type) {
 	case 0: /* ipv4 */
 		pl = prefix_list_get(AFI_IP, 0, name);
@@ -1201,7 +1194,7 @@ static int lib_prefix_list_entry_create(struct nb_cb_create_args *args)
 	pl = nb_running_get_entry(args->dnode, NULL, true);
 	ple = prefix_list_entry_new();
 	ple->pl = pl;
-	ple->seq = yang_dnode_get_uint32(args->dnode, "./sequence");
+	ple->seq = yang_dnode_get_uint32(args->dnode, "sequence");
 	prefix_list_entry_set_empty(ple);
 	nb_running_set_entry(args->dnode, ple);
 
@@ -1224,6 +1217,22 @@ static int lib_prefix_list_entry_destroy(struct nb_cb_destroy_args *args)
 	return NB_OK;
 }
 
+static void
+lib_prefix_list_entry_apply_finish(struct nb_cb_apply_finish_args *args)
+{
+	struct prefix_list_entry *ple;
+
+	ple = nb_running_get_entry(args->dnode, NULL, true);
+
+	/*
+	 * Finish prefix entry update procedure. The procedure is started in
+	 * children callbacks. `prefix_list_entry_update_start` can be called
+	 * multiple times if multiple children are modified, but it is actually
+	 * executed only once because of the protection by `ple->installed`.
+	 */
+	prefix_list_entry_update_finish(ple);
+}
+
 /*
  * XPath: /frr-filter:lib/prefix-list/entry/action
  */
@@ -1246,9 +1255,6 @@ static int lib_prefix_list_entry_action_modify(struct nb_cb_modify_args *args)
 	else
 		ple->type = PREFIX_DENY;
 
-	/* Finish prefix entry update procedure. */
-	prefix_list_entry_update_finish(ple);
-
 	return NB_OK;
 }
 
@@ -1276,10 +1282,6 @@ static int lib_prefix_list_entry_prefix_modify(struct nb_cb_modify_args *args)
 		prefix_copy(&ple->prefix, &p);
 	}
 
-
-	/* Finish prefix entry update procedure. */
-	prefix_list_entry_update_finish(ple);
-
 	return NB_OK;
 }
 
@@ -1297,9 +1299,6 @@ static int lib_prefix_list_entry_prefix_destroy(struct nb_cb_destroy_args *args)
 
 	memset(&ple->prefix, 0, sizeof(ple->prefix));
 
-	/* Finish prefix entry update procedure. */
-	prefix_list_entry_update_finish(ple);
-
 	return NB_OK;
 }
 
@@ -1547,9 +1546,6 @@ static int lib_prefix_list_entry_any_create(struct nb_cb_create_args *args)
 		break;
 	}
 
-	/* Finish prefix entry update procedure. */
-	prefix_list_entry_update_finish(ple);
-
 	return NB_OK;
 }
 
@@ -1567,9 +1563,6 @@ static int lib_prefix_list_entry_any_destroy(struct nb_cb_destroy_args *args)
 
 	ple->any = false;
 
-	/* Finish prefix entry update procedure. */
-	prefix_list_entry_update_finish(ple);
-
 	return NB_OK;
 }
 
@@ -1597,6 +1590,7 @@ const struct frr_yang_module_info frr_filter_info = {
 			.cbs = {
 				.create = lib_access_list_entry_create,
 				.destroy = lib_access_list_entry_destroy,
+				.apply_finish = lib_access_list_entry_apply_finish,
 				.cli_cmp = access_list_cmp,
 				.cli_show = access_list_show,
 			}
@@ -1629,6 +1623,13 @@ const struct frr_yang_module_info frr_filter_info = {
 			}
 		},
 		{
+			.xpath = "/frr-filter:lib/access-list/entry/network",
+			.cbs = {
+				.create = lib_access_list_entry_network_create,
+				.destroy = lib_access_list_entry_network_destroy,
+			}
+		},
+		{
 			.xpath = "/frr-filter:lib/access-list/entry/network/address",
 			.cbs = {
 				.modify = lib_access_list_entry_network_address_modify,
@@ -1655,6 +1656,13 @@ const struct frr_yang_module_info frr_filter_info = {
 			}
 		},
 		{
+			.xpath = "/frr-filter:lib/access-list/entry/destination-network",
+			.cbs = {
+				.create = lib_access_list_entry_destination_network_create,
+				.destroy = lib_access_list_entry_destination_network_destroy,
+			}
+		},
+		{
 			.xpath = "/frr-filter:lib/access-list/entry/destination-network/address",
 			.cbs = {
 				.modify = lib_access_list_entry_destination_network_address_modify,
@@ -1721,6 +1729,7 @@ const struct frr_yang_module_info frr_filter_info = {
 			.cbs = {
 				.create = lib_prefix_list_entry_create,
 				.destroy = lib_prefix_list_entry_destroy,
+				.apply_finish = lib_prefix_list_entry_apply_finish,
 				.cli_cmp = prefix_list_cmp,
 				.cli_show = prefix_list_show,
 			}
@@ -1785,3 +1794,35 @@ const struct frr_yang_module_info frr_filter_info = {
 		},
 	}
 };
+
+const struct frr_yang_module_info frr_filter_cli_info = {
+	.name = "frr-filter",
+	.ignore_cfg_cbs = true,
+	.nodes = {
+		{
+			.xpath = "/frr-filter:lib/access-list/remark",
+			.cbs.cli_show = access_list_remark_show,
+		},
+		{
+			.xpath = "/frr-filter:lib/access-list/entry",
+			.cbs = {
+				.cli_cmp = access_list_cmp,
+				.cli_show = access_list_show,
+			}
+		},
+		{
+			.xpath = "/frr-filter:lib/prefix-list/remark",
+			.cbs.cli_show = prefix_list_remark_show,
+		},
+		{
+			.xpath = "/frr-filter:lib/prefix-list/entry",
+			.cbs = {
+				.cli_cmp = prefix_list_cmp,
+				.cli_show = prefix_list_show,
+			}
+		},
+		{
+			.xpath = NULL,
+		},
+	}
+};
diff --git a/lib/frr_pthread.c b/lib/frr_pthread.c
index c4ead01..1ffa593 100644
--- a/lib/frr_pthread.c
+++ b/lib/frr_pthread.c
@@ -5,6 +5,9 @@
  */
 
 #include <zebra.h>
+
+#include <signal.h>
+
 #include <pthread.h>
 #ifdef HAVE_PTHREAD_NP_H
 #include <pthread_np.h>
@@ -217,6 +220,41 @@ void frr_pthread_stop_all(void)
 	}
 }
 
+static void *frr_pthread_attr_non_controlled_start(void *arg)
+{
+	struct frr_pthread *fpt = arg;
+
+	fpt->running = true;
+
+	return NULL;
+}
+
+/* Create a FRR pthread context from a non FRR pthread initialized from an
+ * external library in order to allow logging */
+int frr_pthread_non_controlled_startup(pthread_t thread, const char *name,
+				       const char *os_name)
+{
+	struct rcu_thread *rcu_thread = rcu_thread_new(NULL);
+
+	rcu_thread_start(rcu_thread);
+
+	struct frr_pthread_attr attr = {
+		.start = frr_pthread_attr_non_controlled_start,
+		.stop = frr_pthread_attr_default.stop,
+	};
+	struct frr_pthread *fpt;
+
+	fpt = frr_pthread_new(&attr, name, os_name);
+	if (!fpt)
+		return -1;
+
+	fpt->thread = thread;
+	fpt->rcu_thread = rcu_thread;
+	frr_pthread_inner(fpt);
+
+	return 0;
+}
+
 /*
  * ----------------------------------------------------------------------------
  * Default Event Loop
diff --git a/lib/frr_pthread.h b/lib/frr_pthread.h
index f91044d..1e1b8d7 100644
--- a/lib/frr_pthread.h
+++ b/lib/frr_pthread.h
@@ -202,6 +202,9 @@ void frr_pthread_stop_all(void);
 #define pthread_condattr_setclock(A, B)
 #endif
 
+int frr_pthread_non_controlled_startup(pthread_t thread, const char *name,
+				       const char *os_name);
+
 /* mutex auto-lock/unlock */
 
 /* variant 1:
diff --git a/lib/frrcu.c b/lib/frrcu.c
index c7cc655..b85c525 100644
--- a/lib/frrcu.c
+++ b/lib/frrcu.c
@@ -149,20 +149,9 @@ static struct rcu_thread *rcu_self(void)
 	return (struct rcu_thread *)pthread_getspecific(rcu_thread_key);
 }
 
-/*
- * thread management (for the non-main thread)
- */
-struct rcu_thread *rcu_thread_prepare(void)
+struct rcu_thread *rcu_thread_new(void *arg)
 {
-	struct rcu_thread *rt, *cur;
-
-	rcu_assert_read_locked();
-
-	if (!rcu_active)
-		rcu_start();
-
-	cur = rcu_self();
-	assert(cur->depth);
+	struct rcu_thread *rt, *cur = arg;
 
 	/* new thread always starts with rcu_read_lock held at depth 1, and
 	 * holding the same epoch as the parent (this makes it possible to
@@ -172,13 +161,32 @@ struct rcu_thread *rcu_thread_prepare(void)
 	rt->depth = 1;
 
 	seqlock_init(&rt->rcu);
-	seqlock_acquire(&rt->rcu, &cur->rcu);
+	if (cur)
+		seqlock_acquire(&rt->rcu, &cur->rcu);
 
 	rcu_threads_add_tail(&rcu_threads, rt);
 
 	return rt;
 }
 
+/*
+ * thread management (for the non-main thread)
+ */
+struct rcu_thread *rcu_thread_prepare(void)
+{
+	struct rcu_thread *cur;
+
+	rcu_assert_read_locked();
+
+	if (!rcu_active)
+		rcu_start();
+
+	cur = rcu_self();
+	assert(cur->depth);
+
+	return rcu_thread_new(cur);
+}
+
 void rcu_thread_start(struct rcu_thread *rt)
 {
 	pthread_setspecific(rcu_thread_key, rt);
diff --git a/lib/frrcu.h b/lib/frrcu.h
index e7a54dc..9f07a69 100644
--- a/lib/frrcu.h
+++ b/lib/frrcu.h
@@ -40,6 +40,12 @@ extern "C" {
 /* opaque */
 struct rcu_thread;
 
+/* sets up rcu thread info
+ *
+ * return value must be passed into the thread's call to rcu_thread_start()
+ */
+extern struct rcu_thread *rcu_thread_new(void *arg);
+
 /* called before new thread creation, sets up rcu thread info for new thread
  * before it actually exits.  This ensures possible RCU references are held
  * for thread startup.
diff --git a/lib/frrdistance.h b/lib/frrdistance.h
new file mode 100644
index 0000000..d2fa76e
--- /dev/null
+++ b/lib/frrdistance.h
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Zebra distance header
+ * Copyright (C) 2023 NVIDIA Corporation
+ * Donald Sharp
+ *
+ * Distance related defines.  FRR needs a common set
+ * of values for distance.
+ */
+#ifndef __FRRDISTANCE_H__
+#define __FRRDISTANCE_H__
+
+/* Default Administrative Distance of each protocol. */
+#define ZEBRA_KERNEL_DISTANCE_DEFAULT       0
+#define ZEBRA_CONNECT_DISTANCE_DEFAULT      0
+#define ZEBRA_STATIC_DISTANCE_DEFAULT       1
+#define ZEBRA_RIP_DISTANCE_DEFAULT        120
+#define ZEBRA_RIPNG_DISTANCE_DEFAULT      120
+#define ZEBRA_OSPF_DISTANCE_DEFAULT       110
+#define ZEBRA_OSPF6_DISTANCE_DEFAULT      110
+#define ZEBRA_ISIS_DISTANCE_DEFAULT       115
+#define ZEBRA_IBGP_DISTANCE_DEFAULT       200
+#define ZEBRA_EBGP_DISTANCE_DEFAULT        20
+#define ZEBRA_TABLE_DISTANCE_DEFAULT       15
+#define ZEBRA_TABLEDIRECT_DISTANCE_DEFAULT 14
+#define ZEBRA_EIGRP_DISTANCE_DEFAULT       90
+#define ZEBRA_NHRP_DISTANCE_DEFAULT        10
+#define ZEBRA_LDP_DISTANCE_DEFAULT        150
+#define ZEBRA_BABEL_DISTANCE_DEFAULT      100
+#define ZEBRA_SHARP_DISTANCE_DEFAULT      150
+#define ZEBRA_PBR_DISTANCE_DEFAULT        200
+#define ZEBRA_OPENFABRIC_DISTANCE_DEFAULT 115
+#define ZEBRA_MAX_DISTANCE_DEFAULT        255
+
+#endif
diff --git a/lib/frrevent.h b/lib/frrevent.h
index 3f74df3..94640a7 100644
--- a/lib/frrevent.h
+++ b/lib/frrevent.h
@@ -6,6 +6,7 @@
 #ifndef _ZEBRA_THREAD_H
 #define _ZEBRA_THREAD_H
 
+#include <signal.h>
 #include <zebra.h>
 #include <pthread.h>
 #include <poll.h>
@@ -91,6 +92,8 @@ struct event_loop {
 	pthread_mutex_t mtx;
 	pthread_t owner;
 
+	nfds_t last_read;
+
 	bool ready_run_loop;
 	RUSAGE_T last_getrusage;
 };
@@ -153,6 +156,12 @@ struct cpu_event_history {
 /* Struct timeval's tv_usec one second value.  */
 #define TIMER_SECOND_MICRO 1000000L
 
+static inline unsigned long timeval_elapsed(struct timeval a, struct timeval b)
+{
+	return (((a.tv_sec - b.tv_sec) * TIMER_SECOND_MICRO)
+		+ (a.tv_usec - b.tv_usec));
+}
+
 /* Event yield time.  */
 #define EVENT_YIELD_TIME_SLOT 10 * 1000L /* 10ms */
 
diff --git a/lib/frrlua.c b/lib/frrlua.c
index e626efe..2cab1a5 100644
--- a/lib/frrlua.c
+++ b/lib/frrlua.c
@@ -259,12 +259,12 @@ void *lua_tosockunion(lua_State *L, int idx)
 	return su;
 }
 
-void lua_pushintegerp(lua_State *L, const long long *num)
+void lua_pushintegerp(lua_State *L, const int *num)
 {
 	lua_pushinteger(L, *num);
 }
 
-void lua_decode_integerp(lua_State *L, int idx, long long *num)
+void lua_decode_integerp(lua_State *L, int idx, int *num)
 {
 	int isnum;
 	*num = lua_tonumberx(L, idx, &isnum);
@@ -274,7 +274,7 @@ void lua_decode_integerp(lua_State *L, int idx, long long *num)
 
 void *lua_tointegerp(lua_State *L, int idx)
 {
-	long long *num = XCALLOC(MTYPE_SCRIPT_RES, sizeof(long long));
+	int *num = XCALLOC(MTYPE_SCRIPT_RES, sizeof(int));
 
 	lua_decode_integerp(L, idx, num);
 	return num;
@@ -332,32 +332,39 @@ void lua_pushnexthop_group(lua_State *L, const struct nexthop_group *ng)
 	}
 }
 
-void lua_decode_stringp(lua_State *L, int idx, char *str)
+void lua_pushlonglongp(lua_State *L, const long long *num)
 {
-	strlcpy(str, lua_tostring(L, idx), strlen(str) + 1);
+	/* lua library function; this can take a long long */
+	lua_pushinteger(L, *num);
+}
+
+void lua_decode_longlongp(lua_State *L, int idx, long long *num)
+{
+	int isnum;
+	*num = lua_tonumberx(L, idx, &isnum);
 	lua_pop(L, 1);
+	assert(isnum);
 }
 
-void *lua_tostringp(lua_State *L, int idx)
+void *lua_tolonglongp(lua_State *L, int idx)
 {
-	char *string = XSTRDUP(MTYPE_SCRIPT_RES, lua_tostring(L, idx));
+	long long *num = XCALLOC(MTYPE_SCRIPT_RES, sizeof(long long));
 
-	return string;
+	lua_decode_longlongp(L, idx, num);
+	return num;
 }
 
-/*
- * Decoder for const values, since we cannot modify them.
- */
-void lua_decode_noop(lua_State *L, int idx, const void *ptr)
+void lua_decode_stringp(lua_State *L, int idx, char *str)
 {
+	strlcpy(str, lua_tostring(L, idx), strlen(str) + 1);
+	lua_pop(L, 1);
 }
 
-
-/*
- * Noop decoder for int.
- */
-void lua_decode_integer_noop(lua_State *L, int idx, int i)
+void *lua_tostringp(lua_State *L, int idx)
 {
+	char *string = XSTRDUP(MTYPE_SCRIPT_RES, lua_tostring(L, idx));
+
+	return string;
 }
 
 /*
diff --git a/lib/frrlua.h b/lib/frrlua.h
index d248312..dc0f4d9 100644
--- a/lib/frrlua.h
+++ b/lib/frrlua.h
@@ -121,9 +121,9 @@ void lua_pushnexthop(lua_State *L, const struct nexthop *nexthop);
 /*
  * Converts an int to a Lua value and pushes it on the stack.
  */
-void lua_pushintegerp(lua_State *L, const long long *num);
+void lua_pushintegerp(lua_State *L, const int *num);
 
-void lua_decode_integerp(lua_State *L, int idx, long long *num);
+void lua_decode_integerp(lua_State *L, int idx, int *num);
 
 /*
  * Converts the Lua value at idx to an int.
@@ -133,6 +133,21 @@ void lua_decode_integerp(lua_State *L, int idx, long long *num);
  */
 void *lua_tointegerp(lua_State *L, int idx);
 
+/*
+ * Converts a long long to a Lua value and pushes it on the stack.
+ */
+void lua_pushlonglongp(lua_State *L, const long long *num);
+
+void lua_decode_longlongp(lua_State *L, int idx, long long *num);
+
+/*
+ * Converts the Lua value at idx to a long long.
+ *
+ * Returns:
+ *    long long allocated with MTYPE_TMP.
+ */
+void *lua_tolonglongp(lua_State *L, int idx);
+
 void lua_decode_stringp(lua_State *L, int idx, char *str);
 
 /*
@@ -144,13 +159,6 @@ void lua_decode_stringp(lua_State *L, int idx, char *str);
 void *lua_tostringp(lua_State *L, int idx);
 
 /*
- * No-op decoders
- */
-void lua_decode_noop(lua_State *L, int idx, const void *ptr);
-
-void lua_decode_integer_noop(lua_State *L, int idx, int i);
-
-/*
  * Retrieve an integer from table on the top of the stack.
  *
  * key
diff --git a/lib/frrscript.c b/lib/frrscript.c
index 50410fb..acdd1df 100644
--- a/lib/frrscript.c
+++ b/lib/frrscript.c
@@ -25,6 +25,8 @@ DEFINE_MTYPE_STATIC(LIB, SCRIPT, "Scripting");
 
 struct frrscript_names_head frrscript_names_hash;
 
+void _lua_decode_noop(lua_State *L, ...) {}
+
 /*
  * Wrapper for frrscript_names_add
  * Use this to register hook calls when a daemon starts up
diff --git a/lib/frrscript.h b/lib/frrscript.h
index df49b57..ce313a1 100644
--- a/lib/frrscript.h
+++ b/lib/frrscript.h
@@ -181,6 +181,11 @@ void frrscript_fini(void);
 	} while (0)
 
 /*
+ * Noop function. Used below where we need a noop decoder for any type.
+ */
+void _lua_decode_noop(lua_State *, ...);
+
+/*
  * Maps the type of value to its encoder/decoder.
  * Add new mappings here.
  *
@@ -192,7 +197,9 @@ void frrscript_fini(void);
 #define ENCODE_ARGS_WITH_STATE(L, value)                                       \
 	_Generic((value), \
 int : lua_pushinteger,                                          \
-long long * : lua_pushintegerp,                                 \
+int * : lua_pushintegerp,                                       \
+long long : lua_pushinteger,                                    \
+long long * : lua_pushlonglongp,                                \
 struct prefix * : lua_pushprefix,                               \
 struct interface * : lua_pushinterface,                         \
 struct in_addr * : lua_pushinaddr,                              \
@@ -211,8 +218,8 @@ struct zebra_dplane_ctx * : lua_pushzebra_dplane_ctx            \
 
 #define DECODE_ARGS_WITH_STATE(L, value)                                       \
 	_Generic((value), \
-int : lua_decode_integer_noop,                                  \
-long long * : lua_decode_integerp,                              \
+int * : lua_decode_integerp,                                    \
+long long * : lua_decode_longlongp,                             \
 struct prefix * : lua_decode_prefix,                            \
 struct interface * : lua_decode_interface,                      \
 struct in_addr * : lua_decode_inaddr,                           \
@@ -220,13 +227,7 @@ struct in6_addr * : lua_decode_in6addr,                         \
 union sockunion * : lua_decode_sockunion,                       \
 char * : lua_decode_stringp,                                    \
 struct attr * : lua_decode_attr,                                \
-struct peer * : lua_decode_noop,                                \
-const struct prefix * : lua_decode_noop,                        \
-const struct ipaddr * : lua_decode_noop,                        \
-const struct ethaddr * : lua_decode_noop,                       \
-const struct nexthop_group * : lua_decode_noop,                 \
-const struct nexthop * : lua_decode_noop,                       \
-struct zebra_dplane_ctx * : lua_decode_noop                     \
+default : _lua_decode_noop                                      \
 )((L), -1, (value))
 
 /*
diff --git a/lib/frrsendmmsg.h b/lib/frrsendmmsg.h
new file mode 100644
index 0000000..ea63d13
--- /dev/null
+++ b/lib/frrsendmmsg.h
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * FRR sendmmsg wrapper
+ * Copyright (C) 2024 by Nvidia, Inc.
+ *                       Donald Sharp
+ */
+#ifndef __FRRSENDMMSG_H__
+#define __FRRSENDMMSG_H__
+
+#if !defined(HAVE_STRUCT_MMSGHDR_MSG_HDR) || !defined(HAVE_SENDMMSG)
+/* avoid conflicts in case we have partial support */
+#define mmsghdr	 frr_mmsghdr
+#define sendmmsg frr_sendmmsg
+
+struct mmsghdr {
+	struct msghdr msg_hdr;
+	unsigned int msg_len;
+};
+
+/* just go 1 at a time here, the loop this is used in will handle the rest */
+static inline int sendmmsg(int fd, struct mmsghdr *mmh, unsigned int len,
+			   int flags)
+{
+	int rv = sendmsg(fd, &mmh->msg_hdr, 0);
+
+	return rv > 0 ? 1 : rv;
+}
+#endif
+
+#endif
diff --git a/lib/frrstr.c b/lib/frrstr.c
index e5440c5..1e743d4 100644
--- a/lib/frrstr.c
+++ b/lib/frrstr.c
@@ -3,6 +3,7 @@
  * FRR string processing utilities.
  * Copyright (C) 2018  Cumulus Networks, Inc.
  *                     Quentin Young
+ * Copyright (c) 2023, LabN Consulting, L.L.C.
  */
 
 #include "zebra.h"
@@ -225,3 +226,47 @@ char *frrstr_hex(char *buff, size_t bufsiz, const uint8_t *str, size_t num)
 
 	return buff;
 }
+
+const char *frrstr_skip_over_char(const char *s, int skipc)
+{
+	int c, quote = 0;
+
+	while ((c = *s++)) {
+		if (c == '\\') {
+			if (!*s++)
+				return NULL;
+			continue;
+		}
+		if (quote) {
+			if (c == quote)
+				quote = 0;
+			continue;
+		}
+		if (c == skipc)
+			return s;
+		if (c == '"' || c == '\'')
+			quote = c;
+	}
+	return NULL;
+}
+
+/*
+ * Advance backward in string until reaching the char `toc`
+ * if beginning of string is reached w/o finding char return NULL
+ *
+ * /foo/bar'baz/booz'/foo
+ */
+const char *frrstr_back_to_char(const char *s, int toc)
+{
+	const char *next = s;
+	const char *prev = NULL;
+
+	if (s[0] == 0)
+		return NULL;
+	if (!strpbrk(s, "'\"\\"))
+		return strrchr(s, toc);
+	while ((next = frrstr_skip_over_char(next, toc)))
+		prev = next - 1;
+	return prev;
+}
+
diff --git a/lib/frrstr.h b/lib/frrstr.h
index 19ba09e..33a4992 100644
--- a/lib/frrstr.h
+++ b/lib/frrstr.h
@@ -3,6 +3,7 @@
  * FRR string processing utilities.
  * Copyright (C) 2018  Cumulus Networks, Inc.
  *                     Quentin Young
+ * Copyright (c) 2023, LabN Consulting, L.L.C.
  */
 
 #ifndef _FRRSTR_H_
@@ -166,6 +167,19 @@ int all_digit(const char *str);
  */
 char *frrstr_hex(char *buff, size_t bufsiz, const uint8_t *str, size_t num);
 
+/*
+ * Advance past a given char `skipc` in a string, while honoring quoting and
+ * backslash escapes (i.e., ignore `skipc` which occur in quoted sections).
+ */
+const char *frrstr_skip_over_char(const char *s, int skipc);
+
+/*
+ * Advance back from end to a given char `toc` in a string, while honoring
+ * quoting and backslash escapes. `toc` chars inside quote or escaped are
+ * ignored.
+ */
+const char *frrstr_back_to_char(const char *s, int toc);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/hash.h b/lib/hash.h
index 810faf9..2d00a33 100644
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -28,12 +28,12 @@ struct hash_bucket {
 	 */
 	int len;
 
-	/* Linked list.  */
-	struct hash_bucket *next;
-
 	/* Hash key. */
 	unsigned int key;
 
+	/* Linked list.  */
+	struct hash_bucket *next;
+
 	/* Data.  */
 	void *data;
 };
diff --git a/lib/hook.h b/lib/hook.h
index 19e0f1f..58aa200 100644
--- a/lib/hook.h
+++ b/lib/hook.h
@@ -163,6 +163,8 @@ extern void _hook_unregister(struct hook *hook, void *funcptr, void *arg,
 	_hook_unregister(&_hook_##hookname,                                    \
 			 _hook_typecheck_arg_##hookname(func), arg, true)
 
+#define hook_have_hooks(hookname) (_hook_##hookname.entries != NULL)
+
 /* invoke hooks
  * this is private (static) to the file that has the DEFINE_HOOK statement
  */
diff --git a/lib/if.c b/lib/if.c
index 48c01af..a8ceac7 100644
--- a/lib/if.c
+++ b/lib/if.c
@@ -42,15 +42,14 @@ RB_GENERATE(if_index_head, interface, index_entry, if_cmp_index_func);
 
 DEFINE_QOBJ_TYPE(interface);
 
-DEFINE_HOOK(if_add, (struct interface * ifp), (ifp));
-DEFINE_KOOH(if_del, (struct interface * ifp), (ifp));
+DEFINE_HOOK(if_add, (struct interface *ifp), (ifp));
+DEFINE_KOOH(if_del, (struct interface *ifp), (ifp));
 
-static struct interface_master{
-	int (*create_hook)(struct interface *ifp);
-	int (*up_hook)(struct interface *ifp);
-	int (*down_hook)(struct interface *ifp);
-	int (*destroy_hook)(struct interface *ifp);
-} ifp_master = { 0, };
+DEFINE_HOOK(if_real, (struct interface *ifp), (ifp));
+DEFINE_KOOH(if_unreal, (struct interface *ifp), (ifp));
+
+DEFINE_HOOK(if_up, (struct interface *ifp), (ifp));
+DEFINE_KOOH(if_down, (struct interface *ifp), (ifp));
 
 /* Compare interface names, returning an integer greater than, equal to, or
  * less than 0, (following the strcmp convention), according to the
@@ -165,8 +164,7 @@ static struct interface *if_new(struct vrf *vrf)
 
 	ifp->vrf = vrf;
 
-	ifp->connected = list_new();
-	ifp->connected->del = ifp_connected_free;
+	if_connected_init(ifp->connected);
 
 	ifp->nbr_connected = list_new();
 	ifp->nbr_connected->del = (void (*)(void *))nbr_connected_free;
@@ -180,14 +178,12 @@ static struct interface *if_new(struct vrf *vrf)
 
 void if_new_via_zapi(struct interface *ifp)
 {
-	if (ifp_master.create_hook)
-		(*ifp_master.create_hook)(ifp);
+	hook_call(if_real, ifp);
 }
 
 void if_destroy_via_zapi(struct interface *ifp)
 {
-	if (ifp_master.destroy_hook)
-		(*ifp_master.destroy_hook)(ifp);
+	hook_call(if_unreal, ifp);
 
 	ifp->oldifindex = ifp->ifindex;
 	if_set_index(ifp, IFINDEX_INTERNAL);
@@ -198,14 +194,12 @@ void if_destroy_via_zapi(struct interface *ifp)
 
 void if_up_via_zapi(struct interface *ifp)
 {
-	if (ifp_master.up_hook)
-		(*ifp_master.up_hook)(ifp);
+	hook_call(if_up, ifp);
 }
 
 void if_down_via_zapi(struct interface *ifp)
 {
-	if (ifp_master.down_hook)
-		(*ifp_master.down_hook)(ifp);
+	hook_call(if_down, ifp);
 }
 
 static struct interface *if_create_name(const char *name, struct vrf *vrf)
@@ -248,11 +242,14 @@ void if_update_to_new_vrf(struct interface *ifp, vrf_id_t vrf_id)
 /* Delete interface structure. */
 void if_delete_retain(struct interface *ifp)
 {
+	struct connected *ifc;
+
 	hook_call(if_del, ifp);
 	QOBJ_UNREG(ifp);
 
 	/* Free connected address list */
-	list_delete_all_node(ifp->connected);
+	while ((ifc = if_connected_pop(ifp->connected)))
+		ifp_connected_free(ifc);
 
 	/* Free connected nbr address list */
 	list_delete_all_node(ifp->nbr_connected);
@@ -270,7 +267,7 @@ void if_delete(struct interface **ifp)
 
 	if_delete_retain(ptr);
 
-	list_delete(&ptr->connected);
+	if_connected_fini(ptr->connected);
 	list_delete(&ptr->nbr_connected);
 
 	if_link_params_free(ptr);
@@ -367,8 +364,7 @@ struct interface *if_lookup_by_name(const char *name, vrf_id_t vrf_id)
 	struct vrf *vrf = vrf_lookup_by_id(vrf_id);
 	struct interface if_tmp;
 
-	if (!vrf || !name
-	    || strnlen(name, INTERFACE_NAMSIZ) == INTERFACE_NAMSIZ)
+	if (!vrf || !name || strnlen(name, IFNAMSIZ) == IFNAMSIZ)
 		return NULL;
 
 	strlcpy(if_tmp.name, name, sizeof(if_tmp.name));
@@ -379,7 +375,7 @@ struct interface *if_lookup_by_name_vrf(const char *name, struct vrf *vrf)
 {
 	struct interface if_tmp;
 
-	if (!name || strnlen(name, INTERFACE_NAMSIZ) == INTERFACE_NAMSIZ)
+	if (!name || strnlen(name, IFNAMSIZ) == IFNAMSIZ)
 		return NULL;
 
 	strlcpy(if_tmp.name, name, sizeof(if_tmp.name));
@@ -391,7 +387,7 @@ static struct interface *if_lookup_by_name_all_vrf(const char *name)
 	struct vrf *vrf;
 	struct interface *ifp;
 
-	if (!name || strnlen(name, INTERFACE_NAMSIZ) == INTERFACE_NAMSIZ)
+	if (!name || strnlen(name, IFNAMSIZ) == IFNAMSIZ)
 		return NULL;
 
 	RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
@@ -433,7 +429,6 @@ struct interface *if_lookup_address_local(const void *src, int family,
 					  vrf_id_t vrf_id)
 {
 	struct vrf *vrf = vrf_lookup_by_id(vrf_id);
-	struct listnode *cnode;
 	struct interface *ifp, *best_down = NULL;
 	struct prefix *p;
 	struct connected *c;
@@ -442,7 +437,7 @@ struct interface *if_lookup_address_local(const void *src, int family,
 		return NULL;
 
 	FOR_ALL_INTERFACES (vrf, ifp) {
-		for (ALL_LIST_ELEMENTS_RO(ifp->connected, cnode, c)) {
+		frr_each (if_connected, ifp->connected, c) {
 			p = c->address;
 
 			if (!p || p->family != family)
@@ -474,7 +469,6 @@ struct connected *if_lookup_address(const void *matchaddr, int family,
 	struct vrf *vrf = vrf_lookup_by_id(vrf_id);
 	struct prefix addr;
 	int bestlen = 0;
-	struct listnode *cnode;
 	struct interface *ifp;
 	struct connected *c;
 	struct connected *match;
@@ -493,7 +487,7 @@ struct connected *if_lookup_address(const void *matchaddr, int family,
 	match = NULL;
 
 	FOR_ALL_INTERFACES (vrf, ifp) {
-		for (ALL_LIST_ELEMENTS_RO(ifp->connected, cnode, c)) {
+		frr_each (if_connected, ifp->connected, c) {
 			if (c->address && (c->address->family == AF_INET)
 			    && prefix_match(CONNECTED_PREFIX(c), &addr)
 			    && (c->address->prefixlen > bestlen)) {
@@ -509,12 +503,11 @@ struct connected *if_lookup_address(const void *matchaddr, int family,
 struct interface *if_lookup_prefix(const struct prefix *prefix, vrf_id_t vrf_id)
 {
 	struct vrf *vrf = vrf_lookup_by_id(vrf_id);
-	struct listnode *cnode;
 	struct interface *ifp;
 	struct connected *c;
 
 	FOR_ALL_INTERFACES (vrf, ifp) {
-		for (ALL_LIST_ELEMENTS_RO(ifp->connected, cnode, c)) {
+		frr_each (if_connected, ifp->connected, c) {
 			if (prefix_cmp(c->address, prefix) == 0) {
 				return ifp;
 			}
@@ -781,10 +774,9 @@ const char *if_flag_dump(unsigned long flag)
 /* For debugging */
 static void if_dump(const struct interface *ifp)
 {
-	struct listnode *node;
-	struct connected *c __attribute__((unused));
+	const struct connected *c;
 
-	for (ALL_LIST_ELEMENTS_RO(ifp->connected, node, c))
+	frr_each (if_connected_const, ifp->connected, c)
 		zlog_info(
 			"Interface %s vrf %s(%u) index %d metric %d mtu %d mtu6 %d %s",
 			ifp->name, ifp->vrf->name, ifp->vrf->vrf_id,
@@ -911,11 +903,10 @@ static int connected_same_prefix(const struct prefix *p1,
 /* count the number of connected addresses that are in the given family */
 unsigned int connected_count_by_family(struct interface *ifp, int family)
 {
-	struct listnode *cnode;
 	struct connected *connected;
 	unsigned int cnt = 0;
 
-	for (ALL_LIST_ELEMENTS_RO(ifp->connected, cnode, connected))
+	frr_each (if_connected, ifp->connected, connected)
 		if (connected->address->family == family)
 			cnt++;
 
@@ -925,14 +916,9 @@ unsigned int connected_count_by_family(struct interface *ifp, int family)
 struct connected *connected_lookup_prefix_exact(struct interface *ifp,
 						const struct prefix *p)
 {
-	struct listnode *node;
-	struct listnode *next;
 	struct connected *ifc;
 
-	for (node = listhead(ifp->connected); node; node = next) {
-		ifc = listgetdata(node);
-		next = node->next;
-
+	frr_each (if_connected, ifp->connected, ifc) {
 		if (connected_same_prefix(ifc->address, p))
 			return ifc;
 	}
@@ -942,17 +928,12 @@ struct connected *connected_lookup_prefix_exact(struct interface *ifp,
 struct connected *connected_delete_by_prefix(struct interface *ifp,
 					     struct prefix *p)
 {
-	struct listnode *node;
-	struct listnode *next;
 	struct connected *ifc;
 
 	/* In case of same prefix come, replace it with new one. */
-	for (node = listhead(ifp->connected); node; node = next) {
-		ifc = listgetdata(node);
-		next = node->next;
-
+	frr_each_safe (if_connected, ifp->connected, ifc) {
 		if (connected_same_prefix(ifc->address, p)) {
-			listnode_delete(ifp->connected, ifc);
+			if_connected_del(ifp->connected, ifc);
 			return ifc;
 		}
 	}
@@ -964,13 +945,12 @@ struct connected *connected_delete_by_prefix(struct interface *ifp,
 struct connected *connected_lookup_prefix(struct interface *ifp,
 					  const struct prefix *addr)
 {
-	struct listnode *cnode;
 	struct connected *c;
 	struct connected *match;
 
 	match = NULL;
 
-	for (ALL_LIST_ELEMENTS_RO(ifp->connected, cnode, c)) {
+	frr_each (if_connected, ifp->connected, c) {
 		if (c->address && (c->address->family == addr->family)
 		    && prefix_match(CONNECTED_PREFIX(c), addr)
 		    && (!match
@@ -1001,16 +981,15 @@ struct connected *connected_add_by_prefix(struct interface *ifp,
 	}
 
 	/* Add connected address to the interface. */
-	listnode_add(ifp->connected, ifc);
+	if_connected_add_tail(ifp->connected, ifc);
 	return ifc;
 }
 
 struct connected *connected_get_linklocal(struct interface *ifp)
 {
-	struct listnode *n;
 	struct connected *c = NULL;
 
-	for (ALL_LIST_ELEMENTS_RO(ifp->connected, n, c)) {
+	frr_each (if_connected, ifp->connected, c) {
 		if (c->address->family == AF_INET6
 		    && IN6_IS_ADDR_LINKLOCAL(&c->address->u.prefix6))
 			break;
@@ -1340,14 +1319,14 @@ static void cli_show_interface(struct vty *vty, const struct lyd_node *dnode,
 		char ifname[XPATH_MAXLEN];
 		char vrfname[XPATH_MAXLEN];
 
-		netns_ifname_split(yang_dnode_get_string(dnode, "./name"),
+		netns_ifname_split(yang_dnode_get_string(dnode, "name"),
 				   ifname, vrfname);
 
 		vty_out(vty, "interface %s", ifname);
 		if (!strmatch(vrfname, VRF_DEFAULT_NAME))
 			vty_out(vty, " vrf %s", vrfname);
 	} else {
-		const char *ifname = yang_dnode_get_string(dnode, "./name");
+		const char *ifname = yang_dnode_get_string(dnode, "name");
 
 		vty_out(vty, "interface %s", ifname);
 	}
@@ -1361,6 +1340,15 @@ static void cli_show_interface_end(struct vty *vty,
 	vty_out(vty, "exit\n");
 }
 
+static int cli_cmp_interface(const struct lyd_node *dnode1,
+			     const struct lyd_node *dnode2)
+{
+	const char *ifname1 = yang_dnode_get_string(dnode1, "name");
+	const char *ifname2 = yang_dnode_get_string(dnode2, "name");
+
+	return if_cmp_name_func(ifname1, ifname2);
+}
+
 void if_vty_config_start(struct vty *vty, struct interface *ifp)
 {
 	vty_frame(vty, "!\n");
@@ -1477,17 +1465,6 @@ void if_cmd_init_default(void)
 	if_cmd_init(if_nb_config_write);
 }
 
-void if_zapi_callbacks(int (*create)(struct interface *ifp),
-		       int (*up)(struct interface *ifp),
-		       int (*down)(struct interface *ifp),
-		       int (*destroy)(struct interface *ifp))
-{
-	ifp_master.create_hook = create;
-	ifp_master.up_hook = up;
-	ifp_master.down_hook = down;
-	ifp_master.destroy_hook = destroy;
-}
-
 /* ------- Northbound callbacks ------- */
 
 /*
@@ -1498,7 +1475,7 @@ static int lib_interface_create(struct nb_cb_create_args *args)
 	const char *ifname;
 	struct interface *ifp;
 
-	ifname = yang_dnode_get_string(args->dnode, "./name");
+	ifname = yang_dnode_get_string(args->dnode, "name");
 
 	switch (args->event) {
 	case NB_EV_VALIDATE:
@@ -1709,7 +1686,7 @@ lib_interface_state_mtu_get_elem(struct nb_cb_get_elem_args *args)
 {
 	const struct interface *ifp = args->list_entry;
 
-	return yang_data_new_uint16(args->xpath, ifp->mtu);
+	return yang_data_new_uint32(args->xpath, ifp->mtu);
 }
 
 /*
@@ -1780,6 +1757,8 @@ lib_interface_state_phy_address_get_elem(struct nb_cb_get_elem_args *args)
 }
 
 /* clang-format off */
+
+/* cli_show callbacks are kept here for daemons not yet converted to mgmtd */
 const struct frr_yang_module_info frr_interface_info = {
 	.name = "frr-interface",
 	.nodes = {
@@ -1790,6 +1769,7 @@ const struct frr_yang_module_info frr_interface_info = {
 				.destroy = lib_interface_destroy,
 				.cli_show = cli_show_interface,
 				.cli_show_end = cli_show_interface_end,
+				.cli_cmp = cli_cmp_interface,
 				.get_next = lib_interface_get_next,
 				.get_keys = lib_interface_get_keys,
 				.lookup_entry = lib_interface_lookup_entry,
@@ -1862,3 +1842,27 @@ const struct frr_yang_module_info frr_interface_info = {
 		},
 	}
 };
+
+const struct frr_yang_module_info frr_interface_cli_info = {
+	.name = "frr-interface",
+	.ignore_cfg_cbs = true,
+	.nodes = {
+		{
+			.xpath = "/frr-interface:lib/interface",
+			.cbs = {
+				.cli_show = cli_show_interface,
+				.cli_show_end = cli_show_interface_end,
+				.cli_cmp = cli_cmp_interface,
+			},
+		},
+		{
+			.xpath = "/frr-interface:lib/interface/description",
+			.cbs = {
+				.cli_show = cli_show_interface_desc,
+			},
+		},
+		{
+			.xpath = NULL,
+		},
+	}
+};
diff --git a/lib/if.h b/lib/if.h
index 7b4415d..0dc56bd 100644
--- a/lib/if.h
+++ b/lib/if.h
@@ -88,8 +88,6 @@ enum zebra_link_type {
    FreeBSD define value in /usr/include/net/if.h.
    #define IFNAMSIZ        16
 */
-
-#define INTERFACE_NAMSIZ      IFNAMSIZ
 #define INTERFACE_HWADDR_MAX  20
 
 typedef signed int ifindex_t;
@@ -197,7 +195,7 @@ struct if_link_params {
 	uint32_t min_delay;		/* Link Min Delay */
 	uint32_t max_delay;		/* Link Max Delay */
 	uint32_t delay_var;		/* Link Delay Variation */
-	float pkt_loss;			/* Link Packet Loss */
+	uint32_t pkt_loss;		/* Link Packet Loss */
 	float res_bw;			/* Residual Bandwidth */
 	float ava_bw;			/* Available Bandwidth */
 	float use_bw;			/* Utilized Bandwidth */
@@ -206,6 +204,8 @@ struct if_link_params {
 #define INTERFACE_LINK_PARAMS_SIZE   sizeof(struct if_link_params)
 #define HAS_LINK_PARAMS(ifp)  ((ifp)->link_params != NULL)
 
+PREDECL_DLIST(if_connected);
+
 /* Interface structure */
 struct interface {
 	RB_ENTRY(interface) name_entry, index_entry;
@@ -218,7 +218,7 @@ struct interface {
 	   To delete, just set ifindex to IFINDEX_INTERNAL to indicate that the
 	   interface does not exist in the kernel.
 	 */
-	char name[INTERFACE_NAMSIZ];
+	char name[IFNAMSIZ];
 
 	/* Interface index (should be IFINDEX_INTERNAL for non-kernel or
 	   deleted interfaces).
@@ -275,12 +275,8 @@ struct interface {
 	/* description of the interface. */
 	char *desc;
 
-	/* Distribute list. */
-	void *distribute_in;
-	void *distribute_out;
-
 	/* Connected address list. */
-	struct list *connected;
+	struct if_connected_head connected[1];
 
 	/* Neighbor connected address list. */
 	struct list *nbr_connected;
@@ -375,9 +371,6 @@ DECLARE_QOBJ_TYPE(interface);
 	if (vrf)                                                               \
 		RB_FOREACH (ifp, if_name_head, &vrf->ifaces_by_name)
 
-#define FOR_ALL_INTERFACES_ADDRESSES(ifp, connected, node)                     \
-	for (ALL_LIST_ELEMENTS_RO(ifp->connected, node, connected))
-
 /* called from the library code whenever interfaces are created/deleted
  * note: interfaces may not be fully realized at that point; also they
  * may not exist in the system (ifindex = IFINDEX_INTERNAL)
@@ -386,13 +379,34 @@ DECLARE_QOBJ_TYPE(interface);
  * can use 1000+ so they run after the daemon has initialised daemon-specific
  * interface data
  */
-DECLARE_HOOK(if_add, (struct interface * ifp), (ifp));
-DECLARE_KOOH(if_del, (struct interface * ifp), (ifp));
+DECLARE_HOOK(if_add, (struct interface *ifp), (ifp));
+DECLARE_KOOH(if_del, (struct interface *ifp), (ifp));
+
+/* called (in daemons) when ZAPI tells us the interface actually exists
+ * (ifindex != IFINDEX_INTERNAL)
+ *
+ * WARNING: these 2 hooks NEVER CALLED inside zebra!
+ */
+DECLARE_HOOK(if_real, (struct interface *ifp), (ifp));
+DECLARE_KOOH(if_unreal, (struct interface *ifp), (ifp));
+
+/* called (in daemons) on state changes on interfaces.  Whether this is admin
+ * state (= pure config) or carrier state (= hardware link plugged) depends on
+ * zebra's "link-detect" configuration.  By default, it's carrier state, so
+ * this won't happen until the interface actually has a link.
+ *
+ * WARNING: these 2 hooks NEVER CALLED inside zebra!
+ */
+DECLARE_HOOK(if_up, (struct interface *ifp), (ifp));
+DECLARE_KOOH(if_down, (struct interface *ifp), (ifp));
+
 
 #define METRIC_MAX (~0)
 
 /* Connected address structure. */
 struct connected {
+	struct if_connected_item item;
+
 	/* Attached interface. */
 	struct interface *ifp;
 
@@ -420,6 +434,8 @@ struct connected {
 #define ZEBRA_IFA_SECONDARY    (1 << 0)
 #define ZEBRA_IFA_PEER         (1 << 1)
 #define ZEBRA_IFA_UNNUMBERED   (1 << 2)
+#define ZEBRA_IFA_NOPREFIXROUTE (1 << 3)
+
 	/* N.B. the ZEBRA_IFA_PEER flag should be set if and only if
 	   a peer address has been configured.  If this flag is set,
 	   the destination field must contain the peer address.
@@ -442,6 +458,8 @@ struct connected {
 	uint32_t metric;
 };
 
+DECLARE_DLIST(if_connected, struct connected, item);
+
 /* Nbr Connected address structure. */
 struct nbr_connected {
 	/* Attached interface. */
@@ -512,9 +530,9 @@ extern int if_cmp_name_func(const char *p1, const char *p2);
  * This is useful for vrf route-leaking.  So more than anything
  * else think before you use VRF_UNKNOWN
  */
-extern void if_update_to_new_vrf(struct interface *, vrf_id_t vrf_id);
+extern void if_update_to_new_vrf(struct interface *ifp, vrf_id_t vrf_id);
 
-extern struct interface *if_lookup_by_index(ifindex_t, vrf_id_t vrf_id);
+extern struct interface *if_lookup_by_index(ifindex_t ifindex, vrf_id_t vrf_id);
 extern struct interface *if_vrf_lookup_by_index_next(ifindex_t ifindex,
 						     vrf_id_t vrf_id);
 extern struct interface *if_lookup_address_local(const void *matchaddr,
@@ -545,7 +563,7 @@ extern int if_set_index(struct interface *ifp, ifindex_t ifindex);
 /* Delete the interface, but do not free the structure, and leave it in the
    interface list.  It is often advisable to leave the pseudo interface
    structure because there may be configuration information attached. */
-extern void if_delete_retain(struct interface *);
+extern void if_delete_retain(struct interface *ifp);
 
 /* Delete and free the interface structure: calls if_delete_retain and then
    deletes it from the interface list and frees the structure. */
@@ -563,13 +581,13 @@ extern int if_is_pointopoint(const struct interface *ifp);
 extern int if_is_multicast(const struct interface *ifp);
 extern void if_terminate(struct vrf *vrf);
 extern void if_dump_all(void);
-extern const char *if_flag_dump(unsigned long);
-extern const char *if_link_type_str(enum zebra_link_type);
+extern const char *if_flag_dump(unsigned long flags);
+extern const char *if_link_type_str(enum zebra_link_type zlt);
 
 /* Please use ifindex2ifname instead of if_indextoname where possible;
    ifindex2ifname uses internal interface info, whereas if_indextoname must
    make a system call. */
-extern const char *ifindex2ifname(ifindex_t, vrf_id_t vrf_id);
+extern const char *ifindex2ifname(ifindex_t ifindex, vrf_id_t vrf_id);
 
 /* Please use ifname2ifindex instead of if_nametoindex where possible;
    ifname2ifindex uses internal interface info, whereas if_nametoindex must
@@ -579,19 +597,20 @@ extern ifindex_t ifname2ifindex(const char *ifname, vrf_id_t vrf_id);
 /* Connected address functions. */
 extern struct connected *connected_new(void);
 extern void connected_free(struct connected **connected);
-extern void connected_add(struct interface *, struct connected *);
-extern struct connected *
-connected_add_by_prefix(struct interface *, struct prefix *, struct prefix *);
-extern struct connected *connected_delete_by_prefix(struct interface *,
-						    struct prefix *);
-extern struct connected *connected_lookup_prefix(struct interface *,
-						 const struct prefix *);
-extern struct connected *connected_lookup_prefix_exact(struct interface *,
-						       const struct prefix *);
-extern unsigned int connected_count_by_family(struct interface *, int family);
+extern struct connected *connected_add_by_prefix(struct interface *ifp,
+						 struct prefix *p,
+						 struct prefix *dest);
+extern struct connected *connected_delete_by_prefix(struct interface *ifp,
+						    struct prefix *p);
+extern struct connected *connected_lookup_prefix(struct interface *ifp,
+						 const struct prefix *p);
+extern struct connected *connected_lookup_prefix_exact(struct interface *ifp,
+						       const struct prefix *p);
+extern unsigned int connected_count_by_family(struct interface *ifp, int family);
 extern struct nbr_connected *nbr_connected_new(void);
-extern void nbr_connected_free(struct nbr_connected *);
-struct nbr_connected *nbr_connected_check(struct interface *, struct prefix *);
+extern void nbr_connected_free(struct nbr_connected *connected);
+struct nbr_connected *nbr_connected_check(struct interface *ifp,
+					  struct prefix *p);
 struct connected *connected_get_linklocal(struct interface *ifp);
 
 /* link parameters */
@@ -599,10 +618,10 @@ bool if_link_params_cmp(struct if_link_params *iflp1,
 			struct if_link_params *iflp2);
 void if_link_params_copy(struct if_link_params *dst,
 			 struct if_link_params *src);
-struct if_link_params *if_link_params_get(struct interface *);
+struct if_link_params *if_link_params_get(struct interface *ifp);
 struct if_link_params *if_link_params_enable(struct interface *ifp);
 struct if_link_params *if_link_params_init(struct interface *ifp);
-void if_link_params_free(struct interface *);
+void if_link_params_free(struct interface *ifp);
 
 /* Northbound. */
 struct vty;
@@ -610,10 +629,6 @@ extern void if_vty_config_start(struct vty *vty, struct interface *ifp);
 extern void if_vty_config_end(struct vty *vty);
 extern void if_cmd_init(int (*config_write)(struct vty *));
 extern void if_cmd_init_default(void);
-extern void if_zapi_callbacks(int (*create)(struct interface *ifp),
-			      int (*up)(struct interface *ifp),
-			      int (*down)(struct interface *ifp),
-			      int (*destroy)(struct interface *ifp));
 
 extern void if_new_via_zapi(struct interface *ifp);
 extern void if_up_via_zapi(struct interface *ifp);
@@ -621,6 +636,7 @@ extern void if_down_via_zapi(struct interface *ifp);
 extern void if_destroy_via_zapi(struct interface *ifp);
 
 extern const struct frr_yang_module_info frr_interface_info;
+extern const struct frr_yang_module_info frr_interface_cli_info;
 
 #ifdef __cplusplus
 }
diff --git a/lib/if_rmap.c b/lib/if_rmap.c
index 42e1620..5fe5061 100644
--- a/lib/if_rmap.c
+++ b/lib/if_rmap.c
@@ -243,14 +243,14 @@ DEFPY_YANG(no_if_ipv6_route_map, no_if_ipv6_route_map_cmd,
 void cli_show_if_route_map(struct vty *vty, const struct lyd_node *dnode,
 			   bool show_defaults)
 {
-	if (yang_dnode_exists(dnode, "./in-route-map"))
+	if (yang_dnode_exists(dnode, "in-route-map"))
 		vty_out(vty, " route-map %s in %s\n",
-			yang_dnode_get_string(dnode, "./in-route-map"),
-			yang_dnode_get_string(dnode, "./interface"));
-	if (yang_dnode_exists(dnode, "./out-route-map"))
+			yang_dnode_get_string(dnode, "in-route-map"),
+			yang_dnode_get_string(dnode, "interface"));
+	if (yang_dnode_exists(dnode, "out-route-map"))
 		vty_out(vty, " route-map %s out %s\n",
-			yang_dnode_get_string(dnode, "./out-route-map"),
-			yang_dnode_get_string(dnode, "./interface"));
+			yang_dnode_get_string(dnode, "out-route-map"),
+			yang_dnode_get_string(dnode, "interface"));
 }
 
 void if_rmap_yang_modify_cb(struct if_rmap_ctx *ctx,
diff --git a/lib/imsg-buffer.c b/lib/imsg-buffer.c
index 4f041ff..556e0cf 100644
--- a/lib/imsg-buffer.c
+++ b/lib/imsg-buffer.c
@@ -6,6 +6,7 @@
  */
 
 #include <zebra.h>
+#include <sys/uio.h>
 
 #include "queue.h"
 #include "imsg.h"
diff --git a/lib/jhash.c b/lib/jhash.c
index 0d561ef..4e02112 100644
--- a/lib/jhash.c
+++ b/lib/jhash.c
@@ -86,34 +86,34 @@ uint32_t jhash(const void *key, uint32_t length, uint32_t initval)
 	switch (len) {
 	case 11:
 		c += ((uint32_t)k[10] << 24);
-	/* fallthru */
+		fallthrough;
 	case 10:
 		c += ((uint32_t)k[9] << 16);
-	/* fallthru */
+		fallthrough;
 	case 9:
 		c += ((uint32_t)k[8] << 8);
-	/* fallthru */
+		fallthrough;
 	case 8:
 		b += ((uint32_t)k[7] << 24);
-	/* fallthru */
+		fallthrough;
 	case 7:
 		b += ((uint32_t)k[6] << 16);
-	/* fallthru */
+		fallthrough;
 	case 6:
 		b += ((uint32_t)k[5] << 8);
-	/* fallthru */
+		fallthrough;
 	case 5:
 		b += k[4];
-	/* fallthru */
+		fallthrough;
 	case 4:
 		a += ((uint32_t)k[3] << 24);
-	/* fallthru */
+		fallthrough;
 	case 3:
 		a += ((uint32_t)k[2] << 16);
-	/* fallthru */
+		fallthrough;
 	case 2:
 		a += ((uint32_t)k[1] << 8);
-	/* fallthru */
+		fallthrough;
 	case 1:
 		a += k[0];
 	}
@@ -148,7 +148,7 @@ uint32_t jhash2(const uint32_t *k, uint32_t length, uint32_t initval)
 	switch (len) {
 	case 2:
 		b += k[1];
-	/* fallthru */
+		fallthrough;
 	case 1:
 		a += k[0];
 	}
diff --git a/lib/keychain.c b/lib/keychain.c
index 640746b..5ff0d1e 100644
--- a/lib/keychain.c
+++ b/lib/keychain.c
@@ -37,6 +37,7 @@ static void keychain_free(struct keychain *keychain)
 static struct key *key_new(void)
 {
 	struct key *key = XCALLOC(MTYPE_KEY, sizeof(struct key));
+
 	QOBJ_REG(key, key);
 	return key;
 }
@@ -77,7 +78,7 @@ static int key_cmp_func(void *arg1, void *arg2)
 static void key_delete_func(struct key *key)
 {
 	if (key->string)
-		free(key->string);
+		XFREE(MTYPE_KEY, key->string);
 	key_free(key);
 }
 
@@ -1187,6 +1188,20 @@ static const struct cmd_variable_handler keychain_var_handlers[] = {
 	{.completions = NULL}
 };
 
+void keychain_terminate(void)
+{
+	struct keychain *keychain;
+
+	while (listcount(keychain_list)) {
+		keychain = listgetdata(listhead(keychain_list));
+
+		listnode_delete(keychain_list, keychain);
+		keychain_delete(keychain);
+	}
+
+	list_delete(&keychain_list);
+}
+
 void keychain_init(void)
 {
 	keychain_list = list_new();
diff --git a/lib/keychain.h b/lib/keychain.h
index be93275..c96b74e 100644
--- a/lib/keychain.h
+++ b/lib/keychain.h
@@ -82,6 +82,7 @@ struct key {
 DECLARE_QOBJ_TYPE(key);
 
 extern void keychain_init(void);
+extern void keychain_terminate(void);
 extern struct keychain *keychain_lookup(const char *);
 extern struct key *key_lookup_for_accept(const struct keychain *, uint32_t);
 extern struct key *key_match_for_accept(const struct keychain *, const char *);
diff --git a/lib/ldp_sync.h b/lib/ldp_sync.h
index f7601eb..3a6ae5b 100644
--- a/lib/ldp_sync.h
+++ b/lib/ldp_sync.h
@@ -59,7 +59,7 @@ struct ldp_igp_sync_if_state {
 struct ldp_igp_sync_if_state_req {
 	int proto;
 	ifindex_t ifindex;
-	char name[INTERFACE_NAMSIZ];
+	char name[IFNAMSIZ];
 };
 
 #ifdef __cplusplus
diff --git a/lib/libfrr.c b/lib/libfrr.c
index 33237df..9e47205 100644
--- a/lib/libfrr.c
+++ b/lib/libfrr.c
@@ -6,7 +6,11 @@
  */
 
 #include <zebra.h>
+
+#include <signal.h>
+#include <sys/stat.h>
 #include <sys/un.h>
+#include <fcntl.h>
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -33,6 +37,8 @@
 #include "frrscript.h"
 #include "systemd.h"
 
+#include "lib/config_paths.h"
+
 DEFINE_HOOK(frr_early_init, (struct event_loop * tm), (tm));
 DEFINE_HOOK(frr_late_init, (struct event_loop * tm), (tm));
 DEFINE_HOOK(frr_config_pre, (struct event_loop * tm), (tm));
@@ -41,10 +47,8 @@ DEFINE_KOOH(frr_early_fini, (), ());
 DEFINE_KOOH(frr_fini, (), ());
 
 const char frr_sysconfdir[] = SYSCONFDIR;
-char frr_vtydir[256];
-#ifdef HAVE_SQLITE3
-const char frr_dbdir[] = DAEMON_DB_DIR;
-#endif
+char frr_runstatedir[256] = FRR_RUNSTATE_PATH;
+char frr_libstatedir[256] = FRR_LIBSTATE_PATH;
 const char frr_moduledir[] = MODULE_PATH;
 const char frr_scriptdir[] = SCRIPT_PATH;
 
@@ -52,7 +56,7 @@ char frr_protoname[256] = "NONE";
 char frr_protonameinst[256] = "NONE";
 
 char config_default[512];
-char frr_zclientpath[256];
+char frr_zclientpath[512];
 static char pidfile_default[1024];
 #ifdef HAVE_SQLITE3
 static char dbfile_default[512];
@@ -204,7 +208,7 @@ bool frr_zclient_addr(struct sockaddr_storage *sa, socklen_t *sa_len,
 	if (!strncmp(path, ZAPI_TCP_PATHNAME, strlen(ZAPI_TCP_PATHNAME))) {
 		/* note: this functionality is disabled at bottom */
 		int af;
-		int port = ZEBRA_PORT;
+		int port = ZEBRA_TCP_PORT;
 		char *err = NULL;
 		struct sockaddr_in *sin = NULL;
 		struct sockaddr_in6 *sin6 = NULL;
@@ -218,7 +222,8 @@ bool frr_zclient_addr(struct sockaddr_storage *sa, socklen_t *sa_len,
 			break;
 		case '6':
 			path++;
-		/* fallthrough */
+			af = AF_INET6;
+			break;
 		default:
 			af = AF_INET6;
 			break;
@@ -305,11 +310,6 @@ bool frr_zclient_addr(struct sockaddr_storage *sa, socklen_t *sa_len,
 
 static struct frr_daemon_info *di = NULL;
 
-void frr_init_vtydir(void)
-{
-	snprintf(frr_vtydir, sizeof(frr_vtydir), DAEMON_VTY_DIR, "", "");
-}
-
 void frr_preinit(struct frr_daemon_info *daemon, int argc, char **argv)
 {
 	di = daemon;
@@ -339,16 +339,14 @@ void frr_preinit(struct frr_daemon_info *daemon, int argc, char **argv)
 	if (di->flags & FRR_DETACH_LATER)
 		nodetach_daemon = true;
 
-	frr_init_vtydir();
 	snprintf(config_default, sizeof(config_default), "%s/%s.conf",
 		 frr_sysconfdir, di->name);
 	snprintf(pidfile_default, sizeof(pidfile_default), "%s/%s.pid",
-		 frr_vtydir, di->name);
-	snprintf(frr_zclientpath, sizeof(frr_zclientpath),
-		 ZEBRA_SERV_PATH, "", "");
+		 frr_runstatedir, di->name);
+	snprintf(frr_zclientpath, sizeof(frr_zclientpath), ZAPI_SOCK_NAME);
 #ifdef HAVE_SQLITE3
 	snprintf(dbfile_default, sizeof(dbfile_default), "%s/%s.db",
-		 frr_dbdir, di->name);
+		 frr_libstatedir, di->name);
 #endif
 
 	strlcpy(frr_protoname, di->logname, sizeof(frr_protoname));
@@ -497,13 +495,15 @@ static int frr_opt(int opt)
 		}
 		di->pathspace = optarg;
 
+		snprintf(frr_runstatedir, sizeof(frr_runstatedir),
+			 FRR_RUNSTATE_PATH "/%s", di->pathspace);
+		snprintf(frr_libstatedir, sizeof(frr_libstatedir),
+			 FRR_LIBSTATE_PATH "/%s", di->pathspace);
+		snprintf(pidfile_default, sizeof(pidfile_default), "%s/%s.pid",
+			 frr_runstatedir, di->name);
 		if (!di->zpathspace)
 			snprintf(frr_zclientpath, sizeof(frr_zclientpath),
-				 ZEBRA_SERV_PATH, "/", di->pathspace);
-		snprintf(frr_vtydir, sizeof(frr_vtydir), DAEMON_VTY_DIR, "/",
-			 di->pathspace);
-		snprintf(pidfile_default, sizeof(pidfile_default), "%s/%s.pid",
-			 frr_vtydir, di->name);
+				 ZAPI_SOCK_NAME);
 		break;
 	case 'o':
 		vrf_set_default_name(optarg);
@@ -724,10 +724,10 @@ struct event_loop *frr_init(void)
 	snprintf(config_default, sizeof(config_default), "%s%s%s%s.conf",
 		 frr_sysconfdir, p_pathspace, di->name, p_instance);
 	snprintf(pidfile_default, sizeof(pidfile_default), "%s/%s%s.pid",
-		 frr_vtydir, di->name, p_instance);
+		 frr_runstatedir, di->name, p_instance);
 #ifdef HAVE_SQLITE3
 	snprintf(dbfile_default, sizeof(dbfile_default), "%s/%s%s%s.db",
-		 frr_dbdir, p_pathspace, di->name, p_instance);
+		 frr_libstatedir, p_pathspace, di->name, p_instance);
 #endif
 
 	zprivs_preinit(di->privs);
@@ -756,8 +756,9 @@ struct event_loop *frr_init(void)
 
 	/* don't mkdir these as root... */
 	if (!(di->flags & FRR_NO_PRIVSEP)) {
+		frr_mkdir(frr_libstatedir, false);
 		if (!di->pid_file || !di->vty_path)
-			frr_mkdir(frr_vtydir, false);
+			frr_mkdir(frr_runstatedir, false);
 		if (di->pid_file)
 			frr_mkdir(di->pid_file, true);
 		if (di->vty_path)
@@ -1044,7 +1045,7 @@ void frr_vty_serv_start(void)
 		const char *dir;
 		char defvtydir[256];
 
-		snprintf(defvtydir, sizeof(defvtydir), "%s", frr_vtydir);
+		snprintf(defvtydir, sizeof(defvtydir), "%s", frr_runstatedir);
 
 		dir = di->vty_sock_path ? di->vty_sock_path : defvtydir;
 
@@ -1270,6 +1271,161 @@ void frr_fini(void)
 	}
 }
 
+struct json_object *frr_daemon_state_load(void)
+{
+	struct json_object *state;
+	char **state_path;
+
+	assertf(di->state_paths,
+		"CODE BUG: daemon trying to load state, but no state path in frr_daemon_info");
+
+	for (state_path = di->state_paths; *state_path; state_path++) {
+		state = json_object_from_file(*state_path);
+		if (state)
+			return state;
+	}
+
+	return json_object_new_object();
+}
+
+/* cross-reference file_write_config() in command.c
+ * the code there is similar but not identical (configs use a unique temporary
+ * name for writing and keep a backup of the previous config.)
+ */
+void frr_daemon_state_save(struct json_object **statep)
+{
+	struct json_object *state = *statep;
+	char *state_path, *slash, *temp_name, **other;
+	size_t name_len, json_len;
+	const char *json_str;
+	int dirfd, fd;
+
+	assertf(di->state_paths,
+		"CODE BUG: daemon trying to save state, but no state path in frr_daemon_info");
+
+	state_path = di->state_paths[0];
+	json_str = json_object_to_json_string_ext(state,
+						  JSON_C_TO_STRING_PRETTY);
+	json_len = strlen(json_str);
+
+	/* To correctly fsync() and ensure we have either consistent old state
+	 * or consistent new state but no fs-damage garbage inbetween, we need
+	 * to work with a directory fd.  If we need that anyway we might as
+	 * well use the dirfd with openat() & co in fd-relative operations.
+	 */
+
+	slash = strrchr(state_path, '/');
+	if (slash) {
+		char *state_dir;
+
+		state_dir = XSTRDUP(MTYPE_TMP, state_path);
+		state_dir[slash - state_path] = '\0';
+		dirfd = open(state_dir, O_DIRECTORY | O_RDONLY);
+		XFREE(MTYPE_TMP, state_dir);
+
+		if (dirfd < 0) {
+			zlog_err("failed to open directory %pSQq for saving daemon state: %m",
+				 state_dir);
+			return;
+		}
+
+		/* skip to file name */
+		slash++;
+	} else {
+		dirfd = open(".", O_DIRECTORY | O_RDONLY);
+		if (dirfd < 0) {
+			zlog_err(
+				"failed to open current directory for saving daemon state: %m");
+			return;
+		}
+
+		/* file name = path */
+		slash = state_path;
+	}
+
+	/* unlike saving configs, a temporary unique filename is unhelpful
+	 * here as it might litter files on limited write-heavy storage
+	 * (think switch with small NOR flash for frequently written data.)
+	 *
+	 * => always use filename with .sav suffix, worst case it litters one
+	 * file.
+	 */
+	name_len = strlen(slash);
+	temp_name = XMALLOC(MTYPE_TMP, name_len + 5);
+	memcpy(temp_name, slash, name_len);
+	memcpy(temp_name + name_len, ".sav", 5);
+
+	/* state file is always 0600, it's by and for FRR itself only */
+	fd = openat(dirfd, temp_name, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+	if (fd < 0) {
+		zlog_err("failed to open temporary daemon state save file for %pSQq: %m",
+			 state_path);
+		goto out_closedir_free;
+	}
+
+	while (json_len) {
+		ssize_t nwr = write(fd, json_str, json_len);
+
+		if (nwr <= 0) {
+			zlog_err("failed to write temporary daemon state to %pSQq: %m",
+				 state_path);
+
+			close(fd);
+			unlinkat(dirfd, temp_name, 0);
+			goto out_closedir_free;
+		}
+
+		json_str += nwr;
+		json_len -= nwr;
+	}
+
+	/* fsync is theoretically implicit in close(), but... */
+	if (fsync(fd) < 0)
+		zlog_warn("fsync for daemon state %pSQq failed: %m", state_path);
+	close(fd);
+
+	/* this is the *actual* fsync that ensures we're consistent.  The
+	 * file fsync only syncs the inode, but not the directory entry
+	 * referring to it.
+	 */
+	if (fsync(dirfd) < 0)
+		zlog_warn("directory fsync for daemon state %pSQq failed: %m",
+			  state_path);
+
+	/* atomic, hopefully. */
+	if (renameat(dirfd, temp_name, dirfd, slash) < 0) {
+		zlog_err("renaming daemon state %pSQq to %pSQq failed: %m",
+			 temp_name, state_path);
+		/* no unlink here, give the user a chance to investigate */
+		goto out_closedir_free;
+	}
+
+	/* and the rename needs to be synced too */
+	if (fsync(dirfd) < 0)
+		zlog_warn("directory fsync for daemon state %pSQq failed after rename: %m",
+			  state_path);
+
+	/* daemon may specify other deprecated paths to load from; since we
+	 * just saved successfully we should delete those.
+	 */
+	for (other = di->state_paths + 1; *other; other++) {
+		if (unlink(*other) == 0)
+			continue;
+		if (errno == ENOENT || errno == ENOTDIR)
+			continue;
+
+		zlog_warn("failed to remove deprecated daemon state file %pSQq: %m",
+			  *other);
+	}
+
+out_closedir_free:
+	XFREE(MTYPE_TMP, temp_name);
+	close(dirfd);
+
+	json_object_free(state);
+	*statep = NULL;
+}
+
 #ifdef INTERP
 static const char interp[]
 	__attribute__((section(".interp"), used)) = INTERP;
diff --git a/lib/libfrr.h b/lib/libfrr.h
index b260a54..ee436d9 100644
--- a/lib/libfrr.h
+++ b/lib/libfrr.h
@@ -22,6 +22,8 @@
 extern "C" {
 #endif
 
+#define ZAPI_SOCK_NAME "%s/zserv.api", frr_runstatedir
+
 /* The following options disable specific command line options that
  * are not applicable for a particular daemon.
  */
@@ -53,6 +55,49 @@ struct log_arg {
 };
 DECLARE_DLIST(log_args, struct log_arg, itm);
 
+/* Registry of daemons' port defaults. Many of these are VTY ports; some
+ * daemons have default ports for other features such as ospfapi, or zebra's
+ * FPM.
+ */
+
+/* default zebra TCP port for zapi; this is currently disabled for security
+ * reasons.
+ */
+#define ZEBRA_TCP_PORT 2600
+
+#define ZEBRA_VTY_PORT 2601
+#define RIP_VTY_PORT 2602
+#define RIPNG_VTY_PORT 2603
+#define OSPF_VTY_PORT 2604
+#define BGP_VTY_PORT 2605
+#define OSPF6_VTY_PORT 2606
+
+/* Default API server port to accept connection request from client-side.
+ * This value could be overridden by "ospfapi" entry in "/etc/services".
+ */
+#define OSPF_API_SYNC_PORT 2607
+
+#define ISISD_VTY_PORT 2608
+#define BABEL_VTY_PORT 2609
+#define NHRP_VTY_PORT 2610
+#define PIMD_VTY_PORT 2611
+#define LDP_VTY_PORT 2612
+#define EIGRP_VTY_PORT 2613
+#define SHARP_VTY_PORT 2614
+#define PBR_VTY_PORT 2615
+#define STATIC_VTY_PORT 2616
+#define BFDD_VTY_PORT 2617
+#define FABRICD_VTY_PORT 2618
+#define VRRP_VTY_PORT 2619
+
+/* default port for FPM connections */
+#define FPM_DEFAULT_PORT 2620
+
+#define PATH_VTY_PORT 2621
+#define PIM6D_VTY_PORT 2622
+#define MGMTD_VTY_PORT 2623
+/* Registry of daemons' port defaults */
+
 enum frr_cli_mode {
 	FRR_CLI_CLASSIC = 0,
 	FRR_CLI_TRANSACTIONAL,
@@ -85,6 +130,7 @@ struct frr_daemon_info {
 	const char *vty_path;
 	const char *module_path;
 	const char *script_path;
+	char **state_paths;
 
 	const char *pathspace;
 	bool zpathspace;
@@ -130,7 +176,6 @@ struct frr_daemon_info {
 			  .version = FRR_VERSION, );                           \
 	MACRO_REQUIRE_SEMICOLON() /* end */
 
-extern void frr_init_vtydir(void);
 extern void frr_preinit(struct frr_daemon_info *daemon, int argc, char **argv);
 extern void frr_opt_add(const char *optstr, const struct option *longopts,
 			const char *helpstr);
@@ -161,6 +206,10 @@ extern void frr_vty_serv_stop(void);
 extern bool frr_zclient_addr(struct sockaddr_storage *sa, socklen_t *sa_len,
 			     const char *path);
 
+struct json_object;
+extern struct json_object *frr_daemon_state_load(void);
+extern void frr_daemon_state_save(struct json_object **statep);
+
 /* these two are before the protocol daemon does its own shutdown
  * it's named this way being the counterpart to frr_late_init */
 DECLARE_KOOH(frr_early_fini, (), ());
@@ -170,9 +219,10 @@ DECLARE_KOOH(frr_fini, (), ());
 extern void frr_fini(void);
 
 extern char config_default[512];
-extern char frr_zclientpath[256];
+extern char frr_zclientpath[512];
 extern const char frr_sysconfdir[];
-extern char frr_vtydir[256];
+extern char frr_runstatedir[256];
+extern char frr_libstatedir[256];
 extern const char frr_moduledir[];
 extern const char frr_scriptdir[];
 
diff --git a/lib/libospf.h b/lib/libospf.h
index 9a64325..45e7fb1 100644
--- a/lib/libospf.h
+++ b/lib/libospf.h
@@ -61,7 +61,7 @@ extern "C" {
 #define OSPF_TRANSMIT_DELAY_DEFAULT         1
 #define OSPF_DEFAULT_BANDWIDTH		 10000	/* Mbps */
 
-#define OSPF_DEFAULT_REF_BANDWIDTH	100000  /* Mbps */
+#define OSPF_DEFAULT_REF_BANDWIDTH	100000  /* Kbps */
 
 #define OSPF_POLL_INTERVAL_DEFAULT         60
 #define OSPF_NEIGHBOR_PRIORITY_DEFAULT      0
diff --git a/lib/log.c b/lib/log.c
index ac31faa..969ca79 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -8,6 +8,10 @@
 
 #include <zebra.h>
 
+#ifdef HAVE_GLIBC_BACKTRACE
+#include <execinfo.h>
+#endif /* HAVE_GLIBC_BACKTRACE */
+
 #include "zclient.h"
 #include "log.h"
 #include "memory.h"
@@ -440,11 +444,11 @@ static const struct zebra_desc_table command_types[] = {
 	DESC_ENTRY(ZEBRA_NEIGH_DISCOVER),
 	DESC_ENTRY(ZEBRA_ROUTE_NOTIFY_REQUEST),
 	DESC_ENTRY(ZEBRA_CLIENT_CLOSE_NOTIFY),
-	DESC_ENTRY(ZEBRA_NHRP_NEIGH_ADDED),
-	DESC_ENTRY(ZEBRA_NHRP_NEIGH_REMOVED),
-	DESC_ENTRY(ZEBRA_NHRP_NEIGH_GET),
-	DESC_ENTRY(ZEBRA_NHRP_NEIGH_REGISTER),
-	DESC_ENTRY(ZEBRA_NHRP_NEIGH_UNREGISTER),
+	DESC_ENTRY(ZEBRA_NEIGH_ADDED),
+	DESC_ENTRY(ZEBRA_NEIGH_REMOVED),
+	DESC_ENTRY(ZEBRA_NEIGH_GET),
+	DESC_ENTRY(ZEBRA_NEIGH_REGISTER),
+	DESC_ENTRY(ZEBRA_NEIGH_UNREGISTER),
 	DESC_ENTRY(ZEBRA_NEIGH_IP_ADD),
 	DESC_ENTRY(ZEBRA_NEIGH_IP_DEL),
 	DESC_ENTRY(ZEBRA_CONFIGURE_ARP),
@@ -547,6 +551,8 @@ int proto_redistnum(int afi, const char *s)
 			return ZEBRA_ROUTE_KERNEL;
 		else if (strmatch(s, "connected"))
 			return ZEBRA_ROUTE_CONNECT;
+		else if (strmatch(s, "local"))
+			return ZEBRA_ROUTE_LOCAL;
 		else if (strmatch(s, "static"))
 			return ZEBRA_ROUTE_STATIC;
 		else if (strmatch(s, "rip"))
@@ -573,12 +579,16 @@ int proto_redistnum(int afi, const char *s)
 			return ZEBRA_ROUTE_SHARP;
 		else if (strmatch(s, "openfabric"))
 			return ZEBRA_ROUTE_OPENFABRIC;
+		else if (strmatch(s, "table-direct"))
+			return ZEBRA_ROUTE_TABLE_DIRECT;
 	}
 	if (afi == AFI_IP6) {
 		if (strmatch(s, "kernel"))
 			return ZEBRA_ROUTE_KERNEL;
 		else if (strmatch(s, "connected"))
 			return ZEBRA_ROUTE_CONNECT;
+		else if (strmatch(s, "local"))
+			return ZEBRA_ROUTE_LOCAL;
 		else if (strmatch(s, "static"))
 			return ZEBRA_ROUTE_STATIC;
 		else if (strmatch(s, "ripng"))
@@ -603,6 +613,8 @@ int proto_redistnum(int afi, const char *s)
 			return ZEBRA_ROUTE_SHARP;
 		else if (strmatch(s, "openfabric"))
 			return ZEBRA_ROUTE_OPENFABRIC;
+		else if (strmatch(s, "table-direct"))
+			return ZEBRA_ROUTE_TABLE_DIRECT;
 	}
 	return -1;
 }
diff --git a/lib/log_vty.c b/lib/log_vty.c
index 26e608d..323b1b1 100644
--- a/lib/log_vty.c
+++ b/lib/log_vty.c
@@ -15,6 +15,7 @@
 #include "lib/lib_errors.h"
 #include "lib/printfrr.h"
 #include "lib/systemd.h"
+#include "lib/vtysh_daemons.h"
 
 #include "lib/log_vty_clippy.c"
 
@@ -459,6 +460,70 @@ DEFUN (clear_log_cmdline,
 	return CMD_SUCCESS;
 }
 
+/* Per-daemon log file config */
+DEFUN (config_log_dmn_file,
+       config_log_dmn_file_cmd,
+       "log daemon " DAEMONS_LIST " file FILENAME [<emergencies|alerts|critical|errors|warnings|notifications|informational|debugging>$levelarg]",
+       "Logging control\n"
+       "Specific daemon\n"
+       DAEMONS_STR
+       "Logging to file\n"
+       "Logging filename\n"
+       LOG_LEVEL_DESC)
+{
+	int level = log_default_lvl;
+	int idx = 0;
+	const char *d_str;
+	const char *filename;
+	const char *levelarg = NULL;
+
+	d_str = argv[2]->text;
+
+	/* Ignore if not for this daemon */
+	if (!strmatch(d_str, frr_get_progname()))
+		return CMD_SUCCESS;
+
+	if (argv_find(argv, argc, "file", &idx))
+		filename = argv[idx + 1]->arg;
+	else
+		return CMD_SUCCESS;
+
+	if (argc > 5)
+		levelarg = argv[5]->text;
+
+	if (levelarg) {
+		level = log_level_match(levelarg);
+		if (level == ZLOG_DISABLED)
+			return CMD_ERR_NO_MATCH;
+	}
+	return set_log_file(&zt_file, vty, filename, level);
+}
+
+/* Per-daemon no log file */
+DEFUN (no_config_log_dmn_file,
+       no_config_log_dmn_file_cmd,
+       "no log daemon " DAEMONS_LIST " file [FILENAME [LEVEL]]",
+       NO_STR
+       "Logging control\n"
+       "Specific daemon\n"
+       DAEMONS_STR
+       "Cancel logging to file\n"
+       "Logging file name\n"
+       "Logging level\n")
+{
+	const char *d_str;
+
+	d_str = argv[3]->text;
+
+	/* Ignore if not for this daemon */
+	if (!strmatch(d_str, frr_get_progname()))
+		return CMD_SUCCESS;
+
+	zt_file.prio_min = ZLOG_DISABLED;
+	zlog_file_set_other(&zt_file);
+	return CMD_SUCCESS;
+}
+
 DEFPY (config_log_file,
        config_log_file_cmd,
        "log file FILENAME [<emergencies|alerts|critical|errors|warnings|notifications|informational|debugging>$levelarg]",
@@ -837,6 +902,8 @@ void log_config_write(struct vty *vty)
 		vty_out(vty, "no log error-category\n");
 	if (!zlog_get_prefix_xid())
 		vty_out(vty, "no log unique-id\n");
+	if (zlog_get_immediate_mode())
+		vty_out(vty, "log immediate-mode\n");
 
 	if (logmsgs_with_persist_bt) {
 		struct xrefdata *xrd;
@@ -857,12 +924,24 @@ void log_config_write(struct vty *vty)
 	}
 }
 
+static int log_vty_fini(void)
+{
+	if (zt_file_cmdline.filename)
+		zlog_file_fini(&zt_file_cmdline);
+	if (zt_file.filename)
+		zlog_file_fini(&zt_file);
+	return 0;
+}
+
+
 static int log_vty_init(const char *progname, const char *protoname,
 			 unsigned short instance, uid_t uid, gid_t gid)
 {
 	zlog_progname = progname;
 	zlog_protoname = protoname;
 
+	hook_register(zlog_fini, log_vty_fini);
+
 	zlog_set_prefix_ec(true);
 	zlog_set_prefix_xid(true);
 
@@ -892,6 +971,8 @@ void log_cmd_init(void)
 	install_element(CONFIG_NODE, &config_log_monitor_cmd);
 	install_element(CONFIG_NODE, &no_config_log_monitor_cmd);
 	install_element(CONFIG_NODE, &config_log_file_cmd);
+	install_element(CONFIG_NODE, &config_log_dmn_file_cmd);
+	install_element(CONFIG_NODE, &no_config_log_dmn_file_cmd);
 	install_element(CONFIG_NODE, &no_config_log_file_cmd);
 	install_element(CONFIG_NODE, &config_log_syslog_cmd);
 	install_element(CONFIG_NODE, &no_config_log_syslog_cmd);
diff --git a/lib/mgmt.proto b/lib/mgmt.proto
index 9e4b39a..01a99ab 100644
--- a/lib/mgmt.proto
+++ b/lib/mgmt.proto
@@ -55,7 +55,10 @@ message YangData {
 enum CfgDataReqType {
   REQ_TYPE_NONE = 0;
   SET_DATA = 1;
-  DELETE_DATA = 2;
+  REMOVE_DATA = 2;
+  CREATE_DATA = 3;
+  DELETE_DATA = 4;
+  REPLACE_DATA = 5;
 }
 
 message YangCfgDataReq {
@@ -73,8 +76,9 @@ message YangGetDataReq {
 //
 message BeSubscribeReq {
   required string client_name = 1;
-  required bool subscribe_xpaths = 2;
-  repeated string xpath_reg = 3;
+  repeated string config_xpaths = 2;
+  repeated string oper_xpaths = 3;
+  repeated string notif_xpaths = 4;
 }
 
 message BeSubscribeReply {
@@ -94,16 +98,14 @@ message BeTxnReply {
 
 message BeCfgDataCreateReq {
   required uint64 txn_id = 1;
-  required uint64 batch_id = 2;
-  repeated YangCfgDataReq data_req = 3;
-  required bool end_of_data = 4;
+  repeated YangCfgDataReq data_req = 2;
+  required bool end_of_data = 3;
 }
 
 message BeCfgDataCreateReply {
   required uint64 txn_id = 1;
-  required uint64 batch_id = 2;
-  required bool success = 3;
-  optional string error_if_any = 4;
+  required bool success = 2;
+  optional string error_if_any = 3;
 }
 
 message BeCfgDataApplyReq {
@@ -112,15 +114,8 @@ message BeCfgDataApplyReq {
 
 message BeCfgDataApplyReply {
   required uint64 txn_id = 1;
-  repeated uint64 batch_ids = 2;
-  required bool success = 3;
-  optional string error_if_any = 4;
-}
-
-message BeOperDataGetReq {
-  required uint64 txn_id = 1;
-  required uint64 batch_id = 2;
-  repeated YangGetDataReq data = 3;
+  required bool success = 2;
+  optional string error_if_any = 3;
 }
 
 message YangDataReply {
@@ -128,14 +123,6 @@ message YangDataReply {
   required int64 next_indx = 2;
 }
 
-message BeOperDataGetReply {
-  required uint64 txn_id = 1;
-  required uint64 batch_id = 2;
-  required bool success = 3;
-  optional string error = 4;
-  optional YangDataReply data = 5;
-}
-
 //
 // Any message on the MGMTD Backend Interface.
 //
@@ -149,8 +136,6 @@ message BeMessage {
     BeCfgDataCreateReply cfg_data_reply = 7;
     BeCfgDataApplyReq cfg_apply_req = 8;
     BeCfgDataApplyReply cfg_apply_reply = 9;
-    BeOperDataGetReq get_req = 10;
-    BeOperDataGetReply get_reply = 11;
   }
 }
 
diff --git a/lib/mgmt_be_client.c b/lib/mgmt_be_client.c
index 7bd9980..f483d48 100644
--- a/lib/mgmt_be_client.c
+++ b/lib/mgmt_be_client.c
@@ -8,15 +8,18 @@
 #include <zebra.h>
 #include "debug.h"
 #include "compiler.h"
+#include "darr.h"
 #include "libfrr.h"
-#include "mgmtd/mgmt.h"
+#include "lib_errors.h"
 #include "mgmt_be_client.h"
 #include "mgmt_msg.h"
+#include "mgmt_msg_native.h"
 #include "mgmt_pb.h"
 #include "network.h"
 #include "northbound.h"
 #include "stream.h"
 #include "sockopt.h"
+#include "northbound_cli.h"
 
 #include "lib/mgmt_be_client_clippy.c"
 
@@ -24,11 +27,11 @@ DEFINE_MTYPE_STATIC(LIB, MGMTD_BE_CLIENT, "backend client");
 DEFINE_MTYPE_STATIC(LIB, MGMTD_BE_CLIENT_NAME, "backend client name");
 DEFINE_MTYPE_STATIC(LIB, MGMTD_BE_BATCH, "backend transaction batch data");
 DEFINE_MTYPE_STATIC(LIB, MGMTD_BE_TXN, "backend transaction data");
+DEFINE_MTYPE_STATIC(LIB, MGMTD_BE_GT_CB_ARGS, "backend get-tree cb args");
 
 enum mgmt_be_txn_event {
 	MGMTD_BE_TXN_PROC_SETCFG = 1,
 	MGMTD_BE_TXN_PROC_GETCFG,
-	MGMTD_BE_TXN_PROC_GETDATA
 };
 
 struct mgmt_be_set_cfg_req {
@@ -36,24 +39,20 @@ struct mgmt_be_set_cfg_req {
 	uint16_t num_cfg_changes;
 };
 
-struct mgmt_be_get_data_req {
-	char *xpaths[MGMTD_MAX_NUM_DATA_REQ_IN_BATCH];
-	uint16_t num_xpaths;
-};
-
 struct mgmt_be_txn_req {
 	enum mgmt_be_txn_event event;
 	union {
 		struct mgmt_be_set_cfg_req set_cfg;
-		struct mgmt_be_get_data_req get_data;
 	} req;
 };
 
+struct be_oper_iter_arg {
+	struct lyd_node *root; /* the tree we are building */
+	struct lyd_node *hint; /* last node added */
+};
+
 PREDECL_LIST(mgmt_be_batches);
 struct mgmt_be_batch_ctx {
-	/* Batch-Id as assigned by MGMTD */
-	uint64_t batch_id;
-
 	struct mgmt_be_txn_req txn_req;
 
 	uint32_t flags;
@@ -116,15 +115,22 @@ struct mgmt_be_client {
 #define FOREACH_BE_TXN_IN_LIST(client_ctx, txn)                                \
 	frr_each_safe (mgmt_be_txns, &(client_ctx)->txn_head, (txn))
 
-struct debug mgmt_dbg_be_client = {0, "Management backend client operations"};
-
-const char *mgmt_be_client_names[MGMTD_BE_CLIENT_ID_MAX + 1] = {
-#ifdef HAVE_STATICD
-	[MGMTD_BE_CLIENT_ID_STATICD] = "staticd",
-#endif
-	[MGMTD_BE_CLIENT_ID_MAX] = "Unknown/Invalid",
+struct debug mgmt_dbg_be_client = {
+	.desc = "Management backend client operations"
 };
 
+/* NOTE: only one client per proc for now. */
+static struct mgmt_be_client *__be_client;
+
+static int be_client_send_native_msg(struct mgmt_be_client *client_ctx,
+				     void *msg, size_t len,
+				     bool short_circuit_ok)
+{
+	return msg_conn_send_msg(&client_ctx->client.conn,
+				 MGMT_MSG_VERSION_NATIVE, msg, len, NULL,
+				 short_circuit_ok);
+}
+
 static int mgmt_be_client_send_msg(struct mgmt_be_client *client_ctx,
 				   Mgmtd__BeMessage *be_msg)
 {
@@ -135,37 +141,15 @@ static int mgmt_be_client_send_msg(struct mgmt_be_client *client_ctx,
 }
 
 static struct mgmt_be_batch_ctx *
-mgmt_be_find_batch_by_id(struct mgmt_be_txn_ctx *txn,
-			    uint64_t batch_id)
-{
-	struct mgmt_be_batch_ctx *batch = NULL;
-
-	FOREACH_BE_TXN_BATCH_IN_LIST (txn, batch) {
-		if (batch->batch_id == batch_id)
-			return batch;
-	}
-
-	return NULL;
-}
-
-static struct mgmt_be_batch_ctx *
-mgmt_be_batch_create(struct mgmt_be_txn_ctx *txn, uint64_t batch_id)
+mgmt_be_batch_create(struct mgmt_be_txn_ctx *txn)
 {
 	struct mgmt_be_batch_ctx *batch = NULL;
 
-	batch = mgmt_be_find_batch_by_id(txn, batch_id);
-	if (!batch) {
-		batch = XCALLOC(MTYPE_MGMTD_BE_BATCH,
-				sizeof(struct mgmt_be_batch_ctx));
-		assert(batch);
+	batch = XCALLOC(MTYPE_MGMTD_BE_BATCH, sizeof(struct mgmt_be_batch_ctx));
 
-		batch->batch_id = batch_id;
-		mgmt_be_batches_add_tail(&txn->cfg_batches, batch);
+	mgmt_be_batches_add_tail(&txn->cfg_batches, batch);
 
-		MGMTD_BE_CLIENT_DBG("Added new batch-id: %" PRIu64
-				    " to transaction",
-				    batch_id);
-	}
+	debug_be_client("Added new batch to transaction");
 
 	return batch;
 }
@@ -218,7 +202,8 @@ mgmt_be_find_txn_by_id(struct mgmt_be_client *client_ctx, uint64_t txn_id,
 		if (txn->txn_id == txn_id)
 			return txn;
 	if (warn)
-		MGMTD_BE_CLIENT_ERR("Unknown txn-id: %" PRIu64, txn_id);
+		log_err_be_client("client %s unkonwn txn-id: %" PRIu64,
+				  client_ctx->name, txn_id);
 
 	return NULL;
 }
@@ -230,8 +215,8 @@ mgmt_be_txn_create(struct mgmt_be_client *client_ctx, uint64_t txn_id)
 
 	txn = mgmt_be_find_txn_by_id(client_ctx, txn_id, false);
 	if (txn) {
-		MGMTD_BE_CLIENT_ERR("Can't create existing txn-id: %" PRIu64,
-				    txn_id);
+		log_err_be_client("Can't create existing txn-id: %" PRIu64,
+				  txn_id);
 		return NULL;
 	}
 
@@ -242,7 +227,7 @@ mgmt_be_txn_create(struct mgmt_be_client *client_ctx, uint64_t txn_id)
 	mgmt_be_batches_init(&txn->apply_cfgs);
 	mgmt_be_txns_add_tail(&client_ctx->txn_head, txn);
 
-	MGMTD_BE_CLIENT_DBG("Created new txn-id: %" PRIu64, txn_id);
+	debug_be_client("Created new txn-id: %" PRIu64, txn_id);
 
 	return txn;
 }
@@ -291,6 +276,84 @@ static void mgmt_be_cleanup_all_txns(struct mgmt_be_client *client_ctx)
 	}
 }
 
+
+/**
+ * Send an error back to MGMTD using native messaging.
+ *
+ * Args:
+ *	client: the BE client.
+ *	txn_id: the txn_id this error pertains to.
+ *	short_circuit_ok: True if OK to short-circuit the call.
+ *	error: An integer error value.
+ *	errfmt: An error format string (i.e., printfrr)
+ *      ...: args for use by the `errfmt` format string.
+ *
+ * Return:
+ *	the return value from the underlying send message function.
+ */
+static int be_client_send_error(struct mgmt_be_client *client, uint64_t txn_id,
+				uint64_t req_id, bool short_circuit_ok,
+				int16_t error, const char *errfmt, ...)
+	PRINTFRR(6, 7);
+
+static int be_client_send_error(struct mgmt_be_client *client, uint64_t txn_id,
+				uint64_t req_id, bool short_circuit_ok,
+				int16_t error, const char *errfmt, ...)
+{
+	va_list ap;
+	int ret;
+
+	va_start(ap, errfmt);
+	ret = vmgmt_msg_native_send_error(&client->client.conn, txn_id, req_id,
+					  short_circuit_ok, error, errfmt, ap);
+	va_end(ap);
+
+	return ret;
+}
+
+static int mgmt_be_send_notification(void *__be_client, const char *xpath,
+				     const struct lyd_node *tree)
+{
+	struct mgmt_be_client *client = __be_client;
+	struct mgmt_msg_notify_data *msg = NULL;
+	LYD_FORMAT format = LYD_JSON;
+	uint8_t **darrp;
+	LY_ERR err;
+	int ret = 0;
+
+	assert(tree);
+
+	debug_be_client("%s: sending YANG notification: %s", __func__,
+			tree->schema->name);
+	/*
+	 * Allocate a message and append the data to it using `format`
+	 */
+	msg = mgmt_msg_native_alloc_msg(struct mgmt_msg_notify_data, 0,
+					MTYPE_MSG_NATIVE_NOTIFY);
+	msg->code = MGMT_MSG_CODE_NOTIFY;
+	msg->result_type = format;
+
+	mgmt_msg_native_xpath_encode(msg, xpath);
+
+	darrp = mgmt_msg_native_get_darrp(msg);
+	err = yang_print_tree_append(darrp, tree, format,
+				     (LYD_PRINT_SHRINK | LYD_PRINT_WD_EXPLICIT |
+				      LYD_PRINT_WITHSIBLINGS));
+	if (err) {
+		flog_err(EC_LIB_LIBYANG,
+			 "%s: error creating notification data: %s", __func__,
+			 ly_strerrcode(err));
+		ret = 1;
+		goto done;
+	}
+
+	(void)be_client_send_native_msg(client, msg,
+					mgmt_msg_native_get_msg_len(msg), false);
+done:
+	mgmt_msg_native_free_msg(msg);
+	return ret;
+}
+
 static int mgmt_be_send_txn_reply(struct mgmt_be_client *client_ctx,
 				  uint64_t txn_id, bool create)
 {
@@ -306,7 +369,7 @@ static int mgmt_be_send_txn_reply(struct mgmt_be_client *client_ctx,
 	be_msg.message_case = MGMTD__BE_MESSAGE__MESSAGE_TXN_REPLY;
 	be_msg.txn_reply = &txn_reply;
 
-	MGMTD_BE_CLIENT_DBG("Sending TXN_REPLY txn-id %" PRIu64, txn_id);
+	debug_be_client("Sending TXN_REPLY txn-id %" PRIu64, txn_id);
 
 	return mgmt_be_client_send_msg(client_ctx, &be_msg);
 }
@@ -317,7 +380,7 @@ static int mgmt_be_process_txn_req(struct mgmt_be_client *client_ctx,
 	struct mgmt_be_txn_ctx *txn;
 
 	if (create) {
-		MGMTD_BE_CLIENT_DBG("Creating new txn-id %" PRIu64, txn_id);
+		debug_be_client("Creating new txn-id %" PRIu64, txn_id);
 
 		txn = mgmt_be_txn_create(client_ctx, txn_id);
 		if (!txn)
@@ -328,7 +391,7 @@ static int mgmt_be_process_txn_req(struct mgmt_be_client *client_ctx,
 						      client_ctx->user_data,
 						      &txn->client_data, false);
 	} else {
-		MGMTD_BE_CLIENT_DBG("Deleting txn-id: %" PRIu64, txn_id);
+		debug_be_client("Deleting txn-id: %" PRIu64, txn_id);
 		txn = mgmt_be_find_txn_by_id(client_ctx, txn_id, false);
 		if (txn)
 			mgmt_be_txn_delete(client_ctx, &txn);
@@ -342,8 +405,7 @@ failed:
 }
 
 static int mgmt_be_send_cfgdata_create_reply(struct mgmt_be_client *client_ctx,
-					     uint64_t txn_id, uint64_t batch_id,
-					     bool success,
+					     uint64_t txn_id, bool success,
 					     const char *error_if_any)
 {
 	Mgmtd__BeMessage be_msg;
@@ -351,7 +413,6 @@ static int mgmt_be_send_cfgdata_create_reply(struct mgmt_be_client *client_ctx,
 
 	mgmtd__be_cfg_data_create_reply__init(&cfgdata_reply);
 	cfgdata_reply.txn_id = (uint64_t)txn_id;
-	cfgdata_reply.batch_id = (uint64_t)batch_id;
 	cfgdata_reply.success = success;
 	if (error_if_any)
 		cfgdata_reply.error_if_any = (char *)error_if_any;
@@ -360,9 +421,7 @@ static int mgmt_be_send_cfgdata_create_reply(struct mgmt_be_client *client_ctx,
 	be_msg.message_case = MGMTD__BE_MESSAGE__MESSAGE_CFG_DATA_REPLY;
 	be_msg.cfg_data_reply = &cfgdata_reply;
 
-	MGMTD_BE_CLIENT_DBG("Sending CFGDATA_CREATE_REPLY txn-id: %" PRIu64
-			    " batch-id: %" PRIu64,
-			    txn_id, batch_id);
+	debug_be_client("Sending CFGDATA_CREATE_REPLY txn-id: %" PRIu64, txn_id);
 
 	return mgmt_be_client_send_msg(client_ctx, &be_msg);
 }
@@ -373,9 +432,8 @@ static void mgmt_be_txn_cfg_abort(struct mgmt_be_txn_ctx *txn)
 
 	assert(txn && txn->client);
 	if (txn->nb_txn) {
-		MGMTD_BE_CLIENT_ERR(
-			"Aborting configs after prep for txn-id: %" PRIu64,
-			txn->txn_id);
+		log_err_be_client("Aborting configs after prep for txn-id: %" PRIu64,
+				  txn->txn_id);
 		nb_candidate_commit_abort(txn->nb_txn, errmsg, sizeof(errmsg));
 		txn->nb_txn = 0;
 	}
@@ -386,9 +444,8 @@ static void mgmt_be_txn_cfg_abort(struct mgmt_be_txn_ctx *txn)
 	 * This is one txn ctx but the candidate_config is per client ctx, how
 	 * does that work?
 	 */
-	MGMTD_BE_CLIENT_DBG(
-		"Reset candidate configurations after abort of txn-id: %" PRIu64,
-		txn->txn_id);
+	debug_be_client("Reset candidate configurations after abort of txn-id: %" PRIu64,
+			txn->txn_id);
 	nb_config_replace(txn->client->candidate_config,
 			  txn->client->running_config, true);
 }
@@ -433,15 +490,12 @@ static int mgmt_be_txn_cfg_prepare(struct mgmt_be_txn_ctx *txn)
 				client_ctx->candidate_config,
 				txn_req->req.set_cfg.cfg_changes,
 				(size_t)txn_req->req.set_cfg.num_cfg_changes,
-				NULL, NULL, 0, err_buf, sizeof(err_buf),
-				&error);
+				NULL, true, err_buf, sizeof(err_buf), &error);
 			if (error) {
 				err_buf[sizeof(err_buf) - 1] = 0;
-				MGMTD_BE_CLIENT_ERR(
-					"Failed to update configs for txn-id: %" PRIu64
-					" batch-id: %" PRIu64
-					" to candidate, err: '%s'",
-					txn->txn_id, batch->batch_id, err_buf);
+				log_err_be_client("Failed to update configs for txn-id: %" PRIu64
+						  " to candidate, err: '%s'",
+						  txn->txn_id, err_buf);
 				return -1;
 			}
 			gettimeofday(&edit_nb_cfg_end, NULL);
@@ -479,21 +533,19 @@ static int mgmt_be_txn_cfg_prepare(struct mgmt_be_txn_ctx *txn)
 	if (err != NB_OK) {
 		err_buf[sizeof(err_buf) - 1] = 0;
 		if (err == NB_ERR_VALIDATION)
-			MGMTD_BE_CLIENT_ERR(
-				"Failed to validate configs txn-id: %" PRIu64
-				" %zu batches, err: '%s'",
-				txn->txn_id, num_processed, err_buf);
+			log_err_be_client("Failed to validate configs txn-id: %" PRIu64
+					  " %zu batches, err: '%s'",
+					  txn->txn_id, num_processed, err_buf);
 		else
-			MGMTD_BE_CLIENT_ERR(
-				"Failed to prepare configs for txn-id: %" PRIu64
-				" %zu batches, err: '%s'",
-				txn->txn_id, num_processed, err_buf);
+			log_err_be_client("Failed to prepare configs for txn-id: %" PRIu64
+					  " %zu batches, err: '%s'",
+					  txn->txn_id, num_processed, err_buf);
 		error = true;
 		SET_FLAG(txn->flags, MGMTD_BE_TXN_FLAGS_CFGPREP_FAILED);
 	} else
-		MGMTD_BE_CLIENT_DBG("Prepared configs for txn-id: %" PRIu64
-				    " %zu batches",
-				    txn->txn_id, num_processed);
+		debug_be_client("Prepared configs for txn-id: %" PRIu64
+				" %zu batches",
+				txn->txn_id, num_processed);
 
 	gettimeofday(&prep_nb_cfg_end, NULL);
 	prep_nb_cfg_tm = timeval_elapsed(prep_nb_cfg_end, prep_nb_cfg_start);
@@ -504,9 +556,6 @@ static int mgmt_be_txn_cfg_prepare(struct mgmt_be_txn_ctx *txn)
 	client_ctx->num_prep_nb_cfg++;
 
 	FOREACH_BE_TXN_BATCH_IN_LIST (txn, batch) {
-		mgmt_be_send_cfgdata_create_reply(
-			client_ctx, txn->txn_id, batch->batch_id,
-			error ? false : true, error ? err_buf : NULL);
 		if (!error) {
 			SET_FLAG(batch->flags,
 				 MGMTD_BE_BATCH_FLAGS_CFG_PREPARED);
@@ -515,10 +564,12 @@ static int mgmt_be_txn_cfg_prepare(struct mgmt_be_txn_ctx *txn)
 		}
 	}
 
-	MGMTD_BE_CLIENT_DBG(
-		"Avg-nb-edit-duration %lu uSec, nb-prep-duration %lu (avg: %lu) uSec, batch size %u",
-		client_ctx->avg_edit_nb_cfg_tm, prep_nb_cfg_tm,
-		client_ctx->avg_prep_nb_cfg_tm, (uint32_t)num_processed);
+	mgmt_be_send_cfgdata_create_reply(client_ctx, txn->txn_id,
+		error ? false : true, error ? err_buf : NULL);
+
+	debug_be_client("Avg-nb-edit-duration %lu uSec, nb-prep-duration %lu (avg: %lu) uSec, batch size %u",
+			client_ctx->avg_edit_nb_cfg_tm, prep_nb_cfg_tm,
+			client_ctx->avg_prep_nb_cfg_tm, (uint32_t)num_processed);
 
 	if (error)
 		mgmt_be_txn_cfg_abort(txn);
@@ -531,7 +582,6 @@ static int mgmt_be_txn_cfg_prepare(struct mgmt_be_txn_ctx *txn)
  */
 static int mgmt_be_update_setcfg_in_batch(struct mgmt_be_client *client_ctx,
 					  struct mgmt_be_txn_ctx *txn,
-					  uint64_t batch_id,
 					  Mgmtd__YangCfgDataReq *cfg_req[],
 					  int num_req)
 {
@@ -540,27 +590,39 @@ static int mgmt_be_update_setcfg_in_batch(struct mgmt_be_client *client_ctx,
 	int index;
 	struct nb_cfg_change *cfg_chg;
 
-	batch = mgmt_be_batch_create(txn, batch_id);
-	if (!batch) {
-		MGMTD_BE_CLIENT_ERR("Batch create failed!");
-		return -1;
-	}
+	batch = mgmt_be_batch_create(txn);
+	assert(batch);
 
 	txn_req = &batch->txn_req;
 	txn_req->event = MGMTD_BE_TXN_PROC_SETCFG;
-	MGMTD_BE_CLIENT_DBG("Created SETCFG request for batch-id: %" PRIu64
-			    " txn-id: %" PRIu64 " cfg-items:%d",
-			    batch_id, txn->txn_id, num_req);
+	debug_be_client("Created SETCFG request for txn-id: %" PRIu64
+			" cfg-items:%d",
+			txn->txn_id, num_req);
 
 	txn_req->req.set_cfg.num_cfg_changes = num_req;
 	for (index = 0; index < num_req; index++) {
 		cfg_chg = &txn_req->req.set_cfg.cfg_changes[index];
 
-		if (cfg_req[index]->req_type
-		    == MGMTD__CFG_DATA_REQ_TYPE__DELETE_DATA)
+		/*
+		 * Treat all operations as destroy or modify, because we don't
+		 * need additional existence checks on the backend. Everything
+		 * is already checked by mgmtd.
+		 */
+		switch (cfg_req[index]->req_type) {
+		case MGMTD__CFG_DATA_REQ_TYPE__DELETE_DATA:
+		case MGMTD__CFG_DATA_REQ_TYPE__REMOVE_DATA:
 			cfg_chg->operation = NB_OP_DESTROY;
-		else
-			cfg_chg->operation = NB_OP_CREATE;
+			break;
+		case MGMTD__CFG_DATA_REQ_TYPE__SET_DATA:
+		case MGMTD__CFG_DATA_REQ_TYPE__CREATE_DATA:
+		case MGMTD__CFG_DATA_REQ_TYPE__REPLACE_DATA:
+			cfg_chg->operation = NB_OP_MODIFY;
+			break;
+		case MGMTD__CFG_DATA_REQ_TYPE__REQ_TYPE_NONE:
+		case _MGMTD__CFG_DATA_REQ_TYPE_IS_INT_SIZE:
+		default:
+			continue;
+		}
 
 		strlcpy(cfg_chg->xpath, cfg_req[index]->data->xpath,
 			sizeof(cfg_chg->xpath));
@@ -584,7 +646,7 @@ static int mgmt_be_update_setcfg_in_batch(struct mgmt_be_client *client_ctx,
 }
 
 static int mgmt_be_process_cfgdata_req(struct mgmt_be_client *client_ctx,
-				       uint64_t txn_id, uint64_t batch_id,
+				       uint64_t txn_id,
 				       Mgmtd__YangCfgDataReq *cfg_req[],
 				       int num_req, bool end_of_data)
 {
@@ -594,11 +656,10 @@ static int mgmt_be_process_cfgdata_req(struct mgmt_be_client *client_ctx,
 	if (!txn)
 		goto failed;
 
-	mgmt_be_update_setcfg_in_batch(client_ctx, txn, batch_id, cfg_req,
-				       num_req);
+	mgmt_be_update_setcfg_in_batch(client_ctx, txn, cfg_req, num_req);
 
 	if (txn && end_of_data) {
-		MGMTD_BE_CLIENT_DBG("End of data; CFG_PREPARE_REQ processing");
+		debug_be_client("End of data; CFG_PREPARE_REQ processing");
 		if (mgmt_be_txn_cfg_prepare(txn))
 			goto failed;
 	}
@@ -610,8 +671,7 @@ failed:
 }
 
 static int mgmt_be_send_apply_reply(struct mgmt_be_client *client_ctx,
-				    uint64_t txn_id, uint64_t batch_ids[],
-				    size_t num_batch_ids, bool success,
+				    uint64_t txn_id, bool success,
 				    const char *error_if_any)
 {
 	Mgmtd__BeMessage be_msg;
@@ -620,8 +680,6 @@ static int mgmt_be_send_apply_reply(struct mgmt_be_client *client_ctx,
 	mgmtd__be_cfg_data_apply_reply__init(&apply_reply);
 	apply_reply.success = success;
 	apply_reply.txn_id = txn_id;
-	apply_reply.batch_ids = (uint64_t *)batch_ids;
-	apply_reply.n_batch_ids = num_batch_ids;
 
 	if (error_if_any)
 		apply_reply.error_if_any = (char *)error_if_any;
@@ -630,12 +688,7 @@ static int mgmt_be_send_apply_reply(struct mgmt_be_client *client_ctx,
 	be_msg.message_case = MGMTD__BE_MESSAGE__MESSAGE_CFG_APPLY_REPLY;
 	be_msg.cfg_apply_reply = &apply_reply;
 
-	MGMTD_BE_CLIENT_DBG(
-		"Sending CFG_APPLY_REPLY txn-id %" PRIu64
-		" %zu batch ids %" PRIu64 " - %" PRIu64,
-		txn_id, num_batch_ids,
-		success && num_batch_ids ? batch_ids[0] : 0,
-		success && num_batch_ids ? batch_ids[num_batch_ids - 1] : 0);
+	debug_be_client("Sending CFG_APPLY_REPLY txn-id %" PRIu64, txn_id);
 
 	return mgmt_be_client_send_msg(client_ctx, &be_msg);
 }
@@ -648,14 +701,11 @@ static int mgmt_be_txn_proc_cfgapply(struct mgmt_be_txn_ctx *txn)
 	unsigned long apply_nb_cfg_tm;
 	struct mgmt_be_batch_ctx *batch;
 	char err_buf[BUFSIZ];
-	size_t num_processed;
-	static uint64_t batch_ids[MGMTD_BE_MAX_BATCH_IDS_IN_REQ];
 
 	assert(txn && txn->client);
 	client_ctx = txn->client;
 
 	assert(txn->nb_txn);
-	num_processed = 0;
 
 	/*
 	 * Now apply all the batches we have applied in one go.
@@ -673,9 +723,6 @@ static int mgmt_be_txn_proc_cfgapply(struct mgmt_be_txn_ctx *txn)
 	client_ctx->num_apply_nb_cfg++;
 	txn->nb_txn = NULL;
 
-	/*
-	 * Send back CFG_APPLY_REPLY for all batches applied.
-	 */
 	FOREACH_BE_APPLY_BATCH_IN_LIST (txn, batch) {
 		/*
 		 * No need to delete the batch yet. Will be deleted during
@@ -684,22 +731,12 @@ static int mgmt_be_txn_proc_cfgapply(struct mgmt_be_txn_ctx *txn)
 		SET_FLAG(batch->flags, MGMTD_BE_TXN_FLAGS_CFG_APPLIED);
 		mgmt_be_batches_del(&txn->apply_cfgs, batch);
 		mgmt_be_batches_add_tail(&txn->cfg_batches, batch);
-
-		batch_ids[num_processed] = batch->batch_id;
-		num_processed++;
-		if (num_processed == MGMTD_BE_MAX_BATCH_IDS_IN_REQ) {
-			mgmt_be_send_apply_reply(client_ctx, txn->txn_id,
-						    batch_ids, num_processed,
-						    true, NULL);
-			num_processed = 0;
-		}
 	}
 
-	mgmt_be_send_apply_reply(client_ctx, txn->txn_id, batch_ids,
-				    num_processed, true, NULL);
+	mgmt_be_send_apply_reply(client_ctx, txn->txn_id, true, NULL);
 
-	MGMTD_BE_CLIENT_DBG("Nb-apply-duration %lu (avg: %lu) uSec",
-			    apply_nb_cfg_tm, client_ctx->avg_apply_nb_cfg_tm);
+	debug_be_client("Nb-apply-duration %lu (avg: %lu) uSec",
+			apply_nb_cfg_tm, client_ctx->avg_apply_nb_cfg_tm);
 
 	return 0;
 }
@@ -713,7 +750,7 @@ static int mgmt_be_process_cfg_apply(struct mgmt_be_client *client_ctx,
 	if (!txn)
 		goto failed;
 
-	MGMTD_BE_CLIENT_DBG("Trigger CFG_APPLY_REQ processing");
+	debug_be_client("Trigger CFG_APPLY_REQ processing");
 	if (mgmt_be_txn_proc_cfgapply(txn))
 		goto failed;
 
@@ -736,50 +773,45 @@ static int mgmt_be_client_handle_msg(struct mgmt_be_client *client_ctx,
 	 */
 	switch ((int)be_msg->message_case) {
 	case MGMTD__BE_MESSAGE__MESSAGE_SUBSCR_REPLY:
-		MGMTD_BE_CLIENT_DBG("Got SUBSCR_REPLY success %u",
-				    be_msg->subscr_reply->success);
+		debug_be_client("Got SUBSCR_REPLY success %u",
+				be_msg->subscr_reply->success);
+
+		if (client_ctx->cbs.subscr_done)
+			(*client_ctx->cbs.subscr_done)(client_ctx,
+						       client_ctx->user_data,
+						       be_msg->subscr_reply
+							       ->success);
 		break;
 	case MGMTD__BE_MESSAGE__MESSAGE_TXN_REQ:
-		MGMTD_BE_CLIENT_DBG("Got TXN_REQ %s txn-id: %" PRIu64,
-				    be_msg->txn_req->create ? "Create"
-							    : "Delete",
-				    be_msg->txn_req->txn_id);
+		debug_be_client("Got TXN_REQ %s txn-id: %" PRIu64,
+				be_msg->txn_req->create ? "Create" : "Delete",
+				be_msg->txn_req->txn_id);
 		mgmt_be_process_txn_req(client_ctx,
 					    be_msg->txn_req->txn_id,
 					    be_msg->txn_req->create);
 		break;
 	case MGMTD__BE_MESSAGE__MESSAGE_CFG_DATA_REQ:
-		MGMTD_BE_CLIENT_DBG("Got CFG_DATA_REQ txn-id: %" PRIu64
-				    " batch-id: %" PRIu64 " end-of-data %u",
-				    be_msg->cfg_data_req->txn_id,
-				    be_msg->cfg_data_req->batch_id,
-				    be_msg->cfg_data_req->end_of_data);
+		debug_be_client("Got CFG_DATA_REQ txn-id: %" PRIu64
+				" end-of-data %u",
+				be_msg->cfg_data_req->txn_id,
+				be_msg->cfg_data_req->end_of_data);
 		mgmt_be_process_cfgdata_req(
 			client_ctx, be_msg->cfg_data_req->txn_id,
-			be_msg->cfg_data_req->batch_id,
 			be_msg->cfg_data_req->data_req,
 			be_msg->cfg_data_req->n_data_req,
 			be_msg->cfg_data_req->end_of_data);
 		break;
 	case MGMTD__BE_MESSAGE__MESSAGE_CFG_APPLY_REQ:
-		MGMTD_BE_CLIENT_DBG("Got CFG_APPLY_REQ txn-id: %" PRIu64,
-				    be_msg->cfg_data_req->txn_id);
+		debug_be_client("Got CFG_APPLY_REQ txn-id: %" PRIu64,
+				be_msg->cfg_data_req->txn_id);
 		mgmt_be_process_cfg_apply(
 			client_ctx, (uint64_t)be_msg->cfg_apply_req->txn_id);
 		break;
-	case MGMTD__BE_MESSAGE__MESSAGE_GET_REQ:
-		MGMTD_BE_CLIENT_ERR("Got unhandled message type %u",
-				    be_msg->message_case);
-		/*
-		 * TODO: Add handling code in future.
-		 */
-		break;
 	/*
 	 * NOTE: The following messages are always sent from Backend
 	 * clients to MGMTd only and/or need not be handled here.
 	 */
 	case MGMTD__BE_MESSAGE__MESSAGE_SUBSCR_REQ:
-	case MGMTD__BE_MESSAGE__MESSAGE_GET_REPLY:
 	case MGMTD__BE_MESSAGE__MESSAGE_TXN_REPLY:
 	case MGMTD__BE_MESSAGE__MESSAGE_CFG_DATA_REPLY:
 	case MGMTD__BE_MESSAGE__MESSAGE_CFG_APPLY_REPLY:
@@ -797,6 +829,167 @@ static int mgmt_be_client_handle_msg(struct mgmt_be_client *client_ctx,
 	return 0;
 }
 
+struct be_client_tree_data_batch_args {
+	struct mgmt_be_client *client;
+	uint64_t txn_id;
+	uint64_t req_id;
+	LYD_FORMAT result_type;
+};
+
+/*
+ * Process the get-tree request on our local oper state
+ */
+static enum nb_error be_client_send_tree_data_batch(const struct lyd_node *tree,
+						    void *arg, enum nb_error ret)
+{
+	struct be_client_tree_data_batch_args *args = arg;
+	struct mgmt_be_client *client = args->client;
+	struct mgmt_msg_tree_data *tree_msg = NULL;
+	bool more = false;
+	uint8_t **darrp;
+	LY_ERR err;
+
+	if (ret == NB_YIELD) {
+		more = true;
+		ret = NB_OK;
+	}
+	if (ret != NB_OK)
+		goto done;
+
+	tree_msg = mgmt_msg_native_alloc_msg(struct mgmt_msg_tree_data, 0,
+					     MTYPE_MSG_NATIVE_TREE_DATA);
+	tree_msg->refer_id = args->txn_id;
+	tree_msg->req_id = args->req_id;
+	tree_msg->code = MGMT_MSG_CODE_TREE_DATA;
+	tree_msg->result_type = args->result_type;
+	tree_msg->more = more;
+
+	darrp = mgmt_msg_native_get_darrp(tree_msg);
+	err = yang_print_tree_append(darrp, tree, args->result_type,
+				     (LYD_PRINT_SHRINK | LYD_PRINT_WD_EXPLICIT |
+				      LYD_PRINT_WITHSIBLINGS));
+	if (err) {
+		ret = NB_ERR;
+		goto done;
+	}
+	(void)be_client_send_native_msg(client, tree_msg,
+					mgmt_msg_native_get_msg_len(tree_msg),
+					false);
+done:
+	mgmt_msg_native_free_msg(tree_msg);
+	if (ret)
+		be_client_send_error(client, args->txn_id, args->req_id, false,
+				     -EINVAL,
+				     "BE client %s txn-id %" PRIu64
+				     " error fetching oper state %d",
+				     client->name, args->txn_id, ret);
+	if (ret != NB_OK || !more)
+		XFREE(MTYPE_MGMTD_BE_GT_CB_ARGS, args);
+	return ret;
+}
+
+/*
+ * Process the get-tree request on our local oper state
+ */
+static void be_client_handle_get_tree(struct mgmt_be_client *client,
+				      uint64_t txn_id, void *msgbuf,
+				      size_t msg_len)
+{
+	struct mgmt_msg_get_tree *get_tree_msg = msgbuf;
+	struct be_client_tree_data_batch_args *args;
+
+	debug_be_client("Received get-tree request for client %s txn-id %" PRIu64
+			" req-id %" PRIu64,
+			client->name, txn_id, get_tree_msg->req_id);
+
+	/* NOTE: removed the translator, if put back merge with northbound_cli
+	 * code
+	 */
+
+	args = XMALLOC(MTYPE_MGMTD_BE_GT_CB_ARGS, sizeof(*args));
+	args->client = client;
+	args->txn_id = get_tree_msg->refer_id;
+	args->req_id = get_tree_msg->req_id;
+	args->result_type = get_tree_msg->result_type;
+	nb_oper_walk(get_tree_msg->xpath, NULL, 0, true, NULL, NULL,
+		   be_client_send_tree_data_batch, args);
+}
+
+/*
+ * Process the notification.
+ */
+static void be_client_handle_notify(struct mgmt_be_client *client, void *msgbuf,
+				    size_t msg_len)
+{
+	struct mgmt_msg_notify_data *notif_msg = msgbuf;
+	struct nb_node *nb_node;
+	struct lyd_node *dnode;
+	const char *data;
+	const char *notif;
+	LY_ERR err;
+
+	debug_be_client("Received notification for client %s", client->name);
+
+	notif = mgmt_msg_native_xpath_data_decode(notif_msg, msg_len, data);
+	if (!notif || !data) {
+		log_err_be_client("Corrupt notify msg");
+		return;
+	}
+
+	nb_node = nb_node_find(notif);
+	if (!nb_node) {
+		log_err_be_client("No schema found for notification: %s", notif);
+		return;
+	}
+
+	if (!nb_node->cbs.notify) {
+		debug_be_client("No notification callback for: %s", notif);
+		return;
+	}
+
+	err = yang_parse_notification(notif, notif_msg->result_type, data,
+				      &dnode);
+	if (err) {
+		log_err_be_client("Can't parse notification data for: %s",
+				  notif);
+		return;
+	}
+
+	nb_callback_notify(nb_node, notif, dnode);
+
+	lyd_free_all(dnode);
+}
+
+/*
+ * Handle a native encoded message
+ *
+ * We don't create transactions with native messaging.
+ */
+static void be_client_handle_native_msg(struct mgmt_be_client *client,
+					struct mgmt_msg_header *msg,
+					size_t msg_len)
+{
+	uint64_t txn_id = msg->refer_id;
+
+	switch (msg->code) {
+	case MGMT_MSG_CODE_GET_TREE:
+		be_client_handle_get_tree(client, txn_id, msg, msg_len);
+		break;
+	case MGMT_MSG_CODE_NOTIFY:
+		be_client_handle_notify(client, msg, msg_len);
+		break;
+	default:
+		log_err_be_client("unknown native message txn-id %" PRIu64
+				  " req-id %" PRIu64 " code %u to client %s",
+				  txn_id, msg->req_id, msg->code, client->name);
+		be_client_send_error(client, msg->refer_id, msg->req_id, false,
+				     -1,
+				     "BE client %s recv msg unknown txn-id %" PRIu64,
+				     client->name, txn_id);
+		break;
+	}
+}
+
 static void mgmt_be_client_process_msg(uint8_t version, uint8_t *data,
 				       size_t len, struct msg_conn *conn)
 {
@@ -807,43 +1000,53 @@ static void mgmt_be_client_process_msg(uint8_t version, uint8_t *data,
 	client = container_of(conn, struct msg_client, conn);
 	client_ctx = container_of(client, struct mgmt_be_client, client);
 
+	if (version == MGMT_MSG_VERSION_NATIVE) {
+		struct mgmt_msg_header *msg = (typeof(msg))data;
+
+		if (len >= sizeof(*msg))
+			be_client_handle_native_msg(client_ctx, msg, len);
+		else
+			log_err_be_client("native message to client %s too short %zu",
+					  client_ctx->name, len);
+		return;
+	}
+
 	be_msg = mgmtd__be_message__unpack(NULL, len, data);
 	if (!be_msg) {
-		MGMTD_BE_CLIENT_DBG("Failed to decode %zu bytes from server",
-				    len);
+		debug_be_client("Failed to decode %zu bytes from server", len);
 		return;
 	}
-	MGMTD_BE_CLIENT_DBG(
-		"Decoded %zu bytes of message(msg: %u/%u) from server", len,
-		be_msg->message_case, be_msg->message_case);
+	debug_be_client("Decoded %zu bytes of message(msg: %u/%u) from server",
+			len, be_msg->message_case, be_msg->message_case);
 	(void)mgmt_be_client_handle_msg(client_ctx, be_msg);
 	mgmtd__be_message__free_unpacked(be_msg, NULL);
 }
 
 int mgmt_be_send_subscr_req(struct mgmt_be_client *client_ctx,
-			    bool subscr_xpaths, int num_xpaths,
-			    char **reg_xpaths)
+			    int n_config_xpaths, char **config_xpaths,
+			    int n_oper_xpaths, char **oper_xpaths)
 {
 	Mgmtd__BeMessage be_msg;
 	Mgmtd__BeSubscribeReq subscr_req;
 
 	mgmtd__be_subscribe_req__init(&subscr_req);
 	subscr_req.client_name = client_ctx->name;
-	subscr_req.n_xpath_reg = num_xpaths;
-	if (num_xpaths)
-		subscr_req.xpath_reg = reg_xpaths;
-	else
-		subscr_req.xpath_reg = NULL;
-	subscr_req.subscribe_xpaths = subscr_xpaths;
+	subscr_req.n_config_xpaths = n_config_xpaths;
+	subscr_req.config_xpaths = config_xpaths;
+	subscr_req.n_oper_xpaths = n_oper_xpaths;
+	subscr_req.oper_xpaths = oper_xpaths;
+
+	/* See if we should register for notifications */
+	subscr_req.n_notif_xpaths = client_ctx->cbs.nnotif_xpaths;
+	subscr_req.notif_xpaths = (char **)client_ctx->cbs.notif_xpaths;
 
 	mgmtd__be_message__init(&be_msg);
 	be_msg.message_case = MGMTD__BE_MESSAGE__MESSAGE_SUBSCR_REQ;
 	be_msg.subscr_req = &subscr_req;
 
-	MGMTD_FE_CLIENT_DBG(
-		"Sending SUBSCR_REQ name: %s subscr_xpaths: %u num_xpaths: %zu",
-		subscr_req.client_name, subscr_req.subscribe_xpaths,
-		subscr_req.n_xpath_reg);
+	debug_be_client("Sending SUBSCR_REQ name: %s xpaths: config %zu oper: %zu notif: %zu",
+			subscr_req.client_name, subscr_req.n_config_xpaths,
+			subscr_req.n_oper_xpaths, subscr_req.n_notif_xpaths);
 
 	return mgmt_be_client_send_msg(client_ctx, &be_msg);
 }
@@ -857,15 +1060,16 @@ static int _notify_conenct_disconnect(struct msg_client *msg_client,
 
 	if (connected) {
 		assert(msg_client->conn.fd != -1);
-		ret = mgmt_be_send_subscr_req(client, false, 0, NULL);
+		ret = mgmt_be_send_subscr_req(client, 0, NULL, 0, NULL);
 		if (ret)
 			return ret;
 	}
 
 	/* Notify BE client through registered callback (if any) */
 	if (client->cbs.client_connect_notify)
-		(void)(*client->cbs.client_connect_notify)(
-			client, client->user_data, connected);
+		(void)(*client->cbs.client_connect_notify)(client,
+							   client->user_data,
+							   connected);
 
 	/* Cleanup any in-progress TXN on disconnect */
 	if (!connected)
@@ -890,44 +1094,48 @@ static int mgmt_be_client_notify_disconenct(struct msg_conn *conn)
  * Debug Flags
  */
 
-DEFPY(debug_mgmt_client_be, debug_mgmt_client_be_cmd,
-      "[no] debug mgmt client backend",
-      NO_STR DEBUG_STR MGMTD_STR
-      "client\n"
-      "backend\n")
+static void mgmt_debug_client_be_set(uint32_t flags, bool set)
 {
-	uint32_t mode = DEBUG_NODE2MODE(vty->node);
+	DEBUG_FLAGS_SET(&mgmt_dbg_be_client, flags, set);
 
-	DEBUG_MODE_SET(&mgmt_dbg_be_client, mode, !no);
+	if (!__be_client)
+		return;
 
-	return CMD_SUCCESS;
+	__be_client->client.conn.debug = DEBUG_MODE_CHECK(&mgmt_dbg_be_client,
+							  DEBUG_MODE_ALL);
 }
 
-static void mgmt_debug_client_be_set_all(uint32_t flags, bool set)
+DEFPY(debug_mgmt_client_be, debug_mgmt_client_be_cmd,
+      "[no] debug mgmt client backend",
+      NO_STR DEBUG_STR MGMTD_STR "client\n"
+				 "backend\n")
 {
-	DEBUG_FLAGS_SET(&mgmt_dbg_be_client, flags, set);
+	mgmt_debug_client_be_set(DEBUG_NODE2MODE(vty->node), !no);
+
+	return CMD_SUCCESS;
 }
 
 static int mgmt_debug_be_client_config_write(struct vty *vty)
 {
 	if (DEBUG_MODE_CHECK(&mgmt_dbg_be_client, DEBUG_MODE_CONF))
-		vty_out(vty, "debug mgmt client frontend\n");
+		vty_out(vty, "debug mgmt client backend\n");
 
 	return 1;
 }
 
 void mgmt_debug_be_client_show_debug(struct vty *vty)
 {
-	if (MGMTD_DBG_BE_CLIENT_CHECK())
+	if (debug_check_be_client())
 		vty_out(vty, "debug mgmt client backend\n");
 }
 
 static struct debug_callbacks mgmt_dbg_be_client_cbs = {
-	.debug_set_all = mgmt_debug_client_be_set_all};
+	.debug_set_all = mgmt_debug_client_be_set
+};
 
 static struct cmd_node mgmt_dbg_node = {
-	.name = "mgmt backend client",
-	.node = DEBUG_NODE,
+	.name = "debug mgmt client backend",
+	.node = MGMT_BE_DEBUG_NODE,
 	.prompt = "",
 	.config_write = mgmt_debug_be_client_config_write,
 };
@@ -937,26 +1145,39 @@ struct mgmt_be_client *mgmt_be_client_create(const char *client_name,
 					     uintptr_t user_data,
 					     struct event_loop *event_loop)
 {
-	struct mgmt_be_client *client =
-		XCALLOC(MTYPE_MGMTD_BE_CLIENT, sizeof(*client));
+	struct mgmt_be_client *client;
+	char server_path[MAXPATHLEN];
+
+	if (__be_client)
+		return NULL;
+
+	client = XCALLOC(MTYPE_MGMTD_BE_CLIENT, sizeof(*client));
+	__be_client = client;
 
 	/* Only call after frr_init() */
 	assert(running_config);
 
 	client->name = XSTRDUP(MTYPE_MGMTD_BE_CLIENT_NAME, client_name);
 	client->running_config = running_config;
-	client->candidate_config = nb_config_new(NULL);
+	client->candidate_config = vty_shared_candidate_config;
 	if (cbs)
 		client->cbs = *cbs;
 	mgmt_be_txns_init(&client->txn_head);
-	msg_client_init(&client->client, event_loop, MGMTD_BE_SERVER_PATH,
+
+	snprintf(server_path, sizeof(server_path), MGMTD_BE_SOCK_NAME);
+
+	msg_client_init(&client->client, event_loop, server_path,
 			mgmt_be_client_notify_conenct,
 			mgmt_be_client_notify_disconenct,
 			mgmt_be_client_process_msg, MGMTD_BE_MAX_NUM_MSG_PROC,
-			MGMTD_BE_MAX_NUM_MSG_WRITE, MGMTD_BE_MSG_MAX_LEN, false,
-			"BE-client", MGMTD_DBG_BE_CLIENT_CHECK());
+			MGMTD_BE_MAX_NUM_MSG_WRITE, MGMTD_BE_MAX_MSG_LEN, false,
+			"BE-client", debug_check_be_client());
+
+	/* Hook to receive notifications */
+	hook_register_arg(nb_notification_tree_send, mgmt_be_send_notification,
+			  client);
 
-	MGMTD_BE_CLIENT_DBG("Initialized client '%s'", client_name);
+	debug_be_client("Initialized client '%s'", client_name);
 
 	return client;
 }
@@ -972,14 +1193,17 @@ void mgmt_be_client_lib_vty_init(void)
 
 void mgmt_be_client_destroy(struct mgmt_be_client *client)
 {
-	MGMTD_BE_CLIENT_DBG("Destroying MGMTD Backend Client '%s'",
-			    client->name);
+	assert(client == __be_client);
 
+	debug_be_client("Destroying MGMTD Backend Client '%s'", client->name);
+
+	nb_oper_cancel_all_walks();
 	msg_client_cleanup(&client->client);
 	mgmt_be_cleanup_all_txns(client);
 	mgmt_be_txns_fini(&client->txn_head);
-	nb_config_free(client->candidate_config);
 
 	XFREE(MTYPE_MGMTD_BE_CLIENT_NAME, client->name);
 	XFREE(MTYPE_MGMTD_BE_CLIENT, client);
+
+	__be_client = NULL;
 }
diff --git a/lib/mgmt_be_client.h b/lib/mgmt_be_client.h
index 4ad5ca5..cd8b237 100644
--- a/lib/mgmt_be_client.h
+++ b/lib/mgmt_be_client.h
@@ -14,52 +14,18 @@ extern "C" {
 
 #include "northbound.h"
 #include "mgmt_pb.h"
-#include "mgmtd/mgmt_defines.h"
-
-/***************************************************************
- * Client IDs
- ***************************************************************/
-
-/*
- * Add enum value for each supported component, wrap with
- * #ifdef HAVE_COMPONENT
- */
-enum mgmt_be_client_id {
-	MGMTD_BE_CLIENT_ID_MIN = 0,
-	MGMTD_BE_CLIENT_ID_INIT = -1,
-#ifdef HAVE_STATICD
-	MGMTD_BE_CLIENT_ID_STATICD,
-#endif
-	MGMTD_BE_CLIENT_ID_MAX
-};
-
-#define FOREACH_MGMTD_BE_CLIENT_ID(id)			\
-	for ((id) = MGMTD_BE_CLIENT_ID_MIN;		\
-	     (id) < MGMTD_BE_CLIENT_ID_MAX; (id)++)
+#include "mgmt_defines.h"
 
 /***************************************************************
  * Constants
  ***************************************************************/
 
-#define MGMTD_BE_CLIENT_ERROR_STRING_MAX_LEN 32
-
-#define MGMTD_BE_DEFAULT_CONN_RETRY_INTVL_SEC 5
-
-#define MGMTD_BE_MSG_PROC_DELAY_USEC 10
-#define MGMTD_BE_MAX_NUM_MSG_PROC 500
-
-#define MGMTD_BE_MSG_WRITE_DELAY_MSEC 1
+#define MGMTD_BE_MAX_NUM_MSG_PROC  500
 #define MGMTD_BE_MAX_NUM_MSG_WRITE 1000
+#define MGMTD_BE_MAX_MSG_LEN	   (64 * 1024)
 
-#define GMGD_BE_MAX_NUM_REQ_ITEMS 64
-
-#define MGMTD_BE_MSG_MAX_LEN 16384
-
-#define MGMTD_SOCKET_BE_SEND_BUF_SIZE 65535
-#define MGMTD_SOCKET_BE_RECV_BUF_SIZE MGMTD_SOCKET_BE_SEND_BUF_SIZE
-
-#define MGMTD_MAX_CFG_CHANGES_IN_BATCH				\
-	((10 * MGMTD_BE_MSG_MAX_LEN) /				\
+#define MGMTD_MAX_CFG_CHANGES_IN_BATCH                                         \
+	((10 * MGMTD_BE_MAX_MSG_LEN) /                                         \
 	 (MGMTD_MAX_XPATH_LEN + MGMTD_MAX_YANG_VALUE_LEN))
 
 /*
@@ -68,11 +34,11 @@ enum mgmt_be_client_id {
  * that gets added to sent message
  */
 #define MGMTD_BE_CFGDATA_PACKING_EFFICIENCY 0.8
-#define MGMTD_BE_CFGDATA_MAX_MSG_LEN                                        \
-	(MGMTD_BE_MSG_MAX_LEN * MGMTD_BE_CFGDATA_PACKING_EFFICIENCY)
+#define MGMTD_BE_CFGDATA_MAX_MSG_LEN                                           \
+	(MGMTD_BE_MAX_MSG_LEN * MGMTD_BE_CFGDATA_PACKING_EFFICIENCY)
 
-#define MGMTD_BE_MAX_BATCH_IDS_IN_REQ                                       \
-	(MGMTD_BE_MSG_MAX_LEN - 128) / sizeof(uint64_t)
+#define MGMTD_BE_MAX_BATCH_IDS_IN_REQ                                          \
+	(MGMTD_BE_MAX_MSG_LEN - 128) / sizeof(uint64_t)
 
 #define MGMTD_BE_CONTAINER_NODE_VAL "<<container>>"
 
@@ -94,55 +60,39 @@ struct mgmt_be_client_txn_ctx {
  * Callbacks:
  *	client_connect_notify: called when connection is made/lost to mgmtd.
  *	txn_notify: called when a txn has been created
+ *	notify_cbs: callbacks for notifications.
+ *	nnotify_cbs: number of notification callbacks.
+ *
  */
 struct mgmt_be_client_cbs {
 	void (*client_connect_notify)(struct mgmt_be_client *client,
 				      uintptr_t usr_data, bool connected);
-
+	void (*subscr_done)(struct mgmt_be_client *client, uintptr_t usr_data,
+			    bool success);
 	void (*txn_notify)(struct mgmt_be_client *client, uintptr_t usr_data,
 			   struct mgmt_be_client_txn_ctx *txn_ctx,
 			   bool destroyed);
+
+	const char **notif_xpaths;
+	uint nnotif_xpaths;
 };
 
 /***************************************************************
  * Global data exported
  ***************************************************************/
 
-extern const char *mgmt_be_client_names[MGMTD_BE_CLIENT_ID_MAX + 1];
-
-static inline const char *mgmt_be_client_id2name(enum mgmt_be_client_id id)
-{
-	if (id > MGMTD_BE_CLIENT_ID_MAX)
-		id = MGMTD_BE_CLIENT_ID_MAX;
-	return mgmt_be_client_names[id];
-}
-
-static inline enum mgmt_be_client_id
-mgmt_be_client_name2id(const char *name)
-{
-	enum mgmt_be_client_id id;
-
-	FOREACH_MGMTD_BE_CLIENT_ID (id) {
-		if (!strncmp(mgmt_be_client_names[id], name,
-			     MGMTD_CLIENT_NAME_MAX_LEN))
-			return id;
-	}
-
-	return MGMTD_BE_CLIENT_ID_MAX;
-}
-
 extern struct debug mgmt_dbg_be_client;
 
 /***************************************************************
  * API prototypes
  ***************************************************************/
 
-#define MGMTD_BE_CLIENT_DBG(fmt, ...)                                          \
+#define debug_be_client(fmt, ...)                                              \
 	DEBUGD(&mgmt_dbg_be_client, "BE-CLIENT: %s: " fmt, __func__,           \
 	       ##__VA_ARGS__)
-#define MGMTD_BE_CLIENT_ERR(fmt, ...)                                          \
+#define log_err_be_client(fmt, ...)                                            \
 	zlog_err("BE-CLIENT: %s: ERROR: " fmt, __func__, ##__VA_ARGS__)
-#define MGMTD_DBG_BE_CLIENT_CHECK()                                            \
+#define debug_check_be_client()                                                \
 	DEBUG_MODE_CHECK(&mgmt_dbg_be_client, DEBUG_MODE_ALL)
 
 /**
@@ -181,7 +131,7 @@ extern void mgmt_debug_be_client_show_debug(struct vty *vty);
  *    The client object.
  *
  * reg_yang_xpaths
- *    Yang xpath(s) that needs to be [un]-subscribed from/to
+ *    Yang xpath(s) that needs to be subscribed to
  *
  * num_xpaths
  *    Number of xpaths
@@ -189,9 +139,9 @@ extern void mgmt_debug_be_client_show_debug(struct vty *vty);
  * Returns:
  *    MGMTD_SUCCESS on success, MGMTD_* otherwise.
  */
-extern int mgmt_be_send_subscr_req(struct mgmt_be_client *client,
-				   bool subscr_xpaths, int num_xpaths,
-				   char **reg_xpaths);
+extern int mgmt_be_send_subscr_req(struct mgmt_be_client *client_ctx,
+				   int n_config_xpaths, char **config_xpaths,
+				   int n_oper_xpaths, char **oper_xpaths);
 
 /*
  * Destroy backend client and cleanup everything.
diff --git a/mgmtd/mgmt_defines.h b/lib/mgmt_defines.h
index 40fa670..b02341e 100644
--- a/mgmtd/mgmt_defines.h
+++ b/lib/mgmt_defines.h
@@ -11,6 +11,9 @@
 
 #include "yang.h"
 
+#define MGMTD_FE_SOCK_NAME "%s/mgmtd_fe.sock", frr_runstatedir
+#define MGMTD_BE_SOCK_NAME "%s/mgmtd_be.sock", frr_runstatedir
+
 #define MGMTD_CLIENT_NAME_MAX_LEN 32
 
 #define MGMTD_MAX_XPATH_LEN XPATH_MAXLEN
@@ -32,27 +35,4 @@ enum mgmt_result {
 	MGMTD_UNKNOWN_FAILURE
 };
 
-enum mgmt_fe_event {
-	MGMTD_FE_SERVER = 1,
-	MGMTD_FE_CONN_READ,
-	MGMTD_FE_CONN_WRITE,
-	MGMTD_FE_PROC_MSG
-};
-
-enum mgmt_be_event {
-	MGMTD_BE_SERVER = 1,
-	MGMTD_BE_CONN_INIT,
-	MGMTD_BE_CONN_READ,
-	MGMTD_BE_CONN_WRITE,
-	MGMTD_BE_PROC_MSG,
-	MGMTD_BE_SCHED_CFG_PREPARE,
-	MGMTD_BE_RESCHED_CFG_PREPARE,
-	MGMTD_BE_SCHED_CFG_APPLY,
-	MGMTD_BE_RESCHED_CFG_APPLY,
-};
-
-#define MGMTD_TXN_ID_NONE 0
-
-#define MGMTD_TXN_BATCH_ID_NONE 0
-
 #endif /* _FRR_MGMTD_DEFINES_H */
diff --git a/lib/mgmt_fe_client.c b/lib/mgmt_fe_client.c
index 7e42e1c..a107582 100644
--- a/lib/mgmt_fe_client.c
+++ b/lib/mgmt_fe_client.c
@@ -12,6 +12,7 @@
 #include "libfrr.h"
 #include "mgmt_fe_client.h"
 #include "mgmt_msg.h"
+#include "mgmt_msg_native.h"
 #include "mgmt_pb.h"
 #include "network.h"
 #include "stream.h"
@@ -47,8 +48,12 @@ struct mgmt_fe_client {
 #define FOREACH_SESSION_IN_LIST(client, session)                               \
 	frr_each_safe (mgmt_sessions, &(client)->sessions, (session))
 
-struct debug mgmt_dbg_fe_client = {0, "Management frontend client operations"};
+struct debug mgmt_dbg_fe_client = {
+	.desc = "Management frontend client operations"
+};
 
+/* NOTE: only one client per proc for now. */
+static struct mgmt_fe_client *__fe_client;
 
 static inline const char *dsid2name(Mgmtd__DatastoreId id)
 {
@@ -74,14 +79,13 @@ mgmt_fe_find_session_by_client_id(struct mgmt_fe_client *client,
 
 	FOREACH_SESSION_IN_LIST (client, session) {
 		if (session->client_id == client_id) {
-			MGMTD_FE_CLIENT_DBG("Found session-id %" PRIu64
-					    " using client-id %" PRIu64,
-					    session->session_id, client_id);
+			debug_fe_client("Found session-id %" PRIu64
+					" using client-id %" PRIu64,
+					session->session_id, client_id);
 			return session;
 		}
 	}
-	MGMTD_FE_CLIENT_DBG("Session not found using client-id %" PRIu64,
-			    client_id);
+	debug_fe_client("Session not found using client-id %" PRIu64, client_id);
 	return NULL;
 }
 
@@ -93,15 +97,14 @@ mgmt_fe_find_session_by_session_id(struct mgmt_fe_client *client,
 
 	FOREACH_SESSION_IN_LIST (client, session) {
 		if (session->session_id == session_id) {
-			MGMTD_FE_CLIENT_DBG(
-				"Found session of client-id %" PRIu64
-				" using session-id %" PRIu64,
-				session->client_id, session_id);
+			debug_fe_client("Found session of client-id %" PRIu64
+					" using session-id %" PRIu64,
+					session->client_id, session_id);
 			return session;
 		}
 	}
-	MGMTD_FE_CLIENT_DBG("Session not found using session-id %" PRIu64,
-			    session_id);
+	debug_fe_client("Session not found using session-id %" PRIu64,
+			session_id);
 	return NULL;
 }
 
@@ -128,8 +131,7 @@ static int mgmt_fe_send_register_req(struct mgmt_fe_client *client)
 	fe_msg.message_case = MGMTD__FE_MESSAGE__MESSAGE_REGISTER_REQ;
 	fe_msg.register_req = &rgstr_req;
 
-	MGMTD_FE_CLIENT_DBG(
-		"Sending REGISTER_REQ message to MGMTD Frontend server");
+	debug_fe_client("Sending REGISTER_REQ message to MGMTD Frontend server");
 
 	return mgmt_fe_client_send_msg(client, &fe_msg, true);
 }
@@ -155,9 +157,8 @@ static int mgmt_fe_send_session_req(struct mgmt_fe_client *client,
 	fe_msg.message_case = MGMTD__FE_MESSAGE__MESSAGE_SESSION_REQ;
 	fe_msg.session_req = &sess_req;
 
-	MGMTD_FE_CLIENT_DBG(
-		"Sending SESSION_REQ %s message for client-id %" PRIu64,
-		create ? "create" : "destroy", session->client_id);
+	debug_fe_client("Sending SESSION_REQ %s message for client-id %" PRIu64,
+			create ? "create" : "destroy", session->client_id);
 
 	return mgmt_fe_client_send_msg(client, &fe_msg, true);
 }
@@ -180,9 +181,8 @@ int mgmt_fe_send_lockds_req(struct mgmt_fe_client *client, uint64_t session_id,
 	fe_msg.message_case = MGMTD__FE_MESSAGE__MESSAGE_LOCKDS_REQ;
 	fe_msg.lockds_req = &lockds_req;
 
-	MGMTD_FE_CLIENT_DBG(
-		"Sending LOCKDS_REQ (%sLOCK) message for DS:%s session-id %" PRIu64,
-		lock ? "" : "UN", dsid2name(ds_id), session_id);
+	debug_fe_client("Sending LOCKDS_REQ (%sLOCK) message for DS:%s session-id %" PRIu64,
+			lock ? "" : "UN", dsid2name(ds_id), session_id);
 
 
 	return mgmt_fe_client_send_msg(client, &fe_msg, scok);
@@ -210,10 +210,9 @@ int mgmt_fe_send_setcfg_req(struct mgmt_fe_client *client, uint64_t session_id,
 	fe_msg.message_case = MGMTD__FE_MESSAGE__MESSAGE_SETCFG_REQ;
 	fe_msg.setcfg_req = &setcfg_req;
 
-	MGMTD_FE_CLIENT_DBG(
-		"Sending SET_CONFIG_REQ message for DS:%s session-id %" PRIu64
-		" (#xpaths:%d)",
-		dsid2name(ds_id), session_id, num_data_reqs);
+	debug_fe_client("Sending SET_CONFIG_REQ message for DS:%s session-id %" PRIu64
+			" (#xpaths:%d)",
+			dsid2name(ds_id), session_id, num_data_reqs);
 
 	return mgmt_fe_client_send_msg(client, &fe_msg, false);
 }
@@ -240,9 +239,8 @@ int mgmt_fe_send_commitcfg_req(struct mgmt_fe_client *client,
 	fe_msg.message_case = MGMTD__FE_MESSAGE__MESSAGE_COMMCFG_REQ;
 	fe_msg.commcfg_req = &commitcfg_req;
 
-	MGMTD_FE_CLIENT_DBG(
-		"Sending COMMIT_CONFIG_REQ message for Src-DS:%s, Dst-DS:%s session-id %" PRIu64,
-		dsid2name(src_ds_id), dsid2name(dest_ds_id), session_id);
+	debug_fe_client("Sending COMMIT_CONFIG_REQ message for Src-DS:%s, Dst-DS:%s session-id %" PRIu64,
+			dsid2name(src_ds_id), dsid2name(dest_ds_id), session_id);
 
 	return mgmt_fe_client_send_msg(client, &fe_msg, false);
 }
@@ -268,10 +266,9 @@ int mgmt_fe_send_get_req(struct mgmt_fe_client *client, uint64_t session_id,
 	fe_msg.message_case = MGMTD__FE_MESSAGE__MESSAGE_GET_REQ;
 	fe_msg.get_req = &getcfg_req;
 
-	MGMTD_FE_CLIENT_DBG("Sending GET_REQ (iscfg %d) message for DS:%s session-id %" PRIu64
-			    " (#xpaths:%d)",
-			    is_config, dsid2name(ds_id), session_id,
-			    num_data_reqs);
+	debug_fe_client("Sending GET_REQ (iscfg %d) message for DS:%s session-id %" PRIu64
+			" (#xpaths:%d)",
+			is_config, dsid2name(ds_id), session_id, num_data_reqs);
 
 	return mgmt_fe_client_send_msg(client, &fe_msg, false);
 }
@@ -300,6 +297,39 @@ int mgmt_fe_send_regnotify_req(struct mgmt_fe_client *client,
 	return mgmt_fe_client_send_msg(client, &fe_msg, false);
 }
 
+/*
+ * Send get-data request.
+ */
+int mgmt_fe_send_get_data_req(struct mgmt_fe_client *client,
+			      uint64_t session_id, uint64_t req_id,
+			      uint8_t datastore, LYD_FORMAT result_type,
+			      uint8_t flags, uint8_t defaults, const char *xpath)
+{
+	struct mgmt_msg_get_data *msg;
+	size_t xplen = strlen(xpath);
+	int ret;
+
+	msg = mgmt_msg_native_alloc_msg(struct mgmt_msg_get_data, xplen + 1,
+					MTYPE_MSG_NATIVE_GET_DATA);
+	msg->refer_id = session_id;
+	msg->req_id = req_id;
+	msg->code = MGMT_MSG_CODE_GET_DATA;
+	msg->result_type = result_type;
+	msg->flags = flags;
+	msg->defaults = defaults;
+	msg->datastore = datastore;
+	strlcpy(msg->xpath, xpath, xplen + 1);
+
+	debug_fe_client("Sending GET_DATA_REQ session-id %" PRIu64
+			" req-id %" PRIu64 " xpath: %s",
+			session_id, req_id, xpath);
+
+	ret = mgmt_msg_native_send_msg(&client->client.conn, msg, false);
+	mgmt_msg_native_free_msg(msg);
+	return ret;
+}
+
+
 static int mgmt_fe_client_handle_msg(struct mgmt_fe_client *client,
 				     Mgmtd__FeMessage *fe_msg)
 {
@@ -313,30 +343,28 @@ static int mgmt_fe_client_handle_msg(struct mgmt_fe_client *client,
 	case MGMTD__FE_MESSAGE__MESSAGE_SESSION_REPLY:
 		if (fe_msg->session_reply->create &&
 		    fe_msg->session_reply->has_client_conn_id) {
-			MGMTD_FE_CLIENT_DBG(
-				"Got SESSION_REPLY (create) for client-id %" PRIu64
-				" with session-id: %" PRIu64,
-				fe_msg->session_reply->client_conn_id,
-				fe_msg->session_reply->session_id);
+			debug_fe_client("Got SESSION_REPLY (create) for client-id %" PRIu64
+					" with session-id: %" PRIu64,
+					fe_msg->session_reply->client_conn_id,
+					fe_msg->session_reply->session_id);
 
 			session = mgmt_fe_find_session_by_client_id(
 				client, fe_msg->session_reply->client_conn_id);
 
 			if (session && fe_msg->session_reply->success) {
-				MGMTD_FE_CLIENT_DBG(
-					"Session Created for client-id %" PRIu64,
-					fe_msg->session_reply->client_conn_id);
+				debug_fe_client("Session Created for client-id %" PRIu64,
+						fe_msg->session_reply
+							->client_conn_id);
 				session->session_id =
 					fe_msg->session_reply->session_id;
 			} else {
-				MGMTD_FE_CLIENT_ERR(
+				log_err_fe_client(
 					"Session Create failed for client-id %" PRIu64,
 					fe_msg->session_reply->client_conn_id);
 			}
 		} else if (!fe_msg->session_reply->create) {
-			MGMTD_FE_CLIENT_DBG(
-				"Got SESSION_REPLY (destroy) for session-id %" PRIu64,
-				fe_msg->session_reply->session_id);
+			debug_fe_client("Got SESSION_REPLY (destroy) for session-id %" PRIu64,
+					fe_msg->session_reply->session_id);
 
 			session = mgmt_fe_find_session_by_session_id(
 				client, fe_msg->session_req->session_id);
@@ -353,8 +381,8 @@ static int mgmt_fe_client_handle_msg(struct mgmt_fe_client *client,
 				session->user_ctx);
 		break;
 	case MGMTD__FE_MESSAGE__MESSAGE_LOCKDS_REPLY:
-		MGMTD_FE_CLIENT_DBG("Got LOCKDS_REPLY for session-id %" PRIu64,
-				    fe_msg->lockds_reply->session_id);
+		debug_fe_client("Got LOCKDS_REPLY for session-id %" PRIu64,
+				fe_msg->lockds_reply->session_id);
 		session = mgmt_fe_find_session_by_session_id(
 			client, fe_msg->lockds_reply->session_id);
 
@@ -370,8 +398,8 @@ static int mgmt_fe_client_handle_msg(struct mgmt_fe_client *client,
 				fe_msg->lockds_reply->error_if_any);
 		break;
 	case MGMTD__FE_MESSAGE__MESSAGE_SETCFG_REPLY:
-		MGMTD_FE_CLIENT_DBG("Got SETCFG_REPLY for session-id %" PRIu64,
-				    fe_msg->setcfg_reply->session_id);
+		debug_fe_client("Got SETCFG_REPLY for session-id %" PRIu64,
+				fe_msg->setcfg_reply->session_id);
 
 		session = mgmt_fe_find_session_by_session_id(
 			client, fe_msg->setcfg_reply->session_id);
@@ -388,8 +416,8 @@ static int mgmt_fe_client_handle_msg(struct mgmt_fe_client *client,
 				fe_msg->setcfg_reply->error_if_any);
 		break;
 	case MGMTD__FE_MESSAGE__MESSAGE_COMMCFG_REPLY:
-		MGMTD_FE_CLIENT_DBG("Got COMMCFG_REPLY for session-id %" PRIu64,
-				    fe_msg->commcfg_reply->session_id);
+		debug_fe_client("Got COMMCFG_REPLY for session-id %" PRIu64,
+				fe_msg->commcfg_reply->session_id);
 
 		session = mgmt_fe_find_session_by_session_id(
 			client, fe_msg->commcfg_reply->session_id);
@@ -408,8 +436,8 @@ static int mgmt_fe_client_handle_msg(struct mgmt_fe_client *client,
 				fe_msg->commcfg_reply->error_if_any);
 		break;
 	case MGMTD__FE_MESSAGE__MESSAGE_GET_REPLY:
-		MGMTD_FE_CLIENT_DBG("Got GET_REPLY for session-id %" PRIu64,
-				    fe_msg->get_reply->session_id);
+		debug_fe_client("Got GET_REPLY for session-id %" PRIu64,
+				fe_msg->get_reply->session_id);
 
 		session =
 			mgmt_fe_find_session_by_session_id(client,
@@ -465,6 +493,110 @@ static int mgmt_fe_client_handle_msg(struct mgmt_fe_client *client,
 	return 0;
 }
 
+/*
+ * Handle a native encoded message
+ */
+static void fe_client_handle_native_msg(struct mgmt_fe_client *client,
+					struct mgmt_msg_header *msg,
+					size_t msg_len)
+{
+	struct mgmt_fe_client_session *session = NULL;
+	struct mgmt_msg_notify_data *notify_msg;
+	struct mgmt_msg_tree_data *tree_msg;
+	struct mgmt_msg_error *err_msg;
+	const char *data = NULL;
+	size_t dlen;
+
+	debug_fe_client("Got native message for session-id %" PRIu64,
+			msg->refer_id);
+
+	session = mgmt_fe_find_session_by_session_id(client, msg->refer_id);
+	if (!session || !session->client) {
+		log_err_fe_client("No session for received native msg session-id %" PRIu64,
+				  msg->refer_id);
+		return;
+	}
+
+	switch (msg->code) {
+	case MGMT_MSG_CODE_ERROR:
+		if (!session->client->cbs.error_notify)
+			return;
+
+		err_msg = (typeof(err_msg))msg;
+		if (!MGMT_MSG_VALIDATE_NUL_TERM(err_msg, msg_len)) {
+			log_err_fe_client("Corrupt error msg recv");
+			return;
+		}
+		session->client->cbs.error_notify(client, client->user_data,
+						  session->client_id,
+						  msg->refer_id,
+						  session->user_ctx,
+						  msg->req_id, err_msg->error,
+						  err_msg->errstr);
+		break;
+	case MGMT_MSG_CODE_TREE_DATA:
+		if (!session->client->cbs.get_tree_notify)
+			return;
+
+		tree_msg = (typeof(tree_msg))msg;
+		if (msg_len < sizeof(*tree_msg)) {
+			log_err_fe_client("Corrupt tree-data msg recv");
+			return;
+		}
+		session->client->cbs.get_tree_notify(client, client->user_data,
+						     session->client_id,
+						     msg->refer_id,
+						     session->user_ctx,
+						     msg->req_id,
+						     MGMTD_DS_OPERATIONAL,
+						     tree_msg->result_type,
+						     tree_msg->result,
+						     msg_len - sizeof(*tree_msg),
+						     tree_msg->partial_error);
+		break;
+	case MGMT_MSG_CODE_NOTIFY:
+		if (!session->client->cbs.async_notification)
+			return;
+
+		notify_msg = (typeof(notify_msg))msg;
+		if (msg_len < sizeof(*notify_msg)) {
+			log_err_fe_client("Corrupt notify-data msg recv");
+			return;
+		}
+
+		data = mgmt_msg_native_data_decode(notify_msg, msg_len);
+		if (!data) {
+			log_err_fe_client("Corrupt error msg recv");
+			return;
+		}
+		dlen = mgmt_msg_native_data_len_decode(notify_msg, msg_len);
+		if (notify_msg->result_type != LYD_JSON)
+			data = yang_convert_lyd_format(data, dlen,
+						       notify_msg->result_type,
+						       LYD_JSON, true);
+		if (!data) {
+			log_err_fe_client("Can't convert format %d to JSON",
+					  notify_msg->result_type);
+			return;
+		}
+
+		session->client->cbs.async_notification(client,
+							client->user_data,
+							session->client_id,
+							msg->refer_id,
+							session->user_ctx, data);
+
+		if (notify_msg->result_type != LYD_JSON)
+			darr_free(data);
+		break;
+	default:
+		log_err_fe_client("unknown native message session-id %" PRIu64
+				  " req-id %" PRIu64 " code %u",
+				  msg->refer_id, msg->req_id, msg->code);
+		break;
+	}
+}
+
 static void mgmt_fe_client_process_msg(uint8_t version, uint8_t *data,
 				       size_t len, struct msg_conn *conn)
 {
@@ -475,15 +607,24 @@ static void mgmt_fe_client_process_msg(uint8_t version, uint8_t *data,
 	msg_client = container_of(conn, struct msg_client, conn);
 	client = container_of(msg_client, struct mgmt_fe_client, client);
 
+	if (version == MGMT_MSG_VERSION_NATIVE) {
+		struct mgmt_msg_header *msg = (typeof(msg))data;
+
+		if (len >= sizeof(*msg))
+			fe_client_handle_native_msg(client, msg, len);
+		else
+			log_err_fe_client("native message to FE client %s too short %zu",
+					  client->name, len);
+		return;
+	}
+
 	fe_msg = mgmtd__fe_message__unpack(NULL, len, data);
 	if (!fe_msg) {
-		MGMTD_FE_CLIENT_DBG("Failed to decode %zu bytes from server.",
-				    len);
+		debug_fe_client("Failed to decode %zu bytes from server.", len);
 		return;
 	}
-	MGMTD_FE_CLIENT_DBG(
-		"Decoded %zu bytes of message(msg: %u/%u) from server", len,
-		fe_msg->message_case, fe_msg->message_case);
+	debug_fe_client("Decoded %zu bytes of message(msg: %u/%u) from server",
+			len, fe_msg->message_case, fe_msg->message_case);
 	(void)mgmt_fe_client_handle_msg(client, fe_msg);
 	mgmtd__fe_message__free_unpacked(fe_msg, NULL);
 }
@@ -504,7 +645,7 @@ static int _notify_connect_disconnect(struct msg_client *msg_client,
 
 	/* Walk list of sessions for this FE client deleting them */
 	if (!connected && mgmt_sessions_count(&client->sessions)) {
-		MGMTD_FE_CLIENT_DBG("Cleaning up existing sessions");
+		debug_fe_client("Cleaning up existing sessions");
 
 		FOREACH_SESSION_IN_LIST (client, session) {
 			assert(session->client);
@@ -543,6 +684,16 @@ static int mgmt_fe_client_notify_disconnect(struct msg_conn *conn)
 	return _notify_connect_disconnect(client, false);
 }
 
+static void mgmt_debug_client_fe_set(uint32_t mode, bool set)
+{
+	DEBUG_FLAGS_SET(&mgmt_dbg_fe_client, mode, set);
+
+	if (!__fe_client)
+		return;
+
+	__fe_client->client.conn.debug = DEBUG_MODE_CHECK(&mgmt_dbg_fe_client,
+							  DEBUG_MODE_ALL);
+}
 
 DEFPY(debug_mgmt_client_fe, debug_mgmt_client_fe_cmd,
       "[no] debug mgmt client frontend",
@@ -550,18 +701,11 @@ DEFPY(debug_mgmt_client_fe, debug_mgmt_client_fe_cmd,
       "client\n"
       "frontend\n")
 {
-	uint32_t mode = DEBUG_NODE2MODE(vty->node);
-
-	DEBUG_MODE_SET(&mgmt_dbg_fe_client, mode, !no);
+	mgmt_debug_client_fe_set(DEBUG_NODE2MODE(vty->node), !no);
 
 	return CMD_SUCCESS;
 }
 
-static void mgmt_debug_client_fe_set_all(uint32_t flags, bool set)
-{
-	DEBUG_FLAGS_SET(&mgmt_dbg_fe_client, flags, set);
-}
-
 static int mgmt_debug_fe_client_config_write(struct vty *vty)
 {
 	if (DEBUG_MODE_CHECK(&mgmt_dbg_fe_client, DEBUG_MODE_CONF))
@@ -572,16 +716,17 @@ static int mgmt_debug_fe_client_config_write(struct vty *vty)
 
 void mgmt_debug_fe_client_show_debug(struct vty *vty)
 {
-	if (MGMTD_DBG_FE_CLIENT_CHECK())
+	if (debug_check_fe_client())
 		vty_out(vty, "debug mgmt client frontend\n");
 }
 
 static struct debug_callbacks mgmt_dbg_fe_client_cbs = {
-	.debug_set_all = mgmt_debug_client_fe_set_all};
+	.debug_set_all = mgmt_debug_client_fe_set
+};
 
 static struct cmd_node mgmt_dbg_node = {
-	.name = "mgmt client frontend",
-	.node = DEBUG_NODE,
+	.name = "debug mgmt client frontend",
+	.node = MGMT_FE_DEBUG_NODE,
 	.prompt = "",
 	.config_write = mgmt_debug_fe_client_config_write,
 };
@@ -594,8 +739,14 @@ struct mgmt_fe_client *mgmt_fe_client_create(const char *client_name,
 					     uintptr_t user_data,
 					     struct event_loop *event_loop)
 {
-	struct mgmt_fe_client *client =
-		XCALLOC(MTYPE_MGMTD_FE_CLIENT, sizeof(*client));
+	struct mgmt_fe_client *client;
+	char server_path[MAXPATHLEN];
+
+	if (__fe_client)
+		return NULL;
+
+	client = XCALLOC(MTYPE_MGMTD_FE_CLIENT, sizeof(*client));
+	__fe_client = client;
 
 	client->name = XSTRDUP(MTYPE_MGMTD_FE_CLIENT_NAME, client_name);
 	client->user_data = user_data;
@@ -604,14 +755,16 @@ struct mgmt_fe_client *mgmt_fe_client_create(const char *client_name,
 
 	mgmt_sessions_init(&client->sessions);
 
-	msg_client_init(&client->client, event_loop, MGMTD_FE_SERVER_PATH,
+	snprintf(server_path, sizeof(server_path), MGMTD_FE_SOCK_NAME);
+
+	msg_client_init(&client->client, event_loop, server_path,
 			mgmt_fe_client_notify_connect,
 			mgmt_fe_client_notify_disconnect,
 			mgmt_fe_client_process_msg, MGMTD_FE_MAX_NUM_MSG_PROC,
-			MGMTD_FE_MAX_NUM_MSG_WRITE, MGMTD_FE_MSG_MAX_LEN, true,
-			"FE-client", MGMTD_DBG_FE_CLIENT_CHECK());
+			MGMTD_FE_MAX_NUM_MSG_WRITE, MGMTD_FE_MAX_MSG_LEN, true,
+			"FE-client", debug_check_fe_client());
 
-	MGMTD_FE_CLIENT_DBG("Initialized client '%s'", client_name);
+	debug_fe_client("Initialized client '%s'", client_name);
 
 	return client;
 }
@@ -634,6 +787,11 @@ bool mgmt_fe_client_current_msg_short_circuit(struct mgmt_fe_client *client)
 	return client->client.conn.is_short_circuit;
 }
 
+const char *mgmt_fe_client_name(struct mgmt_fe_client *client)
+{
+	return client->name;
+}
+
 /*
  * Create a new Session for a Frontend Client connection.
  */
@@ -675,9 +833,8 @@ enum mgmt_result mgmt_fe_destroy_client_session(struct mgmt_fe_client *client,
 
 	if (session->session_id &&
 	    mgmt_fe_send_session_req(client, session, false) != 0)
-		MGMTD_FE_CLIENT_ERR(
-			"Failed to send session destroy request for the session-id %" PRIu64,
-			session->session_id);
+		log_err_fe_client("Failed to send session destroy request for the session-id %" PRIu64,
+				  session->session_id);
 
 	mgmt_sessions_del(&client->sessions, session);
 	XFREE(MTYPE_MGMTD_FE_SESSION, session);
@@ -692,8 +849,9 @@ void mgmt_fe_client_destroy(struct mgmt_fe_client *client)
 {
 	struct mgmt_fe_client_session *session;
 
-	MGMTD_FE_CLIENT_DBG("Destroying MGMTD Frontend Client '%s'",
-			    client->name);
+	assert(client == __fe_client);
+
+	debug_fe_client("Destroying MGMTD Frontend Client '%s'", client->name);
 
 	FOREACH_SESSION_IN_LIST (client, session)
 		mgmt_fe_destroy_client_session(client, session->client_id);
@@ -702,4 +860,6 @@ void mgmt_fe_client_destroy(struct mgmt_fe_client *client)
 
 	XFREE(MTYPE_MGMTD_FE_CLIENT_NAME, client->name);
 	XFREE(MTYPE_MGMTD_FE_CLIENT, client);
+
+	__fe_client = NULL;
 }
diff --git a/lib/mgmt_fe_client.h b/lib/mgmt_fe_client.h
index 349b7e4..eee4594 100644
--- a/lib/mgmt_fe_client.h
+++ b/lib/mgmt_fe_client.h
@@ -14,7 +14,8 @@ extern "C" {
 
 #include "mgmt_pb.h"
 #include "frrevent.h"
-#include "mgmtd/mgmt_defines.h"
+#include "mgmt_defines.h"
+#include "mgmt_msg_native.h"
 
 /***************************************************************
  * Macros
@@ -25,22 +26,11 @@ extern "C" {
  * connections.
  */
 
-#define MGMTD_FE_CLIENT_ERROR_STRING_MAX_LEN 32
-
-#define MGMTD_FE_DEFAULT_CONN_RETRY_INTVL_SEC 5
-
 #define MGMTD_FE_MSG_PROC_DELAY_USEC 10
-#define MGMTD_FE_MAX_NUM_MSG_PROC 500
 
-#define MGMTD_FE_MSG_WRITE_DELAY_MSEC 1
+#define MGMTD_FE_MAX_NUM_MSG_PROC  500
 #define MGMTD_FE_MAX_NUM_MSG_WRITE 100
-
-#define GMGD_FE_MAX_NUM_REQ_ITEMS 64
-
-#define MGMTD_FE_MSG_MAX_LEN 9000
-
-#define MGMTD_SOCKET_FE_SEND_BUF_SIZE 65535
-#define MGMTD_SOCKET_FE_RECV_BUF_SIZE MGMTD_SOCKET_FE_SEND_BUF_SIZE
+#define MGMTD_FE_MAX_MSG_LEN	   (64 * 1024)
 
 /***************************************************************
  * Data-structures
@@ -115,6 +105,26 @@ struct mgmt_fe_client_cbs {
 			   uintptr_t user_data, uint64_t req_id,
 			   Mgmtd__DatastoreId ds_id,
 			   Mgmtd__YangData **yang_data, size_t num_data);
+
+	/* Called when get-tree result is returned */
+	int (*get_tree_notify)(struct mgmt_fe_client *client,
+			       uintptr_t user_data, uint64_t client_id,
+			       uint64_t session_id, uintptr_t session_ctx,
+			       uint64_t req_id, Mgmtd__DatastoreId ds_id,
+			       LYD_FORMAT result_type, void *result, size_t len,
+			       int partial_error);
+
+	/* Called with asynchronous notifications from backends */
+	int (*async_notification)(struct mgmt_fe_client *client,
+				  uintptr_t user_data, uint64_t client_id,
+				  uint64_t session_id, uintptr_t session_ctx,
+				  const char *result);
+
+	/* Called when new native error is returned */
+	int (*error_notify)(struct mgmt_fe_client *client, uintptr_t user_data,
+			    uint64_t client_id, uint64_t session_id,
+			    uintptr_t session_ctx, uint64_t req_id, int error,
+			    const char *errstr);
 };
 
 extern struct debug mgmt_dbg_fe_client;
@@ -123,12 +133,12 @@ extern struct debug mgmt_dbg_fe_client;
  * API prototypes
  ***************************************************************/
 
-#define MGMTD_FE_CLIENT_DBG(fmt, ...)                                          \
+#define debug_fe_client(fmt, ...)                                              \
 	DEBUGD(&mgmt_dbg_fe_client, "FE-CLIENT: %s: " fmt, __func__,           \
 	       ##__VA_ARGS__)
-#define MGMTD_FE_CLIENT_ERR(fmt, ...)                                          \
+#define log_err_fe_client(fmt, ...)                                            \
 	zlog_err("FE-CLIENT: %s: ERROR: " fmt, __func__, ##__VA_ARGS__)
-#define MGMTD_DBG_FE_CLIENT_CHECK()                                            \
+#define debug_check_fe_client()                                                \
 	DEBUG_MODE_CHECK(&mgmt_dbg_fe_client, DEBUG_MODE_ALL)
 
 /*
@@ -364,6 +374,42 @@ extern int mgmt_fe_send_regnotify_req(struct mgmt_fe_client *client,
 				      int num_reqs);
 
 /*
+ * Send GET-DATA to MGMTD daemon.
+ *
+ * client
+ *    Client object.
+ *
+ * session_id
+ *    Client session ID.
+ *
+ * req_id
+ *    Client request ID.
+ *
+ * datastore
+ *    Datastore for getting data.
+ *
+ * result_type
+ *    The LYD_FORMAT of the result.
+ *
+ * flags
+ *    Flags to control the behavior of the request.
+ *
+ * defaults
+ *    Options to control the reporting of default values.
+ *
+ * xpath
+ *    the xpath to get.
+ *
+ * Returns:
+ *    0 on success, otherwise msg_conn_send_msg() return values.
+ */
+extern int mgmt_fe_send_get_data_req(struct mgmt_fe_client *client,
+				     uint64_t session_id, uint64_t req_id,
+				     uint8_t datastore, LYD_FORMAT result_type,
+				     uint8_t flags, uint8_t defaults,
+				     const char *xpath);
+
+/*
  * Destroy library and cleanup everything.
  */
 extern void mgmt_fe_client_destroy(struct mgmt_fe_client *client);
@@ -379,6 +425,17 @@ extern uint mgmt_fe_client_session_count(struct mgmt_fe_client *client);
 extern bool
 mgmt_fe_client_current_msg_short_circuit(struct mgmt_fe_client *client);
 
+/**
+ * Get the name of the client
+ *
+ * Args:
+ *	The client object.
+ *
+ * Return:
+ *	The name of the client.
+ */
+extern const char *mgmt_fe_client_name(struct mgmt_fe_client *client);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/mgmt_msg.c b/lib/mgmt_msg.c
index 1cd3240..aff9af7 100644
--- a/lib/mgmt_msg.c
+++ b/lib/mgmt_msg.c
@@ -7,12 +7,15 @@
  * Copyright (c) 2023, LabN Consulting, L.L.C.
  */
 #include <zebra.h>
+#include <sys/stat.h>
+
 #include "debug.h"
 #include "network.h"
 #include "sockopt.h"
 #include "stream.h"
 #include "frrevent.h"
 #include "mgmt_msg.h"
+#include "mgmt_msg_native.h"
 
 
 #define MGMT_MSG_DBG(dbgtag, fmt, ...)                                         \
@@ -84,7 +87,7 @@ enum mgmt_msg_rsched mgmt_msg_read(struct mgmt_msg_state *ms, int fd,
 	 */
 	assert(stream_get_getp(ms->ins) == 0);
 	left = stream_get_endp(ms->ins);
-	while (left > (long)sizeof(struct mgmt_msg_hdr)) {
+	while (left > (ssize_t)sizeof(struct mgmt_msg_hdr)) {
 		mhdr = (struct mgmt_msg_hdr *)(STREAM_DATA(ms->ins) + total);
 		if (!MGMT_MSG_IS_MARKER(mhdr->marker)) {
 			MGMT_MSG_DBG(dbgtag, "recv corrupt buffer, disconnect");
@@ -99,8 +102,30 @@ enum mgmt_msg_rsched mgmt_msg_read(struct mgmt_msg_state *ms, int fd,
 		mcount++;
 	}
 
-	if (!mcount)
+	if (!mcount) {
+		/* Didn't manage to read a full message */
+		if (mhdr && avail == 0) {
+			struct stream *news;
+			/*
+			 * Message was longer than what was left and we have no
+			 * available space to read more in. B/c mcount == 0 the
+			 * message starts at the beginning of the stream so
+			 * therefor the stream is too small to fit the message..
+			 * Resize the stream to fit.
+			 */
+			if (mhdr->len > MGMT_MSG_MAX_MSG_ALLOC_LEN) {
+				MGMT_MSG_ERR(ms, "corrupt msg len rcvd %u",
+					     mhdr->len);
+				return MSR_DISCONNECT;
+			}
+			news = stream_new(mhdr->len);
+			stream_put(news, mhdr, left);
+			stream_set_endp(news, left);
+			stream_free(ms->ins);
+			ms->ins = news;
+		}
 		return MSR_SCHED_STREAM;
+	}
 
 	/*
 	 * We have read at least one message into the stream, queue it up.
@@ -108,7 +133,11 @@ enum mgmt_msg_rsched mgmt_msg_read(struct mgmt_msg_state *ms, int fd,
 	mhdr = (struct mgmt_msg_hdr *)(STREAM_DATA(ms->ins) + total);
 	stream_set_endp(ms->ins, total);
 	stream_fifo_push(&ms->inq, ms->ins);
-	ms->ins = stream_new(ms->max_msg_sz);
+	if (left < (ssize_t)sizeof(struct mgmt_msg_hdr))
+		ms->ins = stream_new(ms->max_msg_sz);
+	else
+		/* handle case where message is greater than max */
+		ms->ins = stream_new(MAX(ms->max_msg_sz, mhdr->len));
 	if (left) {
 		stream_put(ms->ins, mhdr, left);
 		stream_set_endp(ms->ins, left);
@@ -180,7 +209,7 @@ bool mgmt_msg_procbufs(struct mgmt_msg_state *ms,
 }
 
 /**
- * Write data from a onto the socket, using streams that have been queued for
+ * Write data onto the socket, using streams that have been queued for
  * sending by mgmt_msg_send_msg. This function should be reschedulable.
  *
  * Args:
@@ -292,23 +321,26 @@ int mgmt_msg_send_msg(struct mgmt_msg_state *ms, uint8_t version, void *msg,
 	size_t endp, n;
 	size_t mlen = len + sizeof(*mhdr);
 
-	if (mlen > ms->max_msg_sz) {
-		MGMT_MSG_ERR(ms, "Message %zu > max size %zu, dropping", mlen,
-			     ms->max_msg_sz);
-		return -1;
-	}
+	if (mlen > ms->max_msg_sz)
+		MGMT_MSG_DBG(dbgtag, "Sending large msg size %zu > max size %zu",
+			     mlen, ms->max_msg_sz);
 
 	if (!ms->outs) {
-		MGMT_MSG_DBG(dbgtag, "creating new stream for msg len %zu",
-			     len);
-		ms->outs = stream_new(ms->max_msg_sz);
+		MGMT_MSG_DBG(dbgtag, "creating new stream for msg len %zu", mlen);
+		ms->outs = stream_new(MAX(ms->max_msg_sz, mlen));
+	} else if (mlen > ms->max_msg_sz && ms->outs->endp == 0) {
+		/* msg is larger than stream max size get a fit-to-size stream */
+		MGMT_MSG_DBG(dbgtag,
+			     "replacing old stream with fit-to-size for msg len %zu",
+			     mlen);
+		stream_free(ms->outs);
+		ms->outs = stream_new(mlen);
 	} else if (STREAM_WRITEABLE(ms->outs) < mlen) {
-		MGMT_MSG_DBG(
-			dbgtag,
-			"enq existing stream len %zu and creating new stream for msg len %zu",
-			STREAM_WRITEABLE(ms->outs), mlen);
+		MGMT_MSG_DBG(dbgtag,
+			     "enq existing stream len %zu and creating new stream for msg len %zu",
+			     STREAM_WRITEABLE(ms->outs), mlen);
 		stream_fifo_push(&ms->outq, ms->outs);
-		ms->outs = stream_new(ms->max_msg_sz);
+		ms->outs = stream_new(MAX(ms->max_msg_sz, mlen));
 	} else {
 		MGMT_MSG_DBG(
 			dbgtag,
@@ -317,6 +349,16 @@ int mgmt_msg_send_msg(struct mgmt_msg_state *ms, uint8_t version, void *msg,
 	}
 	s = ms->outs;
 
+	if (dbgtag && version == MGMT_MSG_VERSION_NATIVE) {
+		struct mgmt_msg_header *native_msg = msg;
+
+		MGMT_MSG_DBG(
+			dbgtag,
+			"Sending native msg sess/txn-id %"PRIu64" req-id %"PRIu64" code %u",
+			native_msg->refer_id, native_msg->req_id, native_msg->code);
+
+	}
+
 	/* We have a stream with space, pack the message into it. */
 	mhdr = (struct mgmt_msg_hdr *)(STREAM_DATA(s) + s->endp);
 	mhdr->marker = MGMT_MSG_MARKER(version);
@@ -636,13 +678,13 @@ static void msg_client_sched_connect(struct msg_client *client,
 				&client->conn_retry_tmr);
 }
 
-static bool msg_client_connect_short_circuit(struct msg_client *client)
+static int msg_client_connect_short_circuit(struct msg_client *client)
 {
 	struct msg_conn *server_conn;
 	struct msg_server *server;
 	const char *dbgtag =
 		client->conn.debug ? client->conn.mstate.idtag : NULL;
-	union sockunion su = {0};
+	union sockunion su = {};
 	int sockets[2];
 
 	frr_each (msg_server_list, &msg_servers, server)
@@ -650,10 +692,9 @@ static bool msg_client_connect_short_circuit(struct msg_client *client)
 			break;
 	if (!server) {
 		MGMT_MSG_DBG(dbgtag,
-			     "no short-circuit connection available for %s",
+			     "no short-circuit server available yet for %s",
 			     client->sopath);
-
-		return false;
+		return -1;
 	}
 
 	if (socketpair(AF_UNIX, SOCK_STREAM, 0, sockets)) {
@@ -661,7 +702,7 @@ static bool msg_client_connect_short_circuit(struct msg_client *client)
 			&client->conn.mstate,
 			"socketpair failed trying to short-circuit connection on %s: %s",
 			client->sopath, safe_strerror(errno));
-		return false;
+		return -1;
 	}
 
 	/* client side */
@@ -673,6 +714,9 @@ static bool msg_client_connect_short_circuit(struct msg_client *client)
 	/* server side */
 	memset(&su, 0, sizeof(union sockunion));
 	server_conn = server->create(sockets[1], &su);
+	server_conn->debug = DEBUG_MODE_CHECK(server->debug, DEBUG_MODE_ALL)
+				     ? true
+				     : false;
 
 	client->conn.remote_conn = server_conn;
 	server_conn->remote_conn = &client->conn;
@@ -689,7 +733,7 @@ static bool msg_client_connect_short_circuit(struct msg_client *client)
 		client->sopath, client->conn.mstate.idtag, client->conn.fd,
 		server_conn->mstate.idtag, server_conn->fd);
 
-	return true;
+	return 0;
 }
 
 
@@ -699,11 +743,12 @@ static void msg_client_connect(struct msg_client *client)
 	struct msg_conn *conn = &client->conn;
 	const char *dbgtag = conn->debug ? conn->mstate.idtag : NULL;
 
-	if (!client->short_circuit_ok ||
-	    !msg_client_connect_short_circuit(client))
+	if (!client->short_circuit_ok)
 		conn->fd =
 			mgmt_msg_connect(client->sopath, MSG_CONN_SEND_BUF_SIZE,
 					 MSG_CONN_RECV_BUF_SIZE, dbgtag);
+	else if (msg_client_connect_short_circuit(client))
+		conn->fd = -1;
 
 	if (conn->fd == -1)
 		/* retry the connection */
@@ -743,7 +788,6 @@ void msg_client_init(struct msg_client *client, struct event_loop *tm,
 	mgmt_msg_init(&conn->mstate, max_read_buf, max_write_buf, max_msg_sz,
 		      idtag);
 
-	/* XXX maybe just have client kick this off */
 	/* Start trying to connect to server */
 	msg_client_sched_connect(client, 0);
 }
@@ -766,8 +810,9 @@ void msg_client_cleanup(struct msg_client *client)
 static void msg_server_accept(struct event *event)
 {
 	struct msg_server *server = EVENT_ARG(event);
-	int fd;
+	struct msg_conn *conn;
 	union sockunion su;
+	int fd;
 
 	if (server->fd < 0)
 		return;
@@ -790,7 +835,11 @@ static void msg_server_accept(struct event *event)
 
 	DEBUGD(server->debug, "Accepted new %s connection", server->idtag);
 
-	server->create(fd, &su);
+	conn = server->create(fd, &su);
+	if (conn)
+		conn->debug = DEBUG_MODE_CHECK(server->debug, DEBUG_MODE_ALL)
+				      ? true
+				      : false;
 }
 
 int msg_server_init(struct msg_server *server, const char *sopath,
diff --git a/lib/mgmt_msg.h b/lib/mgmt_msg.h
index dd7ae59..6bdc9a6 100644
--- a/lib/mgmt_msg.h
+++ b/lib/mgmt_msg.h
@@ -24,6 +24,8 @@ DECLARE_MTYPE(MSG_CONN);
 #define MGMT_MSG_VERSION_PROTOBUF 0
 #define MGMT_MSG_VERSION_NATIVE 1
 
+/* The absolute maximum message size (16MB) */
+#define MGMT_MSG_MAX_MSG_ALLOC_LEN (16 * 1024 * 1024)
 
 struct mgmt_msg_state {
 	struct stream *ins;
@@ -136,6 +138,10 @@ struct msg_client {
 extern void msg_client_cleanup(struct msg_client *client);
 
 /*
+ * If `short_circuit_ok` is true, then the client-server connection will use a
+ * socketpair() rather than a unix-domain socket. This must be passed true if
+ * you wish to send messages short-circuit later.
+ *
  * `notify_disconnect` is not called when the user `msg_client_cleanup` is
  * called for a client which is currently connected. The socket is closed
  * but there is no notification.
diff --git a/lib/mgmt_msg_native.c b/lib/mgmt_msg_native.c
new file mode 100644
index 0000000..d27c5d3
--- /dev/null
+++ b/lib/mgmt_msg_native.c
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * June 29 2023, Christian Hopps <chopps@labn.net>
+ *
+ * Copyright (c) 2023, LabN Consulting, L.L.C.
+ *
+ */
+#include <zebra.h>
+#include "mgmt_msg_native.h"
+
+DEFINE_MGROUP(MSG_NATIVE, "Native message allocations");
+DEFINE_MTYPE(MSG_NATIVE, MSG_NATIVE_MSG, "native mgmt msg");
+DEFINE_MTYPE(MSG_NATIVE, MSG_NATIVE_ERROR, "native error msg");
+DEFINE_MTYPE(MSG_NATIVE, MSG_NATIVE_GET_TREE, "native get tree msg");
+DEFINE_MTYPE(MSG_NATIVE, MSG_NATIVE_TREE_DATA, "native tree data msg");
+DEFINE_MTYPE(MSG_NATIVE, MSG_NATIVE_GET_DATA, "native get data msg");
+DEFINE_MTYPE(MSG_NATIVE, MSG_NATIVE_NOTIFY, "native get data msg");
+
+int vmgmt_msg_native_send_error(struct msg_conn *conn, uint64_t sess_or_txn_id,
+				uint64_t req_id, bool short_circuit_ok,
+				int16_t error, const char *errfmt, va_list ap)
+{
+	struct mgmt_msg_error *msg;
+	char *errstr;
+	ssize_t slen;
+	int ret;
+
+	errstr = darr_vsprintf(errfmt, ap);
+	slen = strlen(errstr);
+
+	msg = mgmt_msg_native_alloc_msg(typeof(*msg), slen + 1,
+					MTYPE_MSG_NATIVE_ERROR);
+	msg->refer_id = sess_or_txn_id;
+	msg->req_id = req_id;
+	msg->code = MGMT_MSG_CODE_ERROR;
+	msg->error = error;
+	strlcpy(msg->errstr, errstr, slen + 1);
+	darr_free(errstr);
+
+	if (conn->debug)
+		zlog_debug("Sending error %d session-id %" PRIu64
+			   " req-id %" PRIu64 " scok %d errstr: %s",
+			   error, sess_or_txn_id, req_id, short_circuit_ok,
+			   msg->errstr);
+
+	ret = mgmt_msg_native_send_msg(conn, msg, short_circuit_ok);
+	mgmt_msg_native_free_msg(msg);
+	return ret;
+}
diff --git a/lib/mgmt_msg_native.h b/lib/mgmt_msg_native.h
new file mode 100644
index 0000000..53bb81b
--- /dev/null
+++ b/lib/mgmt_msg_native.h
@@ -0,0 +1,585 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * June 29 2023, Christian Hopps <chopps@labn.net>
+ *
+ * Copyright (c) 2023, LabN Consulting, L.L.C.
+ *
+ */
+
+#ifndef _FRR_MGMT_MSG_NATIVE_H_
+#define _FRR_MGMT_MSG_NATIVE_H_
+
+#ifdef __cplusplus
+extern "C" {
+#elif 0
+}
+#endif
+
+#include <zebra.h>
+#include "compiler.h"
+#include "darr.h"
+#include "memory.h"
+#include "mgmt_msg.h"
+#include "mgmt_defines.h"
+
+#include <stdalign.h>
+
+/*
+ * ==================
+ * Native Message API
+ * ==================
+ *
+ * -----------------------
+ * Defining A New Message:
+ * -----------------------
+ *
+ *  1) Start with `struct mgmt_msg_header` as the first (unnamed) field.
+ *
+ *  2) Add fixed-width fields. Add on natural aligned boundaries (*)
+ *
+ *  3) [Optional] Add a zero-length variable field. Add aligned on a 64-bit
+ *     boundary, this is done so that: `value = (HDR + 1)` works.
+ *
+ *  4) Define a new MTYPE for the new message type (see DECLARE_MTYPE below
+ *     as well as the paired DEFINE_MTYPE in mgmt_msg_native.c)
+ *
+ * These rules are so the messages may be read from and written directly to
+ * "the wire", easily, using common programming languages (e.g., C, rust, go,
+ * python, ...)
+ *
+ * (*) Natrual aligned boundaries, i.e., uint16_t on 2-byte boundary, uint64_t
+ * on 8-byte boundaries, ...)
+ *
+ * ------------------------------
+ * Allocating New Native Messages
+ * ------------------------------
+ *
+ * For fixed-length and variable length messages one should allocate new
+ * messages with the mgmt_msg_native_alloc_msg() passing in the newly defined
+ * MTYPE. Likewise, to free the message one should use
+ * mgmt_msg_native_free_msg().
+ *
+ * Unknown Variable Length Messages:
+ * ---------------------------------
+ *
+ * If using a zero-length variable length field and the length is not known at
+ * message creation time, you can use the `native` API function
+ * mgmt_msg_native_append() to add data to the end of the message, or if a more
+ * full set of operations are required, the darr_xxxx() API is also available as
+ * in the Advanced section below.
+ *
+ * Notable API Functions:
+ * ---------------------------------
+ *
+ * mgmt_msg_native_alloc_msg() - Allocate a native msg.
+ * mgmt_msg_native_free_msg() - Free a native msg.
+ * mgmt_msg_native_append() - Append data to the end of the msg.
+ * mgmt_msg_native_get_msg_len() - Get the total length of the msg.
+ * mgmt_msg_native_send_msg() - Send the message.
+ *
+ * mgmt_msg_native_xpath_encode() - Encode xpath in xpath, data format message.
+ * mgmt_msg_native_xpath_data_decode() - Decode xpath, data format message.
+ * mgmt_msg_native_xpath_decode() - Get the xpath, from xpath, data format message.
+ * mgmt_msg_native_data_decode() - Get the secondary data from xpath, data message.
+ * mgmt_msg_native_data_len_decode() - Get length of secondary data.
+ *
+ * -------------------------------------
+ * [Advanced Use] Dynamic Array Messages
+ * -------------------------------------
+ *
+ * NOTE: Most users can simply use mgmt_msg_native_append() and skip this
+ * section.
+ *
+ * This section is only important to understand if you wish to utilize the fact
+ * that native messages allocated with mgmt_msg_native_alloc_msg are
+ * actually allocated as uint8_t dynamic arrays (`darr`).
+ *
+ * You can utilize all the darr_xxxx() API to manipulate the variable length
+ * message data in a native message. To do so you simply need to understand that
+ * the native message is actually a `uint8_t *` darr. So, for example, to append
+ * data to the end of a message one could do the following:
+ *
+ *     void append_metric_path(struct mgmt_msg_my_msg *msg)
+ *     {
+ *          msg = (struct mggm_msg_my_msg *)
+ *              darr_strcat((uint8_t *)msg, "/metric");
+ *
+ *	    // ...
+ *     }
+ *
+ * NOTE: If reallocs happen the original passed in pointer will be updated;
+ * however, any other pointers into the message will become invalid, and so they
+ * should always be discarded or reinitialized after using any reallocating
+ * darr_xxx() API functions.
+ *
+ *     void append_metric_path(struct mgmt_msg_my_msg *msg)
+ *     {
+ *          char *xpath = msg->xpath;	// pointer into message
+ *
+ *          darr_in_strcat((uint8_t *)msg, "/metric");
+ *          // msg may have been updated to point at new memory
+ *
+ *          xpath = NULL;		// now invalid
+ *          xpath = msg->xpath;         // reinitialize
+ *	    // ...
+ *     }
+ *
+ * Rather than worry about this, it's typical when using dynamic arrays to always
+ * work from the main pointer to the dynamic array, rather than caching multiple
+ * pointers into the data. Modern compilers will optimize the code so that it
+ * adds no extra execution cost.
+ *
+ *     void append_metric_path(struct mgmt_msg_my_msg *msg)
+ *     {
+ *          darr_in_strcat((uint8_t *)msg, "/metric");
+ *
+ *          // Use `msg->xpath` directly rather creating and using an
+ *          // `xpath = msg->xpath` local variable.
+ *
+ *          if (strcmp(msg->xpath, "foobar/metric")) {
+ *	        // ...
+ *          }
+ *     }
+ *
+ */
+
+DECLARE_MTYPE(MSG_NATIVE_MSG);
+DECLARE_MTYPE(MSG_NATIVE_ERROR);
+DECLARE_MTYPE(MSG_NATIVE_GET_TREE);
+DECLARE_MTYPE(MSG_NATIVE_TREE_DATA);
+DECLARE_MTYPE(MSG_NATIVE_GET_DATA);
+DECLARE_MTYPE(MSG_NATIVE_NOTIFY);
+
+/*
+ * Native message codes
+ */
+#define MGMT_MSG_CODE_ERROR	0
+#define MGMT_MSG_CODE_GET_TREE	1
+#define MGMT_MSG_CODE_TREE_DATA 2
+#define MGMT_MSG_CODE_GET_DATA	3
+#define MGMT_MSG_CODE_NOTIFY	4
+
+/*
+ * Datastores
+ */
+#define MGMT_MSG_DATASTORE_STARTUP     0
+#define MGMT_MSG_DATASTORE_CANDIDATE   1
+#define MGMT_MSG_DATASTORE_RUNNING     2
+#define MGMT_MSG_DATASTORE_OPERATIONAL 3
+
+/*
+ * Formats
+ */
+#define MGMT_MSG_FORMAT_XML    1
+#define MGMT_MSG_FORMAT_JSON   2
+#define MGMT_MSG_FORMAT_BINARY 3 /* non-standard libyang internal format */
+
+/*
+ * Now we're using LYD_FORMAT directly to avoid mapping code, but having our
+ * own definitions allows us to create such a mapping in the future if libyang
+ * makes a backwards incompatible change.
+ */
+_Static_assert(MGMT_MSG_FORMAT_XML == LYD_XML, "Format mismatch");
+_Static_assert(MGMT_MSG_FORMAT_JSON == LYD_JSON, "Format mismatch");
+_Static_assert(MGMT_MSG_FORMAT_BINARY == LYD_LYB, "Format mismatch");
+
+/**
+ * struct mgmt_msg_header - Header common to all native messages.
+ *
+ * @code: the actual type of the message.
+ * @resv: Set to zero, ignore on receive.
+ * @vsplit: If a variable section is split in 2, the length of first part.
+ * @refer_id: the session, txn, conn, etc, this message is associated with.
+ * @req_id: the request this message is for.
+ */
+struct mgmt_msg_header {
+	uint16_t code;
+	uint16_t resv;
+	uint32_t vsplit;
+	uint64_t refer_id;
+	uint64_t req_id;
+};
+_Static_assert(sizeof(struct mgmt_msg_header) == 3 * 8, "Bad padding");
+_Static_assert(sizeof(struct mgmt_msg_header) ==
+		       offsetof(struct mgmt_msg_header, req_id) +
+			       sizeof(((struct mgmt_msg_header *)0)->req_id),
+	       "Size mismatch");
+
+/**
+ * struct mgmt_msg_error - Common error message.
+ *
+ * @error: An error value.
+ * @errst: Description of error can be 0 length.
+ *
+ * This common error message can be used for replies for many msg requests
+ * (req_id).
+ */
+struct mgmt_msg_error {
+	struct mgmt_msg_header;
+	int16_t error;
+	uint8_t resv2[6];
+
+	alignas(8) char errstr[];
+};
+_Static_assert(sizeof(struct mgmt_msg_error) ==
+		       offsetof(struct mgmt_msg_error, errstr),
+	       "Size mismatch");
+
+/**
+ * struct mgmt_msg_get_tree - backend oper data request.
+ *
+ * @result_type: ``LYD_FORMAT`` for the returned result.
+ * @xpath: the query for the data to return.
+ */
+struct mgmt_msg_get_tree {
+	struct mgmt_msg_header;
+	uint8_t result_type;
+	uint8_t resv2[7];
+
+	alignas(8) char xpath[];
+};
+_Static_assert(sizeof(struct mgmt_msg_get_tree) ==
+		       offsetof(struct mgmt_msg_get_tree, xpath),
+	       "Size mismatch");
+
+/**
+ * struct mgmt_msg_tree_data - Message carrying tree data.
+ *
+ * @partial_error: If the full result could not be returned do to this error.
+ * @result_type: ``LYD_FORMAT`` for format of the @result value.
+ * @more: if this is a partial return and there will be more coming.
+ * @result: The tree data in @result_type format.
+ *
+ */
+struct mgmt_msg_tree_data {
+	struct mgmt_msg_header;
+	int8_t partial_error;
+	uint8_t result_type;
+	uint8_t more;
+	uint8_t resv2[5];
+
+	alignas(8) uint8_t result[];
+};
+_Static_assert(sizeof(struct mgmt_msg_tree_data) ==
+		       offsetof(struct mgmt_msg_tree_data, result),
+	       "Size mismatch");
+
+/* Flags for get-data request */
+#define GET_DATA_FLAG_STATE	0x01	/* include "config false" data */
+#define GET_DATA_FLAG_CONFIG	0x02	/* include "config true" data */
+#define GET_DATA_FLAG_EXACT	0x04	/* get exact data node instead of the full tree */
+
+/*
+ * Modes of reporting default values. Non-default values are always reported.
+ * These options reflect "with-defaults" modes as defined in RFC 6243.
+ */
+#define GET_DATA_DEFAULTS_EXPLICIT    0 /* "explicit" */
+#define GET_DATA_DEFAULTS_TRIM	      1 /* "trim"  */
+#define GET_DATA_DEFAULTS_ALL	      2 /* "report-all" */
+#define GET_DATA_DEFAULTS_ALL_ADD_TAG 3 /* "report-all-tagged" */
+
+/**
+ * struct mgmt_msg_get_data - frontend get-data request.
+ *
+ * @result_type: ``LYD_FORMAT`` for the returned result.
+ * @flags: combination of ``GET_DATA_FLAG_*`` flags.
+ * @defaults: one of ``GET_DATA_DEFAULTS_*`` values.
+ * @xpath: the query for the data to return.
+ */
+struct mgmt_msg_get_data {
+	struct mgmt_msg_header;
+	uint8_t result_type;
+	uint8_t flags;
+	uint8_t defaults;
+	uint8_t datastore;
+	uint8_t resv2[4];
+
+	alignas(8) char xpath[];
+};
+_Static_assert(sizeof(struct mgmt_msg_get_data) ==
+		       offsetof(struct mgmt_msg_get_data, xpath),
+	       "Size mismatch");
+
+/**
+ * struct mgmt_msg_notify_data - Message carrying notification data.
+ *
+ * @result_type: ``LYD_FORMAT`` for format of the @result value.
+ * @data: The xpath string of the notification followed by the tree data in
+ *        @result_type format.
+ */
+struct mgmt_msg_notify_data {
+	struct mgmt_msg_header;
+	uint8_t result_type;
+	uint8_t resv2[7];
+
+	alignas(8) char data[];
+};
+_Static_assert(sizeof(struct mgmt_msg_notify_data) ==
+		       offsetof(struct mgmt_msg_notify_data, data),
+	       "Size mismatch");
+
+/*
+ * Validate that the message ends in a NUL terminating byte
+ */
+#define MGMT_MSG_VALIDATE_NUL_TERM(msgp, len)                                  \
+	((len) >= sizeof(*msgp) + 1 && ((char *)msgp)[(len)-1] == 0)
+
+
+/**
+ * Send a native message error to the other end of the connection.
+ *
+ * This function is normally used by the server-side to indicate a failure to
+ * process a client request. For this server side handling of client messages
+ * which expect a reply, either that reply or this error should be returned, as
+ * closing the connection is not allowed during message handling.
+ *
+ * Args:
+ *	conn: the connection.
+ *	sess_or_txn_id: Session ID (to FE client) or Txn ID (from BE client)
+ *	req_id: which req_id this error is associated with.
+ *	short_circuit_ok: if short circuit sending is OK.
+ *	error: the error value
+ *	errfmt: vprintfrr style format string
+ *	ap: the variable args for errfmt.
+ *
+ * Return:
+ *	The return value of ``msg_conn_send_msg``.
+ */
+extern int vmgmt_msg_native_send_error(struct msg_conn *conn,
+				       uint64_t sess_or_txn_id, uint64_t req_id,
+				       bool short_circuit_ok, int16_t error,
+				       const char *errfmt, va_list ap)
+	PRINTFRR(6, 0);
+
+/**
+ * mgmt_msg_native_alloc_msg() - Create a native appendable msg.
+ * @msg_type: The message structure type.
+ * @var_len: The initial additional length to add to the message.
+ * @mem_type: The initial additional length to add to the message.
+ *
+ * This function takes a C type (e.g., `struct mgmt_msg_get_tree`) as an
+ * argument and returns a new native message. The newly allocated message
+ * can be used with the other `native` functions.
+ *
+ * Importantly the mgmt_msg_native_append() function can be used to add data
+ * to the end of the message, and mgmt_msg_get_native_msg_len() can be used
+ * to obtain the total length of the message (i.e., the fixed sized header plus
+ * the variable length data that has been appended).
+ *
+ * Additionally, a dynamic array (darr) pointer can be obtained using
+ * mgmt_msg_get_native_darr() which allows adding and manipulating the
+ * variable data that follows the fixed sized header.
+ *
+ * Return: A `msg_type` object created using a dynamic_array.
+ */
+#define mgmt_msg_native_alloc_msg(msg_type, var_len, mem_type)                 \
+	({                                                                     \
+		uint8_t *buf = NULL;                                           \
+		(msg_type *)darr_append_nz_mt(buf,                             \
+					      sizeof(msg_type) + (var_len),    \
+					      mem_type);                       \
+	})
+
+/**
+ * mgmt_msg_free_native_msg() - Free a native msg.
+ * @msg - pointer to message allocated by mgmt_msg_create_native_msg().
+ */
+#define mgmt_msg_native_free_msg(msg) darr_free(msg)
+
+/**
+ * mgmt_msg_native_get_msg_len() - Get the total length of the msg.
+ * @msg: the native message.
+ *
+ * Return: the total length of the message, fixed + variable length.
+ */
+#define mgmt_msg_native_get_msg_len(msg) (darr_len((uint8_t *)(msg)))
+
+/**
+ * mgmt_msg_native_append() - Append data to the end of the msg.
+ * @msg: (IN/OUT) Pointer to the native message, variable may be updated.
+ * @data: data to append.
+ * @len: length of data to append.
+ *
+ * Append @data of length @len to the native message @msg.
+ *
+ * NOTE: Be aware @msg pointer may change as a result of reallocating the
+ * message to fit the new data. Any other pointers into the old message should
+ * be discarded.
+ *
+ * Return: a pointer to the newly appended data.
+ */
+#define mgmt_msg_native_append(msg, data, len)                                 \
+	({                                                                     \
+		uint8_t **darrp = mgmt_msg_native_get_darrp(msg);              \
+		uint8_t *p = darr_append_n(*darrp, len);                       \
+		memcpy(p, data, len);                                          \
+		p;                                                             \
+	})
+
+/**
+ * mgmt_msg_native_send_msg(msg, short_circuit_ok) - Send a native msg.
+ * @conn: the mgmt_msg connection.
+ * @msg: the native message.
+ * @short_circuit_ok: True if short-circuit sending is required.
+ *
+ * Return: The error return value of msg_conn_send_msg().
+ */
+#define mgmt_msg_native_send_msg(conn, msg, short_circuit_ok)                  \
+	msg_conn_send_msg(conn, MGMT_MSG_VERSION_NATIVE, msg,                  \
+			  mgmt_msg_native_get_msg_len(msg), NULL,              \
+			  short_circuit_ok)
+
+/**
+ * mgmt_msg_native_get_darrp() - Return a ptr to the dynamic array ptr.
+ * @msg: Pointer to the native message.
+ *
+ * NOTE: Most users can simply use mgmt_msg_native_append() instead of this.
+ *
+ * This function obtains a pointer to the dynamic byte array for this message,
+ * this array actually includes the message header if one is going to look at
+ * the length value. With that in mind any of the `darr_*()` functions/API may
+ * be used to manipulate the variable data at the end of the message.
+ *
+ * NOTE: The pointer returned is actually a pointer to the message pointer
+ * passed in to this function. This pointer to pointer is required so that
+ * realloc can be done inside the darr API.
+ *
+ * NOTE: If reallocs happen the original passed in pointer will be updated;
+ * however, any other pointers into the message will become invalid and so they
+ * should always be discarded after using the returned value.
+ *
+ * Example:
+ *
+ *     void append_metric_path(struct mgmt_msg_my_msg *msg)
+ *     {
+ *          char *xpath = msg->xpath;	// pointer into message
+ *          uint8_t **darp;
+ *
+ *          darrp = mgmt_msg_native_get_darrp(msg);
+ *          darr_in_strcat(*darrp, "/metric");
+ *
+ *          xpath = NULL;		// now invalid
+ *          xpath = msg->xpath;
+ *     }
+ *
+ *
+ * Return: A pointer to the first argument -- which is a pointer to a pointer to
+ * a dynamic array.
+ */
+#define mgmt_msg_native_get_darrp(msg) ((uint8_t **)&(msg))
+
+/* ------------------------- */
+/* Encode and Decode Helpers */
+/* ------------------------- */
+
+/**
+ * mgmt_msg_native_xpath_encode() - encode an xpath in a xpath, data message.
+ * @msg: Pointer to the native message.
+ * @xpath: The xpath string to encode.
+ *
+ * This function starts the encoding of a message that can be decoded with
+ * `mgmt_msg_native_xpath_data_decode()`. The variable length data is comprised
+ * of a NUL terminated string followed by some data of any format. This starts
+ * the first half of the encoding, after which one can simply append the
+ * secondary data to the message.
+ */
+#define mgmt_msg_native_xpath_encode(msg, xpath)                               \
+	do {                                                                   \
+		size_t __slen = strlen(xpath) + 1;                             \
+		mgmt_msg_native_append(msg, xpath, __slen);                    \
+		(msg)->vsplit = __slen;                                        \
+	} while (0)
+
+/**
+ * mgmt_msg_native_xpath_data_decode() - decode an xpath, data format message.
+ * @msg: Pointer to the native message.
+ * @msglen: Length of the message.
+ * @data: [OUT] Pointer to the data section of the variable data
+ *
+ * This function decodes a message that was encoded with
+ * `mgmt_msg_native_xpath_encode()`. The variable length data is comprised of a
+ * NUL terminated string followed by some data of any format.
+ *
+ * Return:
+ *	The xpath string or NULL if there was an error decoding (i.e., the
+ *	message is corrupt).
+ */
+#define mgmt_msg_native_xpath_data_decode(msg, msglen, data)                   \
+	({                                                                     \
+		size_t __len = (msglen) - sizeof(*msg);                        \
+		const char *__s = NULL;                                        \
+		if (msg->vsplit && msg->vsplit <= __len &&                     \
+		    msg->data[msg->vsplit - 1] == 0) {                         \
+			(data) = msg->data + msg->vsplit;                      \
+			__s = msg->data;                                       \
+		}                                                              \
+		__s;                                                           \
+	})
+
+/**
+ * mgmt_msg_native_xpath_decode() - return the xpath from xpath, data message.
+ * @msg: Pointer to the native message.
+ * @msglen: Length of the message.
+ *
+ * This function decodes the xpath from a message that was encoded with
+ * `mgmt_msg_native_xpath_encode()`. The variable length data is comprised of a
+ * NUL terminated string followed by some data of any format.
+ *
+ * Return:
+ *	The xpath string or NULL if there was an error decoding (i.e., the
+ *	message is corrupt).
+ */
+#define mgmt_msg_native_xpath_decode(msg, msglen)                              \
+	({                                                                     \
+		size_t __len = (msglen) - sizeof(*msg);                        \
+		const char *__s = msg->data;                                   \
+		if (!msg->vsplit || msg->vsplit > __len ||                     \
+		    __s[msg->vsplit - 1] != 0)                                 \
+			__s = NULL;                                            \
+		__s;                                                           \
+	})
+
+/**
+ * mgmt_msg_native_data_decode() - return the data from xpath, data message.
+ * @msg: Pointer to the native message.
+ * @msglen: Length of the message.
+ *
+ * This function decodes the secondary data from a message that was encoded with
+ * `mgmt_msg_native_xpath_encode()`. The variable length data is comprised of a
+ * NUL terminated string followed by some data of any format.
+ *
+ * Return:
+ *	The secondary data or NULL if there was an error decoding (i.e., the
+ *	message is corrupt).
+ */
+#define mgmt_msg_native_data_decode(msg, msglen)                               \
+	({                                                                     \
+		size_t __len = (msglen) - sizeof(*msg);                        \
+		const char *__data = msg->data + msg->vsplit;                  \
+		if (!msg->vsplit || msg->vsplit > __len || __data[-1] != 0)    \
+			__data = NULL;                                         \
+		__data;                                                        \
+	})
+
+/**
+ * mgmt_msg_native_data_len_decode() - len of data in xpath, data format message.
+ * @msg: Pointer to the native message.
+ * @msglen: Length of the message.
+ *
+ * This function returns the length of the secondary variable data from a
+ * message that was encoded with `mgmt_msg_native_xpath_encode()`. The variable
+ * length data is comprised of a NUL terminated string followed by some data of
+ * any format.
+ *
+ * Return:
+ *	The length of the secondary variable data. The message is assumed to be
+ *	validated as not corrupt already.
+ */
+#define mgmt_msg_native_data_len_decode(msg, msglen)                           \
+	((msglen) - sizeof(*msg) - msg->vsplit)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _FRR_MGMT_MSG_NATIVE_H_ */
diff --git a/lib/mlag.c b/lib/mlag.c
index a370bf8..62d00ff 100644
--- a/lib/mlag.c
+++ b/lib/mlag.c
@@ -92,7 +92,7 @@ stream_failure:
 }
 
 #define MLAG_MROUTE_ADD_LENGTH                                                 \
-	(VRF_NAMSIZ + INTERFACE_NAMSIZ + 4 + 4 + 4 + 4 + 1 + 1 + 4)
+	(VRF_NAMSIZ + IFNAMSIZ + 4 + 4 + 4 + 4 + 1 + 1 + 4)
 
 int mlag_lib_decode_mroute_add(struct stream *s, struct mlag_mroute_add *msg,
 			       size_t *length)
@@ -108,14 +108,14 @@ int mlag_lib_decode_mroute_add(struct stream *s, struct mlag_mroute_add *msg,
 	STREAM_GETC(s, msg->am_i_dr);
 	STREAM_GETC(s, msg->am_i_dual_active);
 	STREAM_GETL(s, msg->vrf_id);
-	STREAM_GET(msg->intf_name, s, INTERFACE_NAMSIZ);
+	STREAM_GET(msg->intf_name, s, IFNAMSIZ);
 
 	return 0;
 stream_failure:
 	return -1;
 }
 
-#define MLAG_MROUTE_DEL_LENGTH (VRF_NAMSIZ + INTERFACE_NAMSIZ + 4 + 4 + 4 + 4)
+#define MLAG_MROUTE_DEL_LENGTH (VRF_NAMSIZ + IFNAMSIZ + 4 + 4 + 4 + 4)
 
 int mlag_lib_decode_mroute_del(struct stream *s, struct mlag_mroute_del *msg,
 			       size_t *length)
@@ -128,7 +128,7 @@ int mlag_lib_decode_mroute_del(struct stream *s, struct mlag_mroute_del *msg,
 	STREAM_GETL(s, msg->group_ip);
 	STREAM_GETL(s, msg->owner_id);
 	STREAM_GETL(s, msg->vrf_id);
-	STREAM_GET(msg->intf_name, s, INTERFACE_NAMSIZ);
+	STREAM_GET(msg->intf_name, s, IFNAMSIZ);
 
 	return 0;
 stream_failure:
@@ -140,7 +140,7 @@ int mlag_lib_decode_mlag_status(struct stream *s, struct mlag_status *msg)
 	if (s == NULL || msg == NULL)
 		return -1;
 
-	STREAM_GET(msg->peerlink_rif, s, INTERFACE_NAMSIZ);
+	STREAM_GET(msg->peerlink_rif, s, IFNAMSIZ);
 	STREAM_GETL(s, msg->my_role);
 	STREAM_GETL(s, msg->peer_state);
 	return 0;
diff --git a/lib/mlag.h b/lib/mlag.h
index 3aef0d7..91c550b 100644
--- a/lib/mlag.h
+++ b/lib/mlag.h
@@ -65,7 +65,7 @@ struct mlag_frr_status {
 };
 
 struct mlag_status {
-	char peerlink_rif[INTERFACE_NAMSIZ];
+	char peerlink_rif[IFNAMSIZ];
 	enum mlag_role my_role;
 	enum mlag_state peer_state;
 };
@@ -86,7 +86,7 @@ struct mlag_mroute_add {
 	bool am_i_dr;
 	bool am_i_dual_active;
 	vrf_id_t vrf_id;
-	char intf_name[INTERFACE_NAMSIZ];
+	char intf_name[IFNAMSIZ];
 };
 
 struct mlag_mroute_del {
@@ -95,7 +95,7 @@ struct mlag_mroute_del {
 	uint32_t group_ip;
 	enum mlag_owner owner_id;
 	vrf_id_t vrf_id;
-	char intf_name[INTERFACE_NAMSIZ];
+	char intf_name[IFNAMSIZ];
 };
 
 struct mlag_msg {
diff --git a/lib/netns_linux.c b/lib/netns_linux.c
index 297e2c5..8fa4bc6 100644
--- a/lib/netns_linux.c
+++ b/lib/netns_linux.c
@@ -5,6 +5,7 @@
  */
 
 #include <zebra.h>
+#include <fcntl.h>
 
 #ifdef HAVE_NETNS
 #undef _GNU_SOURCE
@@ -502,12 +503,19 @@ void ns_init_management(ns_id_t default_ns_id, ns_id_t internal_ns)
 void ns_terminate(void)
 {
 	struct ns *ns;
+	struct ns_map_nsid *ns_map;
 
 	while (!RB_EMPTY(ns_head, &ns_tree)) {
 		ns = RB_ROOT(ns_head, &ns_tree);
 
 		ns_delete(ns);
 	}
+
+	while (!RB_EMPTY(ns_map_nsid_head, &ns_map_nsid_list)) {
+		ns_map = RB_ROOT(ns_map_nsid_head, &ns_map_nsid_list);
+		RB_REMOVE(ns_map_nsid_head, &ns_map_nsid_list, ns_map);
+		XFREE(MTYPE_NS, ns_map);
+	}
 }
 
 int ns_switch_to_netns(const char *name)
diff --git a/lib/network.c b/lib/network.c
index af1c7db..b768693 100644
--- a/lib/network.c
+++ b/lib/network.c
@@ -5,6 +5,7 @@
  */
 
 #include <zebra.h>
+#include <fcntl.h>
 #include "log.h"
 #include "network.h"
 #include "lib_errors.h"
diff --git a/lib/nexthop.c b/lib/nexthop.c
index 8df57e3..4ddb53c 100644
--- a/lib/nexthop.c
+++ b/lib/nexthop.c
@@ -173,7 +173,7 @@ static int _nexthop_cmp_no_labels(const struct nexthop *next1,
 		ret = _nexthop_gateway_cmp(next1, next2);
 		if (ret != 0)
 			return ret;
-		/* Intentional Fall-Through */
+		fallthrough;
 	case NEXTHOP_TYPE_IFINDEX:
 		if (next1->ifindex < next2->ifindex)
 			return -1;
@@ -295,7 +295,7 @@ int nexthop_cmp_basic(const struct nexthop *nh1,
 		ret = nexthop_g_addr_cmp(nh1->type, &nh1->gate, &nh2->gate);
 		if (ret != 0)
 			return ret;
-		/* Intentional Fall-Through */
+		fallthrough;
 	case NEXTHOP_TYPE_IFINDEX:
 		if (nh1->ifindex < nh2->ifindex)
 			return -1;
diff --git a/lib/nexthop_group.c b/lib/nexthop_group.c
index 25370eb..3f408e0 100644
--- a/lib/nexthop_group.c
+++ b/lib/nexthop_group.c
@@ -81,7 +81,8 @@ uint8_t nexthop_group_nexthop_num(const struct nexthop_group *nhg)
 	return num;
 }
 
-uint8_t nexthop_group_nexthop_num_no_recurse(const struct nexthop_group *nhg)
+static uint8_t
+nexthop_group_nexthop_num_no_recurse(const struct nexthop_group *nhg)
 {
 	struct nexthop *nhop;
 	uint8_t num = 0;
@@ -105,20 +106,6 @@ uint8_t nexthop_group_active_nexthop_num(const struct nexthop_group *nhg)
 	return num;
 }
 
-uint8_t
-nexthop_group_active_nexthop_num_no_recurse(const struct nexthop_group *nhg)
-{
-	struct nexthop *nhop;
-	uint8_t num = 0;
-
-	for (nhop = nhg->nexthop; nhop; nhop = nhop->next) {
-		if (CHECK_FLAG(nhop->flags, NEXTHOP_FLAG_ACTIVE))
-			num++;
-	}
-
-	return num;
-}
-
 bool nexthop_group_has_label(const struct nexthop_group *nhg)
 {
 	struct nexthop *nhop;
@@ -180,7 +167,7 @@ static struct nexthop *nhg_nh_find(const struct nexthop_group *nhg,
 						 &nexthop->gate, &nh->gate);
 			if (ret != 0)
 				continue;
-			/* Intentional Fall-Through */
+			fallthrough;
 		case NEXTHOP_TYPE_IFINDEX:
 			if (nexthop->ifindex != nh->ifindex)
 				continue;
@@ -1248,9 +1235,9 @@ void nexthop_group_disable_vrf(struct vrf *vrf)
 	struct nexthop_hold *nhh;
 
 	RB_FOREACH (nhgc, nhgc_entry_head, &nhgc_entries) {
-		struct listnode *node;
+		struct listnode *node, *nnode;
 
-		for (ALL_LIST_ELEMENTS_RO(nhgc->nhg_list, node, nhh)) {
+		for (ALL_LIST_ELEMENTS(nhgc->nhg_list, node, nnode, nhh)) {
 			struct nexthop nhop;
 			struct nexthop *nh;
 
@@ -1271,6 +1258,10 @@ void nexthop_group_disable_vrf(struct vrf *vrf)
 				nhg_hooks.del_nexthop(nhgc, nh);
 
 			nexthop_free(nh);
+
+			list_delete_node(nhgc->nhg_list, node);
+
+			nhgl_delete(nhh);
 		}
 	}
 }
diff --git a/lib/nexthop_group.h b/lib/nexthop_group.h
index 78237e4..822a354 100644
--- a/lib/nexthop_group.h
+++ b/lib/nexthop_group.h
@@ -151,11 +151,7 @@ extern void nexthop_group_json_nexthop(json_object *j,
 /* Return the number of nexthops in this nhg */
 extern uint8_t nexthop_group_nexthop_num(const struct nexthop_group *nhg);
 extern uint8_t
-nexthop_group_nexthop_num_no_recurse(const struct nexthop_group *nhg);
-extern uint8_t
 nexthop_group_active_nexthop_num(const struct nexthop_group *nhg);
-extern uint8_t
-nexthop_group_active_nexthop_num_no_recurse(const struct nexthop_group *nhg);
 
 extern bool nexthop_group_has_label(const struct nexthop_group *nhg);
 
diff --git a/lib/northbound.c b/lib/northbound.c
index 6ff5c24..487f225 100644
--- a/lib/northbound.c
+++ b/lib/northbound.c
@@ -6,6 +6,7 @@
 
 #include <zebra.h>
 
+#include "darr.h"
 #include "libfrr.h"
 #include "log.h"
 #include "lib_errors.h"
@@ -70,12 +71,6 @@ static int nb_transaction_process(enum nb_event event,
 				  char *errmsg, size_t errmsg_len);
 static void nb_transaction_apply_finish(struct nb_transaction *transaction,
 					char *errmsg, size_t errmsg_len);
-static int nb_oper_data_iter_node(const struct lysc_node *snode,
-				  const char *xpath, const void *list_entry,
-				  const struct yang_list_keys *list_keys,
-				  struct yang_translator *translator,
-				  bool first, uint32_t flags,
-				  nb_oper_data_cb cb, void *arg);
 
 static int nb_node_check_config_only(const struct lysc_node *snode, void *arg)
 {
@@ -130,8 +125,8 @@ static int nb_node_new_cb(const struct lysc_node *snode, void *arg)
 	assert(snode->priv == NULL);
 	((struct lysc_node *)snode)->priv = nb_node;
 
-	if (module && module->ignore_cbs)
-		SET_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS);
+	if (module && module->ignore_cfg_cbs)
+		SET_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS);
 
 	return YANG_ITER_CONTINUE;
 }
@@ -162,18 +157,45 @@ void nb_nodes_delete(void)
 struct nb_node *nb_node_find(const char *path)
 {
 	const struct lysc_node *snode;
+	uint32_t llopts = 0;
 
 	/*
 	 * Use libyang to find the schema node associated to the path and get
-	 * the northbound node from there (snode private pointer).
+	 * the northbound node from there (snode private pointer). We need to
+	 * disable logging temporarily to avoid libyang from logging an error
+	 * message when the node is not found.
 	 */
+	ly_temp_log_options(&llopts);
+
 	snode = yang_find_snode(ly_native_ctx, path, 0);
+
+	ly_temp_log_options(NULL);
 	if (!snode)
 		return NULL;
 
 	return snode->priv;
 }
 
+struct nb_node **nb_nodes_find(const char *xpath)
+{
+	struct lysc_node **snodes = NULL;
+	struct nb_node **nb_nodes = NULL;
+	bool simple;
+	LY_ERR err;
+	uint i;
+
+	err = yang_resolve_snode_xpath(ly_native_ctx, xpath, &snodes, &simple);
+	if (err)
+		return NULL;
+
+	darr_ensure_i(nb_nodes, darr_lasti(snodes));
+	darr_foreach_i (snodes, i)
+		nb_nodes[i] = snodes[i]->priv;
+	darr_free(snodes);
+	return nb_nodes;
+}
+
+
 void nb_node_set_dependency_cbs(const char *dependency_xpath,
 				const char *dependant_xpath,
 				struct nb_dependency_callbacks *cbs)
@@ -194,12 +216,12 @@ bool nb_node_has_dependency(struct nb_node *node)
 }
 
 static int nb_node_validate_cb(const struct nb_node *nb_node,
-			       enum nb_operation operation,
+			       enum nb_cb_operation operation,
 			       int callback_implemented, bool optional)
 {
 	bool valid;
 
-	valid = nb_operation_is_valid(operation, nb_node->snode);
+	valid = nb_cb_operation_is_valid(operation, nb_node->snode);
 
 	/*
 	 * Add an exception for operational data callbacks. A rw list usually
@@ -211,15 +233,15 @@ static int nb_node_validate_cb(const struct nb_node *nb_node,
 	 * depends on context (e.g. some daemons might augment "frr-interface"
 	 * while others don't).
 	 */
-	if (!valid && callback_implemented && operation != NB_OP_GET_NEXT
-	    && operation != NB_OP_GET_KEYS && operation != NB_OP_LOOKUP_ENTRY)
+	if (!valid && callback_implemented && operation != NB_CB_GET_NEXT
+	    && operation != NB_CB_GET_KEYS && operation != NB_CB_LOOKUP_ENTRY)
 		flog_warn(EC_LIB_NB_CB_UNNEEDED,
 			  "unneeded '%s' callback for '%s'",
-			  nb_operation_name(operation), nb_node->xpath);
+			  nb_cb_operation_name(operation), nb_node->xpath);
 
 	if (!optional && valid && !callback_implemented) {
 		flog_err(EC_LIB_NB_CB_MISSING, "missing '%s' callback for '%s'",
-			 nb_operation_name(operation), nb_node->xpath);
+			 nb_cb_operation_name(operation), nb_node->xpath);
 		return 1;
 	}
 
@@ -235,31 +257,33 @@ static unsigned int nb_node_validate_cbs(const struct nb_node *nb_node)
 {
 	unsigned int error = 0;
 
-	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS))
+	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
 		return error;
 
-	error += nb_node_validate_cb(nb_node, NB_OP_CREATE,
+	error += nb_node_validate_cb(nb_node, NB_CB_CREATE,
 				     !!nb_node->cbs.create, false);
-	error += nb_node_validate_cb(nb_node, NB_OP_MODIFY,
+	error += nb_node_validate_cb(nb_node, NB_CB_MODIFY,
 				     !!nb_node->cbs.modify, false);
-	error += nb_node_validate_cb(nb_node, NB_OP_DESTROY,
+	error += nb_node_validate_cb(nb_node, NB_CB_DESTROY,
 				     !!nb_node->cbs.destroy, false);
-	error += nb_node_validate_cb(nb_node, NB_OP_MOVE, !!nb_node->cbs.move,
+	error += nb_node_validate_cb(nb_node, NB_CB_MOVE, !!nb_node->cbs.move,
 				     false);
-	error += nb_node_validate_cb(nb_node, NB_OP_PRE_VALIDATE,
+	error += nb_node_validate_cb(nb_node, NB_CB_PRE_VALIDATE,
 				     !!nb_node->cbs.pre_validate, true);
-	error += nb_node_validate_cb(nb_node, NB_OP_APPLY_FINISH,
+	error += nb_node_validate_cb(nb_node, NB_CB_APPLY_FINISH,
 				     !!nb_node->cbs.apply_finish, true);
-	error += nb_node_validate_cb(nb_node, NB_OP_GET_ELEM,
+	error += nb_node_validate_cb(nb_node, NB_CB_GET_ELEM,
 				     !!nb_node->cbs.get_elem, false);
-	error += nb_node_validate_cb(nb_node, NB_OP_GET_NEXT,
+	error += nb_node_validate_cb(nb_node, NB_CB_GET_NEXT,
 				     !!nb_node->cbs.get_next, false);
-	error += nb_node_validate_cb(nb_node, NB_OP_GET_KEYS,
+	error += nb_node_validate_cb(nb_node, NB_CB_GET_KEYS,
 				     !!nb_node->cbs.get_keys, false);
-	error += nb_node_validate_cb(nb_node, NB_OP_LOOKUP_ENTRY,
+	error += nb_node_validate_cb(nb_node, NB_CB_LOOKUP_ENTRY,
 				     !!nb_node->cbs.lookup_entry, false);
-	error += nb_node_validate_cb(nb_node, NB_OP_RPC, !!nb_node->cbs.rpc,
+	error += nb_node_validate_cb(nb_node, NB_CB_RPC, !!nb_node->cbs.rpc,
 				     false);
+	error += nb_node_validate_cb(nb_node, NB_CB_NOTIFY,
+				     !!nb_node->cbs.notify, true);
 
 	return error;
 }
@@ -305,8 +329,6 @@ struct nb_config *nb_config_new(struct lyd_node *dnode)
 		config->dnode = yang_dnode_new(ly_native_ctx, true);
 	config->version = 0;
 
-	RB_INIT(nb_config_cbs, &config->cfg_chgs);
-
 	return config;
 }
 
@@ -314,7 +336,7 @@ void nb_config_free(struct nb_config *config)
 {
 	if (config->dnode)
 		yang_dnode_free(config->dnode);
-	nb_config_diff_del_changes(&config->cfg_chgs);
+
 	XFREE(MTYPE_NB_CONFIG, config);
 }
 
@@ -326,8 +348,6 @@ struct nb_config *nb_config_dup(const struct nb_config *config)
 	dup->dnode = yang_dnode_dup(config->dnode);
 	dup->version = config->version;
 
-	RB_INIT(nb_config_cbs, &dup->cfg_chgs);
-
 	return dup;
 }
 
@@ -369,13 +389,29 @@ void nb_config_replace(struct nb_config *config_dst,
 static inline int nb_config_cb_compare(const struct nb_config_cb *a,
 				       const struct nb_config_cb *b)
 {
-	/* Sort by priority first. */
-	if (a->nb_node->priority < b->nb_node->priority)
+	bool a_destroy = a->operation == NB_CB_DESTROY;
+	bool b_destroy = b->operation == NB_CB_DESTROY;
+
+	/*
+	 * Sort by operation first. All "destroys" must come first, to correctly
+	 * process the change of a "case" inside a "choice". The old "case" must
+	 * be deleted before the new "case" is created.
+	 */
+	if (a_destroy && !b_destroy)
 		return -1;
-	if (a->nb_node->priority > b->nb_node->priority)
+	if (!a_destroy && b_destroy)
 		return 1;
 
 	/*
+	 * Then sort by priority. If the operation is "destroy", reverse the
+	 * order, so that the dependants are deleted before the dependencies.
+	 */
+	if (a->nb_node->priority < b->nb_node->priority)
+		return !a_destroy ? -1 : 1;
+	if (a->nb_node->priority > b->nb_node->priority)
+		return !a_destroy ? 1 : -1;
+
+	/*
 	 * Preserve the order of the configuration changes as told by libyang.
 	 */
 	if (a->seq < b->seq)
@@ -397,10 +433,9 @@ static inline int nb_config_cb_compare(const struct nb_config_cb *a,
 }
 RB_GENERATE(nb_config_cbs, nb_config_cb, entry, nb_config_cb_compare);
 
-static void nb_config_diff_add_change(struct nb_config_cbs *changes,
-				      enum nb_operation operation,
-				      uint32_t *seq,
-				      const struct lyd_node *dnode)
+void nb_config_diff_add_change(struct nb_config_cbs *changes,
+			       enum nb_cb_operation operation, uint32_t *seq,
+			       const struct lyd_node *dnode)
 {
 	struct nb_config_change *change;
 
@@ -438,7 +473,7 @@ void nb_config_diff_del_changes(struct nb_config_cbs *changes)
 void nb_config_diff_created(const struct lyd_node *dnode, uint32_t *seq,
 			    struct nb_config_cbs *changes)
 {
-	enum nb_operation operation;
+	enum nb_cb_operation operation;
 	struct lyd_node *child;
 
 	/* Ignore unimplemented nodes. */
@@ -451,10 +486,10 @@ void nb_config_diff_created(const struct lyd_node *dnode, uint32_t *seq,
 		if (lyd_is_default(dnode))
 			break;
 
-		if (nb_operation_is_valid(NB_OP_CREATE, dnode->schema))
-			operation = NB_OP_CREATE;
-		else if (nb_operation_is_valid(NB_OP_MODIFY, dnode->schema))
-			operation = NB_OP_MODIFY;
+		if (nb_cb_operation_is_valid(NB_CB_CREATE, dnode->schema))
+			operation = NB_CB_CREATE;
+		else if (nb_cb_operation_is_valid(NB_CB_MODIFY, dnode->schema))
+			operation = NB_CB_MODIFY;
 		else
 			return;
 
@@ -462,8 +497,8 @@ void nb_config_diff_created(const struct lyd_node *dnode, uint32_t *seq,
 		break;
 	case LYS_CONTAINER:
 	case LYS_LIST:
-		if (nb_operation_is_valid(NB_OP_CREATE, dnode->schema))
-			nb_config_diff_add_change(changes, NB_OP_CREATE, seq,
+		if (nb_cb_operation_is_valid(NB_CB_CREATE, dnode->schema))
+			nb_config_diff_add_change(changes, NB_CB_CREATE, seq,
 						  dnode);
 
 		/* Process child nodes recursively. */
@@ -483,8 +518,8 @@ static void nb_config_diff_deleted(const struct lyd_node *dnode, uint32_t *seq,
 	if (!dnode->schema->priv)
 		return;
 
-	if (nb_operation_is_valid(NB_OP_DESTROY, dnode->schema))
-		nb_config_diff_add_change(changes, NB_OP_DESTROY, seq, dnode);
+	if (nb_cb_operation_is_valid(NB_CB_DESTROY, dnode->schema))
+		nb_config_diff_add_change(changes, NB_CB_DESTROY, seq, dnode);
 	else if (CHECK_FLAG(dnode->schema->nodetype, LYS_CONTAINER)) {
 		struct lyd_node *child;
 
@@ -633,7 +668,7 @@ void nb_config_diff(const struct nb_config *config1,
 				/* either moving an entry or changing a value */
 				target = yang_dnode_get(config2->dnode, path);
 				assert(target);
-				nb_config_diff_add_change(changes, NB_OP_MODIFY,
+				nb_config_diff_add_change(changes, NB_CB_MODIFY,
 							  &seq, target);
 				break;
 			case 'n': /* none */
@@ -648,44 +683,54 @@ void nb_config_diff(const struct nb_config *config1,
 	lyd_free_all(diff);
 }
 
-int nb_candidate_edit(struct nb_config *candidate,
-		      const struct nb_node *nb_node,
+static int dnode_create(struct nb_config *candidate, const char *xpath,
+			const char *value, uint32_t options,
+			struct lyd_node **new_dnode)
+{
+	struct lyd_node *dnode;
+	LY_ERR err;
+
+	err = lyd_new_path(candidate->dnode, ly_native_ctx, xpath, value,
+			   options, &dnode);
+	if (err) {
+		flog_warn(EC_LIB_LIBYANG, "%s: lyd_new_path(%s) failed: %d",
+			  __func__, xpath, err);
+		return NB_ERR;
+	} else if (dnode) {
+		err = lyd_new_implicit_tree(dnode, LYD_IMPLICIT_NO_STATE, NULL);
+		if (err) {
+			flog_warn(EC_LIB_LIBYANG,
+				  "%s: lyd_new_implicit_all failed: %d",
+				  __func__, err);
+		}
+	}
+	if (new_dnode)
+		*new_dnode = dnode;
+	return NB_OK;
+}
+
+int nb_candidate_edit(struct nb_config *candidate, const struct nb_node *nb_node,
 		      enum nb_operation operation, const char *xpath,
 		      const struct yang_data *previous,
 		      const struct yang_data *data)
 {
-	struct lyd_node *dnode, *dep_dnode;
-	char xpath_edit[XPATH_MAXLEN];
+	struct lyd_node *dnode, *dep_dnode, *old_dnode;
 	char dep_xpath[XPATH_MAXLEN];
+	struct lyd_node *parent = NULL;
+	uint32_t options = 0;
 	LY_ERR err;
 
-	/* Use special notation for leaf-lists (RFC 6020, section 9.13.5). */
-	if (nb_node->snode->nodetype == LYS_LEAFLIST)
-		snprintf(xpath_edit, sizeof(xpath_edit), "%s[.='%s']", xpath,
-			 data->value);
-	else
-		strlcpy(xpath_edit, xpath, sizeof(xpath_edit));
-
 	switch (operation) {
 	case NB_OP_CREATE:
 	case NB_OP_MODIFY:
-		err = lyd_new_path(candidate->dnode, ly_native_ctx, xpath_edit,
-				   (void *)data->value, LYD_NEW_PATH_UPDATE,
+		options = LYD_NEW_PATH_UPDATE;
+		fallthrough;
+	case NB_OP_CREATE_EXCL:
+		err = dnode_create(candidate, xpath, data->value, options,
 				   &dnode);
 		if (err) {
-			flog_warn(EC_LIB_LIBYANG,
-				  "%s: lyd_new_path(%s) failed: %d", __func__,
-				  xpath_edit, err);
-			return NB_ERR;
+			return err;
 		} else if (dnode) {
-			/* Create default nodes */
-			LY_ERR err = lyd_new_implicit_tree(
-				dnode, LYD_IMPLICIT_NO_STATE, NULL);
-			if (err) {
-				flog_warn(EC_LIB_LIBYANG,
-					  "%s: lyd_new_implicit_all failed: %d",
-					  __func__, err);
-			}
 			/*
 			 * create dependency
 			 *
@@ -697,33 +742,24 @@ int nb_candidate_edit(struct nb_config *candidate,
 				nb_node->dep_cbs.get_dependency_xpath(
 					dnode, dep_xpath);
 
-				err = lyd_new_path(candidate->dnode,
-						   ly_native_ctx, dep_xpath,
-						   NULL, LYD_NEW_PATH_UPDATE,
-						   &dep_dnode);
-				/* Create default nodes */
-				if (!err && dep_dnode)
-					err = lyd_new_implicit_tree(
-						dep_dnode,
-						LYD_IMPLICIT_NO_STATE, NULL);
+				err = dnode_create(candidate, dep_xpath, NULL,
+						   LYD_NEW_PATH_UPDATE, NULL);
 				if (err) {
-					flog_warn(
-						EC_LIB_LIBYANG,
-						"%s: dependency: lyd_new_path(%s) failed: %d",
-						__func__, dep_xpath, err);
-					return NB_ERR;
+					lyd_free_tree(dnode);
+					return err;
 				}
 			}
 		}
 		break;
 	case NB_OP_DESTROY:
-		dnode = yang_dnode_get(candidate->dnode, xpath_edit);
-		if (!dnode)
-			/*
-			 * Return a special error code so the caller can choose
-			 * whether to ignore it or not.
-			 */
-			return NB_ERR_NOT_FOUND;
+	case NB_OP_DELETE:
+		dnode = yang_dnode_get(candidate->dnode, xpath);
+		if (!dnode) {
+			if (operation == NB_OP_DELETE)
+				return NB_ERR;
+			else
+				return NB_OK;
+		}
 		/* destroy dependant */
 		if (nb_node->dep_cbs.get_dependant_xpath) {
 			nb_node->dep_cbs.get_dependant_xpath(dnode, dep_xpath);
@@ -734,103 +770,88 @@ int nb_candidate_edit(struct nb_config *candidate,
 		}
 		lyd_free_tree(dnode);
 		break;
+	case NB_OP_REPLACE:
+		old_dnode = yang_dnode_get(candidate->dnode, xpath);
+		if (old_dnode) {
+			parent = lyd_parent(old_dnode);
+			lyd_unlink_tree(old_dnode);
+		}
+		err = dnode_create(candidate, xpath, data->value, options,
+				   &dnode);
+		if (!err && dnode && !old_dnode) {
+			/* create dependency if the node didn't exist */
+			nb_node = dnode->schema->priv;
+			if (nb_node->dep_cbs.get_dependency_xpath) {
+				nb_node->dep_cbs.get_dependency_xpath(
+					dnode, dep_xpath);
+
+				err = dnode_create(candidate, dep_xpath, NULL,
+						   LYD_NEW_PATH_UPDATE, NULL);
+				if (err)
+					lyd_free_tree(dnode);
+			}
+		}
+		if (old_dnode) {
+			/* restore original node on error, free it otherwise */
+			if (err) {
+				if (parent)
+					lyd_insert_child(parent, old_dnode);
+				else
+					lyd_insert_sibling(candidate->dnode,
+							   old_dnode, NULL);
+				return err;
+			}
+
+			lyd_free_tree(old_dnode);
+		}
+		break;
 	case NB_OP_MOVE:
 		/* TODO: update configuration. */
 		break;
-	case NB_OP_PRE_VALIDATE:
-	case NB_OP_APPLY_FINISH:
-	case NB_OP_GET_ELEM:
-	case NB_OP_GET_NEXT:
-	case NB_OP_GET_KEYS:
-	case NB_OP_LOOKUP_ENTRY:
-	case NB_OP_RPC:
-		flog_warn(EC_LIB_DEVELOPMENT,
-			  "%s: unknown operation (%u) [xpath %s]", __func__,
-			  operation, xpath_edit);
-		return NB_ERR;
 	}
 
 	return NB_OK;
 }
 
-static void nb_update_candidate_changes(struct nb_config *candidate,
-					struct nb_cfg_change *change,
-					uint32_t *seq)
+const char *nb_operation_name(enum nb_operation operation)
 {
-	enum nb_operation oper = change->operation;
-	char *xpath = change->xpath;
-	struct lyd_node *root = NULL;
-	struct lyd_node *dnode;
-	struct nb_config_cbs *cfg_chgs = &candidate->cfg_chgs;
-	int op;
-
-	switch (oper) {
+	switch (operation) {
+	case NB_OP_CREATE_EXCL:
+		return "create exclusive";
 	case NB_OP_CREATE:
+		return "create";
 	case NB_OP_MODIFY:
-		root = yang_dnode_get(candidate->dnode, xpath);
-		break;
+		return "modify";
 	case NB_OP_DESTROY:
-		root = yang_dnode_get(running_config->dnode, xpath);
-		/* code */
-		break;
+		return "destroy";
+	case NB_OP_DELETE:
+		return "delete";
+	case NB_OP_REPLACE:
+		return "replace";
 	case NB_OP_MOVE:
-	case NB_OP_PRE_VALIDATE:
-	case NB_OP_APPLY_FINISH:
-	case NB_OP_GET_ELEM:
-	case NB_OP_GET_NEXT:
-	case NB_OP_GET_KEYS:
-	case NB_OP_LOOKUP_ENTRY:
-	case NB_OP_RPC:
-		break;
-	default:
-		assert(!"non-enum value, invalid");
+		return "move";
 	}
 
-	if (!root)
-		return;
-
-	LYD_TREE_DFS_BEGIN (root, dnode) {
-		op = nb_lyd_diff_get_op(dnode);
-		switch (op) {
-		case 'c': /* create */
-			nb_config_diff_created(dnode, seq, cfg_chgs);
-			LYD_TREE_DFS_continue = 1;
-			break;
-		case 'd': /* delete */
-			nb_config_diff_deleted(dnode, seq, cfg_chgs);
-			LYD_TREE_DFS_continue = 1;
-			break;
-		case 'r': /* replace */
-			nb_config_diff_add_change(cfg_chgs, NB_OP_MODIFY, seq,
-						  dnode);
-			break;
-		case 'n': /* none */
-		default:
-			break;
-		}
-		LYD_TREE_DFS_END(root, dnode);
-	}
+	assert(!"Reached end of function we should never hit");
 }
 
-static bool nb_is_operation_allowed(struct nb_node *nb_node,
-				    struct nb_cfg_change *change)
+bool nb_is_operation_allowed(struct nb_node *nb_node, enum nb_operation oper)
 {
-	enum nb_operation oper = change->operation;
-
 	if (lysc_is_key(nb_node->snode)) {
-		if (oper == NB_OP_MODIFY || oper == NB_OP_DESTROY)
+		if (oper == NB_OP_MODIFY || oper == NB_OP_DESTROY
+		    || oper == NB_OP_DELETE || oper == NB_OP_REPLACE)
 			return false;
 	}
 	return true;
 }
 
-void nb_candidate_edit_config_changes(
-	struct nb_config *candidate_config, struct nb_cfg_change cfg_changes[],
-	size_t num_cfg_changes, const char *xpath_base, const char *curr_xpath,
-	int xpath_index, char *err_buf, int err_bufsize, bool *error)
+void nb_candidate_edit_config_changes(struct nb_config *candidate_config,
+				      struct nb_cfg_change cfg_changes[],
+				      size_t num_cfg_changes,
+				      const char *xpath_base, bool in_backend,
+				      char *err_buf, int err_bufsize,
+				      bool *error)
 {
-	uint32_t seq = 0;
-
 	if (error)
 		*error = false;
 
@@ -841,38 +862,38 @@ void nb_candidate_edit_config_changes(
 	for (size_t i = 0; i < num_cfg_changes; i++) {
 		struct nb_cfg_change *change = &cfg_changes[i];
 		struct nb_node *nb_node;
+		char *change_xpath = change->xpath;
 		char xpath[XPATH_MAXLEN];
 		const char *value;
 		struct yang_data *data;
 		int ret;
 
-		/* Handle relative XPaths. */
 		memset(xpath, 0, sizeof(xpath));
-		if (xpath_index > 0 &&
-		    (xpath_base[0] == '.' || change->xpath[0] == '.'))
-			strlcpy(xpath, curr_xpath, sizeof(xpath));
-		if (xpath_base[0]) {
-			if (xpath_base[0] == '.')
-				strlcat(xpath, xpath_base + 1, sizeof(xpath));
-			else
-				strlcat(xpath, xpath_base, sizeof(xpath));
+		/* If change xpath is relative, prepend base xpath. */
+		if (change_xpath[0] == '.') {
+			strlcpy(xpath, xpath_base, sizeof(xpath));
+			change_xpath++; /* skip '.' */
 		}
-		if (change->xpath[0] == '.')
-			strlcat(xpath, change->xpath + 1, sizeof(xpath));
-		else
-			strlcpy(xpath, change->xpath, sizeof(xpath));
+		strlcat(xpath, change_xpath, sizeof(xpath));
 
 		/* Find the northbound node associated to the data path. */
 		nb_node = nb_node_find(xpath);
 		if (!nb_node) {
-			flog_warn(EC_LIB_YANG_UNKNOWN_DATA_PATH,
-				  "%s: unknown data path: %s", __func__, xpath);
-			if (error)
-				*error = true;
+			if (in_backend)
+				DEBUGD(&nb_dbg_cbs_config,
+				       "%s: ignoring non-handled path: %s",
+				       __func__, xpath);
+			else {
+				flog_warn(EC_LIB_YANG_UNKNOWN_DATA_PATH,
+					  "%s: unknown data path: %s", __func__,
+					  xpath);
+				if (error)
+					*error = true;
+			}
 			continue;
 		}
 		/* Find if the node to be edited is not a key node */
-		if (!nb_is_operation_allowed(nb_node, change)) {
+		if (!nb_is_operation_allowed(nb_node, change->operation)) {
 			zlog_err(" Xpath %s points to key node", xpath);
 			if (error)
 				*error = true;
@@ -892,7 +913,7 @@ void nb_candidate_edit_config_changes(
 		ret = nb_candidate_edit(candidate_config, nb_node,
 					change->operation, xpath, NULL, data);
 		yang_data_free(data);
-		if (ret != NB_OK && ret != NB_ERR_NOT_FOUND) {
+		if (ret != NB_OK) {
 			flog_warn(
 				EC_LIB_NB_CANDIDATE_EDIT_ERROR,
 				"%s: failed to edit candidate configuration: operation [%s] xpath [%s]",
@@ -902,17 +923,11 @@ void nb_candidate_edit_config_changes(
 				*error = true;
 			continue;
 		}
-		nb_update_candidate_changes(candidate_config, change, &seq);
 	}
 
 	if (error && *error) {
 		char buf[BUFSIZ];
 
-		/*
-		 * Failure to edit the candidate configuration should never
-		 * happen in practice, unless there's a bug in the code. When
-		 * that happens, log the error but otherwise ignore it.
-		 */
 		snprintf(err_buf, err_bufsize,
 			 "%% Failed to edit configuration.\n\n%s",
 			 yang_print_errors(ly_native_ctx, buf, sizeof(buf)));
@@ -949,9 +964,19 @@ int nb_candidate_update(struct nb_config *candidate)
 int nb_candidate_validate_yang(struct nb_config *candidate, bool no_state,
 			       char *errmsg, size_t errmsg_len)
 {
-	if (lyd_validate_all(&candidate->dnode, ly_native_ctx,
-			     no_state ? LYD_VALIDATE_NO_STATE
-				      : LYD_VALIDATE_PRESENT,
+	uint32_t options = 0;
+
+#ifdef LYD_VALIDATE_MULTI_ERROR
+	/* libyang 2.1.36+ */
+	options |= LYD_VALIDATE_MULTI_ERROR;
+#endif
+
+	if (no_state)
+		SET_FLAG(options, LYD_VALIDATE_NO_STATE);
+	else
+		SET_FLAG(options, LYD_VALIDATE_PRESENT);
+
+	if (lyd_validate_all(&candidate->dnode, ly_native_ctx, options,
 			     NULL) != 0) {
 		yang_print_errors(ly_native_ctx, errmsg, errmsg_len);
 		return NB_ERR_VALIDATION;
@@ -1193,7 +1218,7 @@ int nb_running_lock_check(enum nb_client client, const void *user)
 }
 
 static void nb_log_config_callback(const enum nb_event event,
-				   enum nb_operation operation,
+				   enum nb_cb_operation operation,
 				   const struct lyd_node *dnode)
 {
 	const char *value;
@@ -1210,7 +1235,7 @@ static void nb_log_config_callback(const enum nb_event event,
 
 	zlog_debug(
 		"northbound callback: event [%s] op [%s] xpath [%s] value [%s]",
-		nb_event_name(event), nb_operation_name(operation), xpath,
+		nb_event_name(event), nb_cb_operation_name(operation), xpath,
 		value);
 }
 
@@ -1224,9 +1249,9 @@ static int nb_callback_create(struct nb_context *context,
 	bool unexpected_error = false;
 	int ret;
 
-	assert(!CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS));
+	assert(!CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS));
 
-	nb_log_config_callback(event, NB_OP_CREATE, dnode);
+	nb_log_config_callback(event, NB_CB_CREATE, dnode);
 
 	args.context = context;
 	args.event = event;
@@ -1275,9 +1300,9 @@ static int nb_callback_modify(struct nb_context *context,
 	bool unexpected_error = false;
 	int ret;
 
-	assert(!CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS));
+	assert(!CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS));
 
-	nb_log_config_callback(event, NB_OP_MODIFY, dnode);
+	nb_log_config_callback(event, NB_CB_MODIFY, dnode);
 
 	args.context = context;
 	args.event = event;
@@ -1326,9 +1351,9 @@ static int nb_callback_destroy(struct nb_context *context,
 	bool unexpected_error = false;
 	int ret;
 
-	assert(!CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS));
+	assert(!CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS));
 
-	nb_log_config_callback(event, NB_OP_DESTROY, dnode);
+	nb_log_config_callback(event, NB_CB_DESTROY, dnode);
 
 	args.context = context;
 	args.event = event;
@@ -1371,9 +1396,9 @@ static int nb_callback_move(struct nb_context *context,
 	bool unexpected_error = false;
 	int ret;
 
-	assert(!CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS));
+	assert(!CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS));
 
-	nb_log_config_callback(event, NB_OP_MOVE, dnode);
+	nb_log_config_callback(event, NB_CB_MOVE, dnode);
 
 	args.context = context;
 	args.event = event;
@@ -1416,10 +1441,10 @@ static int nb_callback_pre_validate(struct nb_context *context,
 	bool unexpected_error = false;
 	int ret;
 
-	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS))
+	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
 		return 0;
 
-	nb_log_config_callback(NB_EV_VALIDATE, NB_OP_PRE_VALIDATE, dnode);
+	nb_log_config_callback(NB_EV_VALIDATE, NB_CB_PRE_VALIDATE, dnode);
 
 	args.dnode = dnode;
 	args.errmsg = errmsg;
@@ -1450,10 +1475,10 @@ static void nb_callback_apply_finish(struct nb_context *context,
 {
 	struct nb_cb_apply_finish_args args = {};
 
-	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS))
+	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
 		return;
 
-	nb_log_config_callback(NB_EV_APPLY, NB_OP_APPLY_FINISH, dnode);
+	nb_log_config_callback(NB_EV_APPLY, NB_CB_APPLY_FINISH, dnode);
 
 	args.context = context;
 	args.dnode = dnode;
@@ -1468,7 +1493,7 @@ struct yang_data *nb_callback_get_elem(const struct nb_node *nb_node,
 {
 	struct nb_cb_get_elem_args args = {};
 
-	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS))
+	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
 		return NULL;
 
 	DEBUGD(&nb_dbg_cbs_state,
@@ -1486,7 +1511,7 @@ const void *nb_callback_get_next(const struct nb_node *nb_node,
 {
 	struct nb_cb_get_next_args args = {};
 
-	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS))
+	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
 		return NULL;
 
 	DEBUGD(&nb_dbg_cbs_state,
@@ -1503,7 +1528,7 @@ int nb_callback_get_keys(const struct nb_node *nb_node, const void *list_entry,
 {
 	struct nb_cb_get_keys_args args = {};
 
-	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS))
+	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
 		return 0;
 
 	DEBUGD(&nb_dbg_cbs_state,
@@ -1521,7 +1546,7 @@ const void *nb_callback_lookup_entry(const struct nb_node *nb_node,
 {
 	struct nb_cb_lookup_entry_args args = {};
 
-	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS))
+	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
 		return NULL;
 
 	DEBUGD(&nb_dbg_cbs_state,
@@ -1533,13 +1558,57 @@ const void *nb_callback_lookup_entry(const struct nb_node *nb_node,
 	return nb_node->cbs.lookup_entry(&args);
 }
 
+const void *nb_callback_lookup_node_entry(struct lyd_node *node,
+					  const void *parent_list_entry)
+{
+	struct yang_list_keys keys;
+	struct nb_cb_lookup_entry_args args = {};
+	const struct nb_node *nb_node = node->schema->priv;
+
+	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
+		return NULL;
+
+	if (yang_get_node_keys(node, &keys)) {
+		flog_warn(EC_LIB_LIBYANG,
+			  "%s: can't get keys for lookup from existing data node %s",
+			  __func__, node->schema->name);
+		return NULL;
+	}
+
+	DEBUGD(&nb_dbg_cbs_state,
+	       "northbound callback (lookup_node_entry): node [%s] parent_list_entry [%p]",
+	       nb_node->xpath, parent_list_entry);
+
+	args.parent_list_entry = parent_list_entry;
+	args.keys = &keys;
+	return nb_node->cbs.lookup_entry(&args);
+}
+
+const void *nb_callback_lookup_next(const struct nb_node *nb_node,
+				    const void *parent_list_entry,
+				    const struct yang_list_keys *keys)
+{
+	struct nb_cb_lookup_entry_args args = {};
+
+	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
+		return NULL;
+
+	DEBUGD(&nb_dbg_cbs_state,
+	       "northbound callback (lookup_entry): node [%s] parent_list_entry [%p]",
+	       nb_node->xpath, parent_list_entry);
+
+	args.parent_list_entry = parent_list_entry;
+	args.keys = keys;
+	return nb_node->cbs.lookup_next(&args);
+}
+
 int nb_callback_rpc(const struct nb_node *nb_node, const char *xpath,
 		    const struct list *input, struct list *output, char *errmsg,
 		    size_t errmsg_len)
 {
 	struct nb_cb_rpc_args args = {};
 
-	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS))
+	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
 		return 0;
 
 	DEBUGD(&nb_dbg_cbs_rpc, "northbound RPC: %s", xpath);
@@ -1552,6 +1621,18 @@ int nb_callback_rpc(const struct nb_node *nb_node, const char *xpath,
 	return nb_node->cbs.rpc(&args);
 }
 
+void nb_callback_notify(const struct nb_node *nb_node, const char *xpath,
+			struct lyd_node *dnode)
+{
+	struct nb_cb_notify_args args = {};
+
+	DEBUGD(&nb_dbg_cbs_notify, "northbound notify: %s", xpath);
+
+	args.xpath = xpath;
+	args.dnode = dnode;
+	nb_node->cbs.notify(&args);
+}
+
 /*
  * Call the northbound configuration callback associated to a given
  * configuration change.
@@ -1561,14 +1642,14 @@ static int nb_callback_configuration(struct nb_context *context,
 				     struct nb_config_change *change,
 				     char *errmsg, size_t errmsg_len)
 {
-	enum nb_operation operation = change->cb.operation;
+	enum nb_cb_operation operation = change->cb.operation;
 	char xpath[XPATH_MAXLEN];
 	const struct nb_node *nb_node = change->cb.nb_node;
 	const struct lyd_node *dnode = change->cb.dnode;
 	union nb_resource *resource;
 	int ret = NB_ERR;
 
-	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CBS))
+	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_IGNORE_CFG_CBS))
 		return NB_OK;
 
 	if (event == NB_EV_VALIDATE)
@@ -1577,29 +1658,30 @@ static int nb_callback_configuration(struct nb_context *context,
 		resource = &change->resource;
 
 	switch (operation) {
-	case NB_OP_CREATE:
+	case NB_CB_CREATE:
 		ret = nb_callback_create(context, nb_node, event, dnode,
 					 resource, errmsg, errmsg_len);
 		break;
-	case NB_OP_MODIFY:
+	case NB_CB_MODIFY:
 		ret = nb_callback_modify(context, nb_node, event, dnode,
 					 resource, errmsg, errmsg_len);
 		break;
-	case NB_OP_DESTROY:
+	case NB_CB_DESTROY:
 		ret = nb_callback_destroy(context, nb_node, event, dnode,
 					  errmsg, errmsg_len);
 		break;
-	case NB_OP_MOVE:
+	case NB_CB_MOVE:
 		ret = nb_callback_move(context, nb_node, event, dnode, errmsg,
 				       errmsg_len);
 		break;
-	case NB_OP_PRE_VALIDATE:
-	case NB_OP_APPLY_FINISH:
-	case NB_OP_GET_ELEM:
-	case NB_OP_GET_NEXT:
-	case NB_OP_GET_KEYS:
-	case NB_OP_LOOKUP_ENTRY:
-	case NB_OP_RPC:
+	case NB_CB_PRE_VALIDATE:
+	case NB_CB_APPLY_FINISH:
+	case NB_CB_GET_ELEM:
+	case NB_CB_GET_NEXT:
+	case NB_CB_GET_KEYS:
+	case NB_CB_LOOKUP_ENTRY:
+	case NB_CB_RPC:
+	case NB_CB_NOTIFY:
 		yang_dnode_get_path(dnode, xpath, sizeof(xpath));
 		flog_err(EC_LIB_DEVELOPMENT,
 			 "%s: unknown operation (%u) [xpath %s]", __func__,
@@ -1615,28 +1697,28 @@ static int nb_callback_configuration(struct nb_context *context,
 			flog_warn(EC_LIB_NB_CB_CONFIG_VALIDATE,
 				  "error processing configuration change: error [%s] event [%s] operation [%s] xpath [%s]%s%s",
 				  nb_err_name(ret), nb_event_name(event),
-				  nb_operation_name(operation), xpath,
+				  nb_cb_operation_name(operation), xpath,
 				  errmsg[0] ? " message: " : "", errmsg);
 			break;
 		case NB_EV_PREPARE:
 			flog_warn(EC_LIB_NB_CB_CONFIG_PREPARE,
 				  "error processing configuration change: error [%s] event [%s] operation [%s] xpath [%s]%s%s",
 				  nb_err_name(ret), nb_event_name(event),
-				  nb_operation_name(operation), xpath,
+				  nb_cb_operation_name(operation), xpath,
 				  errmsg[0] ? " message: " : "", errmsg);
 			break;
 		case NB_EV_ABORT:
 			flog_warn(EC_LIB_NB_CB_CONFIG_ABORT,
 				  "error processing configuration change: error [%s] event [%s] operation [%s] xpath [%s]%s%s",
 				  nb_err_name(ret), nb_event_name(event),
-				  nb_operation_name(operation), xpath,
+				  nb_cb_operation_name(operation), xpath,
 				  errmsg[0] ? " message: " : "", errmsg);
 			break;
 		case NB_EV_APPLY:
 			flog_err(EC_LIB_NB_CB_CONFIG_APPLY,
 				 "error processing configuration change: error [%s] event [%s] operation [%s] xpath [%s]%s%s",
 				 nb_err_name(ret), nb_event_name(event),
-				 nb_operation_name(operation), xpath,
+				 nb_cb_operation_name(operation), xpath,
 				 errmsg[0] ? " message: " : "", errmsg);
 			break;
 		default:
@@ -1743,6 +1825,7 @@ nb_apply_finish_cb_new(struct nb_config_cbs *cbs, const struct nb_node *nb_node,
 	struct nb_config_cb *cb;
 
 	cb = XCALLOC(MTYPE_TMP, sizeof(*cb));
+	cb->operation = NB_CB_APPLY_FINISH;
 	cb->nb_node = nb_node;
 	cb->dnode = dnode;
 	RB_INSERT(nb_config_cbs, cbs, cb);
@@ -1757,6 +1840,7 @@ nb_apply_finish_cb_find(struct nb_config_cbs *cbs,
 {
 	struct nb_config_cb s;
 
+	s.operation = NB_CB_APPLY_FINISH;
 	s.seq = 0;
 	s.nb_node = nb_node;
 	s.dnode = dnode;
@@ -1784,12 +1868,12 @@ static void nb_transaction_apply_finish(struct nb_transaction *transaction,
 		 * (the 'apply_finish' callbacks from the node ancestors should
 		 * be called though).
 		 */
-		if (change->cb.operation == NB_OP_DESTROY) {
+		if (change->cb.operation == NB_CB_DESTROY) {
 			char xpath[XPATH_MAXLEN];
 
 			dnode = lyd_parent(dnode);
 			if (!dnode)
-				break;
+				continue;
 
 			/*
 			 * The dnode from 'delete' callbacks point to elements
@@ -1835,394 +1919,15 @@ static void nb_transaction_apply_finish(struct nb_transaction *transaction,
 	}
 }
 
-static int nb_oper_data_iter_children(const struct lysc_node *snode,
-				      const char *xpath, const void *list_entry,
-				      const struct yang_list_keys *list_keys,
-				      struct yang_translator *translator,
-				      bool first, uint32_t flags,
-				      nb_oper_data_cb cb, void *arg)
-{
-	const struct lysc_node *child;
-
-	LY_LIST_FOR (lysc_node_child(snode), child) {
-		int ret;
-
-		ret = nb_oper_data_iter_node(child, xpath, list_entry,
-					     list_keys, translator, false,
-					     flags, cb, arg);
-		if (ret != NB_OK)
-			return ret;
-	}
-
-	return NB_OK;
-}
-
-static int nb_oper_data_iter_leaf(const struct nb_node *nb_node,
-				  const char *xpath, const void *list_entry,
-				  const struct yang_list_keys *list_keys,
-				  struct yang_translator *translator,
-				  uint32_t flags, nb_oper_data_cb cb, void *arg)
-{
-	struct yang_data *data;
-
-	if (CHECK_FLAG(nb_node->snode->flags, LYS_CONFIG_W))
-		return NB_OK;
-
-	/* Ignore list keys. */
-	if (lysc_is_key(nb_node->snode))
-		return NB_OK;
-
-	data = nb_callback_get_elem(nb_node, xpath, list_entry);
-	if (data == NULL)
-		/* Leaf of type "empty" is not present. */
-		return NB_OK;
-
-	return (*cb)(nb_node->snode, translator, data, arg);
-}
-
-static int nb_oper_data_iter_container(const struct nb_node *nb_node,
-				       const char *xpath,
-				       const void *list_entry,
-				       const struct yang_list_keys *list_keys,
-				       struct yang_translator *translator,
-				       uint32_t flags, nb_oper_data_cb cb,
-				       void *arg)
-{
-	const struct lysc_node *snode = nb_node->snode;
-
-	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_CONFIG_ONLY))
-		return NB_OK;
-
-	/* Read-only presence containers. */
-	if (nb_node->cbs.get_elem) {
-		struct yang_data *data;
-		int ret;
-
-		data = nb_callback_get_elem(nb_node, xpath, list_entry);
-		if (data == NULL)
-			/* Presence container is not present. */
-			return NB_OK;
-
-		ret = (*cb)(snode, translator, data, arg);
-		if (ret != NB_OK)
-			return ret;
-	}
-
-	/* Read-write presence containers. */
-	if (CHECK_FLAG(snode->flags, LYS_CONFIG_W)) {
-		struct lysc_node_container *scontainer;
-
-		scontainer = (struct lysc_node_container *)snode;
-		if (CHECK_FLAG(scontainer->flags, LYS_PRESENCE)
-		    && !yang_dnode_get(running_config->dnode, xpath))
-			return NB_OK;
-	}
-
-	/* Iterate over the child nodes. */
-	return nb_oper_data_iter_children(snode, xpath, list_entry, list_keys,
-					  translator, false, flags, cb, arg);
-}
-
-static int
-nb_oper_data_iter_leaflist(const struct nb_node *nb_node, const char *xpath,
-			   const void *parent_list_entry,
-			   const struct yang_list_keys *parent_list_keys,
-			   struct yang_translator *translator, uint32_t flags,
-			   nb_oper_data_cb cb, void *arg)
-{
-	const void *list_entry = NULL;
-
-	if (CHECK_FLAG(nb_node->snode->flags, LYS_CONFIG_W))
-		return NB_OK;
-
-	do {
-		struct yang_data *data;
-		int ret;
-
-		list_entry = nb_callback_get_next(nb_node, parent_list_entry,
-						  list_entry);
-		if (!list_entry)
-			/* End of the list. */
-			break;
-
-		data = nb_callback_get_elem(nb_node, xpath, list_entry);
-		if (data == NULL)
-			continue;
-
-		ret = (*cb)(nb_node->snode, translator, data, arg);
-		if (ret != NB_OK)
-			return ret;
-	} while (list_entry);
-
-	return NB_OK;
-}
-
-static int nb_oper_data_iter_list(const struct nb_node *nb_node,
-				  const char *xpath_list,
-				  const void *parent_list_entry,
-				  const struct yang_list_keys *parent_list_keys,
-				  struct yang_translator *translator,
-				  uint32_t flags, nb_oper_data_cb cb, void *arg)
-{
-	const struct lysc_node *snode = nb_node->snode;
-	const void *list_entry = NULL;
-	uint32_t position = 1;
-
-	if (CHECK_FLAG(nb_node->flags, F_NB_NODE_CONFIG_ONLY))
-		return NB_OK;
-
-	/* Iterate over all list entries. */
-	do {
-		const struct lysc_node_leaf *skey;
-		struct yang_list_keys list_keys = {};
-		char xpath[XPATH_MAXLEN * 2];
-		int ret;
-
-		/* Obtain list entry. */
-		list_entry = nb_callback_get_next(nb_node, parent_list_entry,
-						  list_entry);
-		if (!list_entry)
-			/* End of the list. */
-			break;
-
-		if (!CHECK_FLAG(nb_node->flags, F_NB_NODE_KEYLESS_LIST)) {
-			/* Obtain the list entry keys. */
-			if (nb_callback_get_keys(nb_node, list_entry,
-						 &list_keys)
-			    != NB_OK) {
-				flog_warn(EC_LIB_NB_CB_STATE,
-					  "%s: failed to get list keys",
-					  __func__);
-				return NB_ERR;
-			}
-
-			/* Build XPath of the list entry. */
-			strlcpy(xpath, xpath_list, sizeof(xpath));
-			unsigned int i = 0;
-			LY_FOR_KEYS (snode, skey) {
-				assert(i < list_keys.num);
-				snprintf(xpath + strlen(xpath),
-					 sizeof(xpath) - strlen(xpath),
-					 "[%s='%s']", skey->name,
-					 list_keys.key[i]);
-				i++;
-			}
-			assert(i == list_keys.num);
-		} else {
-			/*
-			 * Keyless list - build XPath using a positional index.
-			 */
-			snprintf(xpath, sizeof(xpath), "%s[%u]", xpath_list,
-				 position);
-			position++;
-		}
-
-		/* Iterate over the child nodes. */
-		ret = nb_oper_data_iter_children(
-			nb_node->snode, xpath, list_entry, &list_keys,
-			translator, false, flags, cb, arg);
-		if (ret != NB_OK)
-			return ret;
-	} while (list_entry);
-
-	return NB_OK;
-}
-
-static int nb_oper_data_iter_node(const struct lysc_node *snode,
-				  const char *xpath_parent,
-				  const void *list_entry,
-				  const struct yang_list_keys *list_keys,
-				  struct yang_translator *translator,
-				  bool first, uint32_t flags,
-				  nb_oper_data_cb cb, void *arg)
-{
-	struct nb_node *nb_node;
-	char xpath[XPATH_MAXLEN];
-	int ret = NB_OK;
-
-	if (!first && CHECK_FLAG(flags, NB_OPER_DATA_ITER_NORECURSE)
-	    && CHECK_FLAG(snode->nodetype, LYS_CONTAINER | LYS_LIST))
-		return NB_OK;
-
-	/* Update XPath. */
-	strlcpy(xpath, xpath_parent, sizeof(xpath));
-	if (!first && snode->nodetype != LYS_USES) {
-		struct lysc_node *parent;
-
-		/* Get the real parent. */
-		parent = snode->parent;
-
-		/*
-		 * When necessary, include the namespace of the augmenting
-		 * module.
-		 */
-		if (parent && parent->module != snode->module)
-			snprintf(xpath + strlen(xpath),
-				 sizeof(xpath) - strlen(xpath), "/%s:%s",
-				 snode->module->name, snode->name);
-		else
-			snprintf(xpath + strlen(xpath),
-				 sizeof(xpath) - strlen(xpath), "/%s",
-				 snode->name);
-	}
-
-	nb_node = snode->priv;
-	switch (snode->nodetype) {
-	case LYS_CONTAINER:
-		ret = nb_oper_data_iter_container(nb_node, xpath, list_entry,
-						  list_keys, translator, flags,
-						  cb, arg);
-		break;
-	case LYS_LEAF:
-		ret = nb_oper_data_iter_leaf(nb_node, xpath, list_entry,
-					     list_keys, translator, flags, cb,
-					     arg);
-		break;
-	case LYS_LEAFLIST:
-		ret = nb_oper_data_iter_leaflist(nb_node, xpath, list_entry,
-						 list_keys, translator, flags,
-						 cb, arg);
-		break;
-	case LYS_LIST:
-		ret = nb_oper_data_iter_list(nb_node, xpath, list_entry,
-					     list_keys, translator, flags, cb,
-					     arg);
-		break;
-	case LYS_USES:
-		ret = nb_oper_data_iter_children(snode, xpath, list_entry,
-						 list_keys, translator, false,
-						 flags, cb, arg);
-		break;
-	default:
-		break;
-	}
-
-	return ret;
-}
-
-int nb_oper_data_iterate(const char *xpath, struct yang_translator *translator,
-			 uint32_t flags, nb_oper_data_cb cb, void *arg)
-{
-	struct nb_node *nb_node;
-	const void *list_entry = NULL;
-	struct yang_list_keys list_keys;
-	struct list *list_dnodes;
-	struct lyd_node *dnode, *dn;
-	struct listnode *ln;
-	int ret;
-
-	nb_node = nb_node_find(xpath);
-	if (!nb_node) {
-		flog_warn(EC_LIB_YANG_UNKNOWN_DATA_PATH,
-			  "%s: unknown data path: %s", __func__, xpath);
-		return NB_ERR;
-	}
-
-	/* For now this function works only with containers and lists. */
-	if (!CHECK_FLAG(nb_node->snode->nodetype, LYS_CONTAINER | LYS_LIST)) {
-		flog_warn(
-			EC_LIB_NB_OPERATIONAL_DATA,
-			"%s: can't iterate over YANG leaf or leaf-list [xpath %s]",
-			__func__, xpath);
-		return NB_ERR;
-	}
-
-	/*
-	 * Create a data tree from the XPath so that we can parse the keys of
-	 * all YANG lists (if any).
-	 */
-
-	LY_ERR err = lyd_new_path2(NULL, ly_native_ctx, xpath, NULL, 0, 0,
-				   LYD_NEW_PATH_UPDATE, NULL, &dnode);
-	if (err || !dnode) {
-		const char *errmsg =
-			err ? ly_errmsg(ly_native_ctx) : "node not found";
-		flog_warn(EC_LIB_LIBYANG, "%s: lyd_new_path() failed %s",
-			  __func__, errmsg);
-		return NB_ERR;
-	}
-
-	/*
-	 * Create a linked list to sort the data nodes starting from the root.
-	 */
-	list_dnodes = list_new();
-	for (dn = dnode; dn; dn = lyd_parent(dn)) {
-		if (dn->schema->nodetype != LYS_LIST || !lyd_child(dn))
-			continue;
-		listnode_add_head(list_dnodes, dn);
-	}
-	/*
-	 * Use the northbound callbacks to find list entry pointer corresponding
-	 * to the given XPath.
-	 */
-	for (ALL_LIST_ELEMENTS_RO(list_dnodes, ln, dn)) {
-		struct lyd_node *child;
-		struct nb_node *nn;
-		unsigned int n = 0;
-
-		/* Obtain the list entry keys. */
-		memset(&list_keys, 0, sizeof(list_keys));
-		LY_LIST_FOR (lyd_child(dn), child) {
-			if (!lysc_is_key(child->schema))
-				break;
-			strlcpy(list_keys.key[n],
-				yang_dnode_get_string(child, NULL),
-				sizeof(list_keys.key[n]));
-			n++;
-		}
-		list_keys.num = n;
-		if (list_keys.num != yang_snode_num_keys(dn->schema)) {
-			list_delete(&list_dnodes);
-			yang_dnode_free(dnode);
-			return NB_ERR_NOT_FOUND;
-		}
-
-		/* Find the list entry pointer. */
-		nn = dn->schema->priv;
-		if (!nn->cbs.lookup_entry) {
-			flog_warn(
-				EC_LIB_NB_OPERATIONAL_DATA,
-				"%s: data path doesn't support iteration over operational data: %s",
-				__func__, xpath);
-			list_delete(&list_dnodes);
-			yang_dnode_free(dnode);
-			return NB_ERR;
-		}
-
-		list_entry =
-			nb_callback_lookup_entry(nn, list_entry, &list_keys);
-		if (list_entry == NULL) {
-			list_delete(&list_dnodes);
-			yang_dnode_free(dnode);
-			return NB_ERR_NOT_FOUND;
-		}
-	}
-
-	/* If a list entry was given, iterate over that list entry only. */
-	if (dnode->schema->nodetype == LYS_LIST && lyd_child(dnode))
-		ret = nb_oper_data_iter_children(
-			nb_node->snode, xpath, list_entry, &list_keys,
-			translator, true, flags, cb, arg);
-	else
-		ret = nb_oper_data_iter_node(nb_node->snode, xpath, list_entry,
-					     &list_keys, translator, true,
-					     flags, cb, arg);
-
-	list_delete(&list_dnodes);
-	yang_dnode_free(dnode);
-
-	return ret;
-}
-
-bool nb_operation_is_valid(enum nb_operation operation,
-			   const struct lysc_node *snode)
+bool nb_cb_operation_is_valid(enum nb_cb_operation operation,
+			      const struct lysc_node *snode)
 {
 	struct nb_node *nb_node = snode->priv;
 	struct lysc_node_container *scontainer;
 	struct lysc_node_leaf *sleaf;
 
 	switch (operation) {
-	case NB_OP_CREATE:
+	case NB_CB_CREATE:
 		if (!CHECK_FLAG(snode->flags, LYS_CONFIG_W))
 			return false;
 
@@ -2233,6 +1938,8 @@ bool nb_operation_is_valid(enum nb_operation operation,
 				return false;
 			break;
 		case LYS_CONTAINER:
+			if (snode->parent && snode->parent->nodetype == LYS_CASE)
+				return true;
 			scontainer = (struct lysc_node_container *)snode;
 			if (!CHECK_FLAG(scontainer->flags, LYS_PRESENCE))
 				return false;
@@ -2244,7 +1951,7 @@ bool nb_operation_is_valid(enum nb_operation operation,
 			return false;
 		}
 		return true;
-	case NB_OP_MODIFY:
+	case NB_CB_MODIFY:
 		if (!CHECK_FLAG(snode->flags, LYS_CONFIG_W))
 			return false;
 
@@ -2262,7 +1969,7 @@ bool nb_operation_is_valid(enum nb_operation operation,
 			return false;
 		}
 		return true;
-	case NB_OP_DESTROY:
+	case NB_CB_DESTROY:
 		if (!CHECK_FLAG(snode->flags, LYS_CONFIG_W))
 			return false;
 
@@ -2287,6 +1994,8 @@ bool nb_operation_is_valid(enum nb_operation operation,
 				return false;
 			break;
 		case LYS_CONTAINER:
+			if (snode->parent && snode->parent->nodetype == LYS_CASE)
+				return true;
 			scontainer = (struct lysc_node_container *)snode;
 			if (!CHECK_FLAG(scontainer->flags, LYS_PRESENCE))
 				return false;
@@ -2298,7 +2007,7 @@ bool nb_operation_is_valid(enum nb_operation operation,
 			return false;
 		}
 		return true;
-	case NB_OP_MOVE:
+	case NB_CB_MOVE:
 		if (!CHECK_FLAG(snode->flags, LYS_CONFIG_W))
 			return false;
 
@@ -2312,12 +2021,12 @@ bool nb_operation_is_valid(enum nb_operation operation,
 			return false;
 		}
 		return true;
-	case NB_OP_PRE_VALIDATE:
-	case NB_OP_APPLY_FINISH:
+	case NB_CB_PRE_VALIDATE:
+	case NB_CB_APPLY_FINISH:
 		if (!CHECK_FLAG(snode->flags, LYS_CONFIG_W))
 			return false;
 		return true;
-	case NB_OP_GET_ELEM:
+	case NB_CB_GET_ELEM:
 		if (!CHECK_FLAG(snode->flags, LYS_CONFIG_R))
 			return false;
 
@@ -2334,7 +2043,7 @@ bool nb_operation_is_valid(enum nb_operation operation,
 			return false;
 		}
 		return true;
-	case NB_OP_GET_NEXT:
+	case NB_CB_GET_NEXT:
 		switch (snode->nodetype) {
 		case LYS_LIST:
 			if (CHECK_FLAG(nb_node->flags, F_NB_NODE_CONFIG_ONLY))
@@ -2348,8 +2057,8 @@ bool nb_operation_is_valid(enum nb_operation operation,
 			return false;
 		}
 		return true;
-	case NB_OP_GET_KEYS:
-	case NB_OP_LOOKUP_ENTRY:
+	case NB_CB_GET_KEYS:
+	case NB_CB_LOOKUP_ENTRY:
 		switch (snode->nodetype) {
 		case LYS_LIST:
 			if (CHECK_FLAG(nb_node->flags, F_NB_NODE_CONFIG_ONLY))
@@ -2361,7 +2070,7 @@ bool nb_operation_is_valid(enum nb_operation operation,
 			return false;
 		}
 		return true;
-	case NB_OP_RPC:
+	case NB_CB_RPC:
 		if (CHECK_FLAG(snode->flags, LYS_CONFIG_W | LYS_CONFIG_R))
 			return false;
 
@@ -2373,6 +2082,10 @@ bool nb_operation_is_valid(enum nb_operation operation,
 			return false;
 		}
 		return true;
+	case NB_CB_NOTIFY:
+		if (snode->nodetype != LYS_NOTIF)
+			return false;
+		return true;
 	default:
 		return false;
 	}
@@ -2383,17 +2096,81 @@ DEFINE_HOOK(nb_notification_send, (const char *xpath, struct list *arguments),
 
 int nb_notification_send(const char *xpath, struct list *arguments)
 {
+	struct lyd_node *root = NULL;
+	struct lyd_node *dnode;
+	struct yang_data *data;
+	struct listnode *ln;
+	LY_ERR err;
 	int ret;
 
 	DEBUGD(&nb_dbg_notif, "northbound notification: %s", xpath);
 
+	/*
+	 * Call old hook functions
+	 */
 	ret = hook_call(nb_notification_send, xpath, arguments);
+
+	if (!hook_have_hooks(nb_notification_tree_send))
+		goto done;
+	/*
+	 * Convert yang data arguments list to a libyang data tree for new hook
+	 * functions.
+	 */
+	for (ALL_LIST_ELEMENTS_RO(arguments, ln, data)) {
+		err = lyd_new_path(root, ly_native_ctx, data->xpath,
+				   data->value, LYD_NEW_PATH_UPDATE, &dnode);
+		if (err != LY_SUCCESS)
+			goto lyerr;
+		if (!root) {
+			root = dnode;
+			while (root->parent)
+				root = lyd_parent(root);
+		}
+	}
+
+	if (!root) {
+		err = lyd_new_path(NULL, ly_native_ctx, xpath, "", 0, &root);
+		if (err) {
+lyerr:
+			flog_err(EC_LIB_LIBYANG,
+				 "%s: error creating notification data: %s",
+				 __func__, ly_strerrcode(err));
+			ret += 1;
+			goto done;
+		}
+	}
+
+	/*
+	 * Call new hook functions
+	 */
+	ret += nb_notification_tree_send(xpath, root);
+
+done:
+	if (root)
+		lyd_free_all(root);
 	if (arguments)
 		list_delete(&arguments);
 
 	return ret;
 }
 
+DEFINE_HOOK(nb_notification_tree_send,
+	    (const char *xpath, const struct lyd_node *tree), (xpath, tree));
+
+int nb_notification_tree_send(const char *xpath, const struct lyd_node *tree)
+{
+	int ret;
+
+	assert(tree);
+
+	DEBUGD(&nb_dbg_notif, "northbound tree notification: %s",
+	       tree->schema->name);
+
+	ret = hook_call(nb_notification_tree_send, xpath, tree);
+
+	return ret;
+}
+
 /* Running configuration user pointers management. */
 struct nb_config_entry {
 	char xpath[XPATH_MAXLEN];
@@ -2563,31 +2340,33 @@ const char *nb_event_name(enum nb_event event)
 	assert(!"Reached end of function we should never hit");
 }
 
-const char *nb_operation_name(enum nb_operation operation)
+const char *nb_cb_operation_name(enum nb_cb_operation operation)
 {
 	switch (operation) {
-	case NB_OP_CREATE:
+	case NB_CB_CREATE:
 		return "create";
-	case NB_OP_MODIFY:
+	case NB_CB_MODIFY:
 		return "modify";
-	case NB_OP_DESTROY:
+	case NB_CB_DESTROY:
 		return "destroy";
-	case NB_OP_MOVE:
+	case NB_CB_MOVE:
 		return "move";
-	case NB_OP_PRE_VALIDATE:
+	case NB_CB_PRE_VALIDATE:
 		return "pre_validate";
-	case NB_OP_APPLY_FINISH:
+	case NB_CB_APPLY_FINISH:
 		return "apply_finish";
-	case NB_OP_GET_ELEM:
+	case NB_CB_GET_ELEM:
 		return "get_elem";
-	case NB_OP_GET_NEXT:
+	case NB_CB_GET_NEXT:
 		return "get_next";
-	case NB_OP_GET_KEYS:
+	case NB_CB_GET_KEYS:
 		return "get_keys";
-	case NB_OP_LOOKUP_ENTRY:
+	case NB_CB_LOOKUP_ENTRY:
 		return "lookup_entry";
-	case NB_OP_RPC:
+	case NB_CB_RPC:
 		return "rpc";
+	case NB_CB_NOTIFY:
+		return "notify";
 	}
 
 	assert(!"Reached end of function we should never hit");
@@ -2612,6 +2391,8 @@ const char *nb_err_name(enum nb_error error)
 		return "failed to allocate resource";
 	case NB_ERR_INCONSISTENCY:
 		return "internal inconsistency";
+	case NB_YIELD:
+		return "should yield";
 	}
 
 	assert(!"Reached end of function we should never hit");
@@ -2643,10 +2424,6 @@ const char *nb_client_name(enum nb_client client)
 
 static void nb_load_callbacks(const struct frr_yang_module_info *module)
 {
-
-	if (module->ignore_cbs)
-		return;
-
 	for (size_t i = 0; module->nodes[i].xpath; i++) {
 		struct nb_node *nb_node;
 		uint32_t priority;
@@ -2712,7 +2489,8 @@ void nb_init(struct event_loop *tm,
 	for (size_t i = 0; i < nmodules; i++) {
 		DEBUGD(&nb_dbg_events, "northbound: loading %s.yang",
 		       modules[i]->name);
-		*loadedp++ = yang_module_load(modules[i]->name);
+		*loadedp++ = yang_module_load(modules[i]->name,
+					      modules[i]->features);
 	}
 
 	if (explicit_compile)
@@ -2737,10 +2515,15 @@ void nb_init(struct event_loop *tm,
 
 	/* Initialize the northbound CLI. */
 	nb_cli_init(tm);
+
+	/* Initialize oper-state */
+	nb_oper_init(tm);
 }
 
 void nb_terminate(void)
 {
+	nb_oper_terminate();
+
 	/* Terminate the northbound CLI. */
 	nb_cli_terminate();
 
diff --git a/lib/northbound.h b/lib/northbound.h
index 1723a87..5be111c 100644
--- a/lib/northbound.h
+++ b/lib/northbound.h
@@ -83,28 +83,23 @@ enum nb_event {
 };
 
 /*
- * Northbound operations.
+ * Northbound callback operations.
  *
  * Refer to the documentation comments of nb_callbacks for more details.
  */
-enum nb_operation {
-	NB_OP_CREATE,
-	NB_OP_MODIFY,
-	NB_OP_DESTROY,
-	NB_OP_MOVE,
-	NB_OP_PRE_VALIDATE,
-	NB_OP_APPLY_FINISH,
-	NB_OP_GET_ELEM,
-	NB_OP_GET_NEXT,
-	NB_OP_GET_KEYS,
-	NB_OP_LOOKUP_ENTRY,
-	NB_OP_RPC,
-};
-
-struct nb_cfg_change {
-	char xpath[XPATH_MAXLEN];
-	enum nb_operation operation;
-	const char *value;
+enum nb_cb_operation {
+	NB_CB_CREATE,
+	NB_CB_MODIFY,
+	NB_CB_DESTROY,
+	NB_CB_MOVE,
+	NB_CB_PRE_VALIDATE,
+	NB_CB_APPLY_FINISH,
+	NB_CB_GET_ELEM,
+	NB_CB_GET_NEXT,
+	NB_CB_GET_KEYS,
+	NB_CB_LOOKUP_ENTRY,
+	NB_CB_RPC,
+	NB_CB_NOTIFY,
 };
 
 union nb_resource {
@@ -292,6 +287,18 @@ struct nb_cb_rpc_args {
 	size_t errmsg_len;
 };
 
+struct nb_cb_notify_args {
+	/* XPath of the notification. */
+	const char *xpath;
+
+	/*
+	 * libyang data node representing the notification. If the notification
+	 * is not top-level, it still points to the notification node, but it's
+	 * part of the full data tree with all its parents.
+	 */
+	struct lyd_node *dnode;
+};
+
 /*
  * Set of configuration callbacks that can be associated to a northbound node.
  */
@@ -485,6 +492,22 @@ struct nb_callbacks {
 	const void *(*lookup_entry)(struct nb_cb_lookup_entry_args *args);
 
 	/*
+	 * Operational data callback for YANG lists.
+	 *
+	 * The callback function should return the next list entry that would
+	 * follow a list entry with the keys given as a parameter. Keyless
+	 * lists don't need to implement this  callback.
+	 *
+	 * args
+	 *    Refer to the documentation comments of nb_cb_lookup_entry_args for
+	 *    details.
+	 *
+	 * Returns:
+	 *    Pointer to the list entry if found, or NULL if not found.
+	 */
+	const void *(*lookup_next)(struct nb_cb_lookup_entry_args *args);
+
+	/*
 	 * RPC and action callback.
 	 *
 	 * Both 'input' and 'output' are lists of 'yang_data' structures. The
@@ -500,6 +523,17 @@ struct nb_callbacks {
 	int (*rpc)(struct nb_cb_rpc_args *args);
 
 	/*
+	 * Notification callback.
+	 *
+	 * The callback is called when a YANG notification is received.
+	 *
+	 * args
+	 *    Refer to the documentation comments of nb_cb_notify_args for
+	 *    details.
+	 */
+	void (*notify)(struct nb_cb_notify_args *args);
+
+	/*
 	 * Optional callback to compare the data nodes when printing
 	 * the CLI commands associated with them.
 	 *
@@ -597,8 +631,8 @@ struct nb_node {
 #define F_NB_NODE_CONFIG_ONLY 0x01
 /* The YANG list doesn't contain key leafs. */
 #define F_NB_NODE_KEYLESS_LIST 0x02
-/* Ignore callbacks for this node */
-#define F_NB_NODE_IGNORE_CBS 0x04
+/* Ignore config callbacks for this node */
+#define F_NB_NODE_IGNORE_CFG_CBS 0x04
 
 /*
  * HACK: old gcc versions (< 5.x) have a bug that prevents C99 flexible arrays
@@ -612,10 +646,19 @@ struct frr_yang_module_info {
 	const char *name;
 
 	/*
-	 * Ignore callbacks for this module. Set this to true to
-	 * load module without any callbacks.
+	 * Ignore configuration callbacks for this module. Set this to true to
+	 * load module with only CLI-related callbacks. This is useful for
+	 * modules loaded in mgmtd.
 	 */
-	bool ignore_cbs;
+	bool ignore_cfg_cbs;
+
+	/*
+	 * The NULL-terminated list of supported features.
+	 * Features are defined with "feature" statements in the YANG model.
+	 * Use ["*", NULL] to enable all features.
+	 * Use NULL to disable all features.
+	 */
+	const char **features;
 
 	/* Northbound callbacks. */
 	const struct {
@@ -644,6 +687,7 @@ enum nb_error {
 	NB_ERR_VALIDATION,
 	NB_ERR_RESOURCE,
 	NB_ERR_INCONSISTENCY,
+	NB_YIELD,
 };
 
 /* Default priority. */
@@ -676,7 +720,7 @@ struct nb_context {
 /* Northbound configuration callback. */
 struct nb_config_cb {
 	RB_ENTRY(nb_config_cb) entry;
-	enum nb_operation operation;
+	enum nb_cb_operation operation;
 	uint32_t seq;
 	const struct nb_node *nb_node;
 	const struct lyd_node *dnode;
@@ -703,7 +747,26 @@ struct nb_transaction {
 struct nb_config {
 	struct lyd_node *dnode;
 	uint32_t version;
-	struct nb_config_cbs cfg_chgs;
+};
+
+/*
+ * Northbound operations. The semantics of operations is explained in RFC 8072,
+ * section 2.5: https://datatracker.ietf.org/doc/html/rfc8072#section-2.5.
+ */
+enum nb_operation {
+	NB_OP_CREATE_EXCL,	/* "create" */
+	NB_OP_CREATE,		/* "merge" - kept for backward compatibility */
+	NB_OP_MODIFY,		/* "merge" */
+	NB_OP_DESTROY,		/* "remove" */
+	NB_OP_DELETE,		/* "delete" */
+	NB_OP_REPLACE,		/* "replace" */
+	NB_OP_MOVE,		/* "move" */
+};
+
+struct nb_cfg_change {
+	char xpath[XPATH_MAXLEN];
+	enum nb_operation operation;
+	const char *value;
 };
 
 /* Callback function used by nb_oper_data_iterate(). */
@@ -711,12 +774,37 @@ typedef int (*nb_oper_data_cb)(const struct lysc_node *snode,
 			       struct yang_translator *translator,
 			       struct yang_data *data, void *arg);
 
+/**
+ * nb_oper_data_finish_cb() - finish a portion or all of a oper data walk.
+ * @tree - r/o copy of the tree created during this portion of the walk.
+ * @arg - finish arg passed to nb_op_iterate_yielding.
+ * @ret - NB_OK if done with walk, NB_YIELD if done with portion, otherwise an
+ *        error.
+ *
+ * If nb_op_iterate_yielding() was passed with @should_batch set then this
+ * callback will be invoked during each portion (batch) of the walk.
+ *
+ * The @tree is read-only and should not be modified or freed.
+ *
+ * If this function returns anything but NB_OK then the walk will be terminated.
+ * and this function will not be called again regardless of if @ret was
+ * `NB_YIELD` or not.
+ *
+ * Return: NB_OK to continue or complete the walk normally, otherwise an error
+ * to immediately terminate the walk.
+ */
+/* Callback function used by nb_oper_data_iter_yielding(). */
+typedef enum nb_error (*nb_oper_data_finish_cb)(const struct lyd_node *tree,
+						void *arg, enum nb_error ret);
+
 /* Iterate over direct child nodes only. */
 #define NB_OPER_DATA_ITER_NORECURSE 0x0001
 
 /* Hooks. */
 DECLARE_HOOK(nb_notification_send, (const char *xpath, struct list *arguments),
 	     (xpath, arguments));
+DECLARE_HOOK(nb_notification_tree_send,
+	     (const char *xpath, const struct lyd_node *tree), (xpath, tree));
 DECLARE_HOOK(nb_client_debug_config_write, (struct vty *vty), (vty));
 DECLARE_HOOK(nb_client_debug_set_all, (uint32_t flags, bool set), (flags, set));
 
@@ -724,6 +812,7 @@ DECLARE_HOOK(nb_client_debug_set_all, (uint32_t flags, bool set), (flags, set));
 extern struct debug nb_dbg_cbs_config;
 extern struct debug nb_dbg_cbs_state;
 extern struct debug nb_dbg_cbs_rpc;
+extern struct debug nb_dbg_cbs_notify;
 extern struct debug nb_dbg_notif;
 extern struct debug nb_dbg_events;
 extern struct debug nb_dbg_libyang;
@@ -744,9 +833,16 @@ extern int nb_callback_get_keys(const struct nb_node *nb_node,
 extern const void *nb_callback_lookup_entry(const struct nb_node *nb_node,
 					    const void *parent_list_entry,
 					    const struct yang_list_keys *keys);
+extern const void *nb_callback_lookup_node_entry(struct lyd_node *node,
+						 const void *parent_list_entry);
+extern const void *nb_callback_lookup_next(const struct nb_node *nb_node,
+					   const void *parent_list_entry,
+					   const struct yang_list_keys *keys);
 extern int nb_callback_rpc(const struct nb_node *nb_node, const char *xpath,
 			   const struct list *input, struct list *output,
 			   char *errmsg, size_t errmsg_len);
+extern void nb_callback_notify(const struct nb_node *nb_node, const char *xpath,
+			       struct lyd_node *dnode);
 
 /*
  * Create a northbound node for all YANG schema nodes.
@@ -769,6 +865,14 @@ void nb_nodes_delete(void);
  */
 extern struct nb_node *nb_node_find(const char *xpath);
 
+/**
+ * nb_nodes_find() - find the NB nodes corresponding to complex xpath.
+ * @xpath: XPath to search for (with or without predicates).
+ *
+ * Return: a dynamic array (darr) of `struct nb_node *`s.
+ */
+extern struct nb_node **nb_nodes_find(const char *xpath);
+
 extern void nb_node_set_dependency_cbs(const char *dependency_xpath,
 				       const char *dependant_xpath,
 				       struct nb_dependency_callbacks *cbs);
@@ -843,6 +947,32 @@ extern void nb_config_replace(struct nb_config *config_dst,
 			      bool preserve_source);
 
 /*
+ * Return a human-readable string representing a northbound operation.
+ *
+ * operation
+ *    Northbound operation.
+ *
+ * Returns:
+ *    String representation of the given northbound operation.
+ */
+extern const char *nb_operation_name(enum nb_operation operation);
+
+/*
+ * Validate if the northbound operation is allowed for the given node.
+ *
+ * nb_node
+ *    Northbound node.
+ *
+ * operation
+ *    Operation we want to check.
+ *
+ * Returns:
+ *    true if the operation is allowed, false otherwise.
+ */
+extern bool nb_is_operation_allowed(struct nb_node *nb_node,
+				    enum nb_operation oper);
+
+/*
  * Edit a candidate configuration.
  *
  * candidate
@@ -866,7 +996,6 @@ extern void nb_config_replace(struct nb_config *config_dst,
  *
  * Returns:
  *    - NB_OK on success.
- *    - NB_ERR_NOT_FOUND when the element to be deleted was not found.
  *    - NB_ERR for other errors.
  */
 extern int nb_candidate_edit(struct nb_config *candidate,
@@ -917,11 +1046,8 @@ extern bool nb_candidate_needs_update(const struct nb_config *candidate);
  * xpath_base
  *    Base xpath for config.
  *
- * curr_xpath
- *    Current xpath for config.
- *
- * xpath_index
- *    Index of xpath being processed.
+ * in_backend
+ *    Specify whether the changes are being applied in the backend or not.
  *
  * err_buf
  *    Buffer to store human-readable error message in case of error.
@@ -932,11 +1058,18 @@ extern bool nb_candidate_needs_update(const struct nb_config *candidate);
  * error
  *    TRUE on error, FALSE on success
  */
-extern void nb_candidate_edit_config_changes(
-	struct nb_config *candidate_config, struct nb_cfg_change cfg_changes[],
-	size_t num_cfg_changes, const char *xpath_base, const char *curr_xpath,
-	int xpath_index, char *err_buf, int err_bufsize, bool *error);
-
+extern void nb_candidate_edit_config_changes(struct nb_config *candidate_config,
+					     struct nb_cfg_change cfg_changes[],
+					     size_t num_cfg_changes,
+					     const char *xpath_base,
+					     bool in_backend, char *err_buf,
+					     int err_bufsize, bool *error);
+
+
+extern void nb_config_diff_add_change(struct nb_config_cbs *changes,
+				      enum nb_cb_operation operation,
+				      uint32_t *seq,
+				      const struct lyd_node *dnode);
 /*
  * Delete candidate configuration changes.
  *
@@ -1258,7 +1391,7 @@ extern int nb_running_unlock(enum nb_client client, const void *user);
 extern int nb_running_lock_check(enum nb_client client, const void *user);
 
 /*
- * Iterate over operational data.
+ * Iterate over operational data -- deprecated.
  *
  * xpath
  *    Data path of the YANG data we want to iterate over.
@@ -1269,21 +1402,60 @@ extern int nb_running_lock_check(enum nb_client client, const void *user);
  * flags
  *    NB_OPER_DATA_ITER_ flags to control how the iteration is performed.
  *
+ * should_batch
+ *    Should call finish cb with partial results (i.e., creating batches)
+ *
  * cb
  *    Function to call with each data node.
  *
  * arg
  *    Arbitrary argument passed as the fourth parameter in each call to 'cb'.
  *
+ * tree
+ *    If non-NULL will contain the data tree built from the walk.
+ *
  * Returns:
  *    NB_OK on success, NB_ERR otherwise.
  */
-extern int nb_oper_data_iterate(const char *xpath,
-				struct yang_translator *translator,
-				uint32_t flags, nb_oper_data_cb cb, void *arg);
+extern enum nb_error nb_oper_iterate_legacy(const char *xpath,
+					    struct yang_translator *translator,
+					    uint32_t flags, nb_oper_data_cb cb,
+					    void *arg, struct lyd_node **tree);
+
+/**
+ * nb_oper_walk() - walk the schema building operational state.
+ * @xpath -
+ * @translator -
+ * @flags -
+ * @should_batch - should allow yielding and processing portions of the tree.
+ * @cb - callback invoked for each non-list, non-container node.
+ * @arg - arg to pass to @cb.
+ * @finish - function to call when done with portion or all of walk.
+ * @finish_arg - arg to pass to @finish.
+ *
+ * Return: walk - a cookie that can be used to cancel the walk.
+ */
+extern void *nb_oper_walk(const char *xpath, struct yang_translator *translator,
+			  uint32_t flags, bool should_batch, nb_oper_data_cb cb,
+			  void *arg, nb_oper_data_finish_cb finish,
+			  void *finish_arg);
+
+/**
+ * nb_oper_cancel_walk() - cancel the in progress walk.
+ * @walk - value returned from nb_op_iterate_yielding()
+ *
+ * Should only be called on an in-progress walk. It is invalid to cancel and
+ * already finished walk. The walks `finish` callback will not be called.
+ */
+extern void nb_oper_cancel_walk(void *walk);
+
+/**
+ * nb_op_cancel_all_walks() - cancel all in progress walks.
+ */
+extern void nb_oper_cancel_all_walks(void);
 
 /*
- * Validate if the northbound operation is valid for the given node.
+ * Validate if the northbound callback operation is valid for the given node.
  *
  * operation
  *    Operation we want to check.
@@ -1294,10 +1466,14 @@ extern int nb_oper_data_iterate(const char *xpath,
  * Returns:
  *    true if the operation is valid, false otherwise.
  */
-extern bool nb_operation_is_valid(enum nb_operation operation,
-				  const struct lysc_node *snode);
+extern bool nb_cb_operation_is_valid(enum nb_cb_operation operation,
+				     const struct lysc_node *snode);
 
 /*
+ * DEPRECATED: This call and infra should no longer be used. Instead,
+ * the mgmtd supported tree based call `nb_notification_tree_send` should be
+ * used instead
+ *
  * Send a YANG notification. This is a no-op unless the 'nb_notification_send'
  * hook was registered by a northbound plugin.
  *
@@ -1314,6 +1490,22 @@ extern bool nb_operation_is_valid(enum nb_operation operation,
 extern int nb_notification_send(const char *xpath, struct list *arguments);
 
 /*
+ * Send a YANG notification from a backend . This is a no-op unless th
+ * 'nb_notification_tree_send' hook was registered by a northbound plugin.
+ *
+ * xpath
+ *    XPath of the YANG notification.
+ *
+ * tree
+ *    The libyang tree for the notification.
+ *
+ * Returns:
+ *    NB_OK on success, NB_ERR otherwise.
+ */
+extern int nb_notification_tree_send(const char *xpath,
+				     const struct lyd_node *tree);
+
+/*
  * Associate a user pointer to a configuration node.
  *
  * This should be called by northbound 'create' callbacks in the NB_EV_APPLY
@@ -1419,15 +1611,15 @@ extern void *nb_running_get_entry_non_rec(const struct lyd_node *dnode,
 extern const char *nb_event_name(enum nb_event event);
 
 /*
- * Return a human-readable string representing a northbound operation.
+ * Return a human-readable string representing a northbound callback operation.
  *
  * operation
- *    Northbound operation.
+ *    Northbound callback operation.
  *
  * Returns:
- *    String representation of the given northbound operation.
+ *    String representation of the given northbound callback operation.
  */
-extern const char *nb_operation_name(enum nb_operation operation);
+extern const char *nb_cb_operation_name(enum nb_cb_operation operation);
 
 /*
  * Return a human-readable string representing a northbound error.
@@ -1488,6 +1680,9 @@ extern void nb_init(struct event_loop *tm,
  */
 extern void nb_terminate(void);
 
+extern void nb_oper_init(struct event_loop *loop);
+extern void nb_oper_terminate(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/northbound_cli.c b/lib/northbound_cli.c
index 8003679..8809ec2 100644
--- a/lib/northbound_cli.c
+++ b/lib/northbound_cli.c
@@ -5,6 +5,7 @@
  */
 
 #include <zebra.h>
+#include <sys/stat.h>
 
 #include "libfrr.h"
 #include "lib/version.h"
@@ -24,6 +25,7 @@
 struct debug nb_dbg_cbs_config = {0, "Northbound callbacks: configuration"};
 struct debug nb_dbg_cbs_state = {0, "Northbound callbacks: state"};
 struct debug nb_dbg_cbs_rpc = {0, "Northbound callbacks: RPCs"};
+struct debug nb_dbg_cbs_notify = {0, "Northbound callbacks: notifications"};
 struct debug nb_dbg_notif = {0, "Northbound notifications"};
 struct debug nb_dbg_events = {0, "Northbound events"};
 struct debug nb_dbg_libyang = {0, "libyang debugging"};
@@ -145,10 +147,9 @@ static int nb_cli_apply_changes_internal(struct vty *vty,
 
 	VTY_CHECK_XPATH;
 
-	nb_candidate_edit_config_changes(
-		vty->candidate_config, vty->cfg_changes, vty->num_cfg_changes,
-		xpath_base, VTY_CURR_XPATH, vty->xpath_index, buf, sizeof(buf),
-		&error);
+	nb_candidate_edit_config_changes(vty->candidate_config, vty->cfg_changes,
+					 vty->num_cfg_changes, xpath_base,
+					 false, buf, sizeof(buf), &error);
 	if (error) {
 		/*
 		 * Failure to edit the candidate configuration should never
@@ -180,8 +181,26 @@ static int nb_cli_apply_changes_internal(struct vty *vty,
 	return CMD_SUCCESS;
 }
 
+static void create_xpath_base_abs(struct vty *vty, char *xpath_base_abs,
+				  size_t xpath_base_abs_size,
+				  const char *xpath_base)
+{
+	memset(xpath_base_abs, 0, xpath_base_abs_size);
+
+	if (xpath_base[0] == 0)
+		xpath_base = ".";
+
+	/* If base xpath is relative, prepend current vty xpath. */
+	if (vty->xpath_index > 0 && xpath_base[0] == '.') {
+		strlcpy(xpath_base_abs, VTY_CURR_XPATH, xpath_base_abs_size);
+		xpath_base++; /* skip '.' */
+	}
+	strlcat(xpath_base_abs, xpath_base, xpath_base_abs_size);
+}
+
 int nb_cli_apply_changes(struct vty *vty, const char *xpath_base_fmt, ...)
 {
+	char xpath_base_abs[XPATH_MAXLEN] = {};
 	char xpath_base[XPATH_MAXLEN] = {};
 	bool implicit_commit;
 	int ret;
@@ -195,6 +214,9 @@ int nb_cli_apply_changes(struct vty *vty, const char *xpath_base_fmt, ...)
 		va_end(ap);
 	}
 
+	create_xpath_base_abs(vty, xpath_base_abs, sizeof(xpath_base_abs),
+			      xpath_base);
+
 	if (vty_mgmt_should_process_cli_apply_changes(vty)) {
 		VTY_CHECK_XPATH;
 
@@ -202,18 +224,20 @@ int nb_cli_apply_changes(struct vty *vty, const char *xpath_base_fmt, ...)
 			return CMD_SUCCESS;
 
 		implicit_commit = vty_needs_implicit_commit(vty);
-		ret = vty_mgmt_send_config_data(vty, implicit_commit);
+		ret = vty_mgmt_send_config_data(vty, xpath_base_abs,
+						implicit_commit);
 		if (ret >= 0 && !implicit_commit)
 			vty->mgmt_num_pending_setcfg++;
 		return ret;
 	}
 
-	return nb_cli_apply_changes_internal(vty, xpath_base, false);
+	return nb_cli_apply_changes_internal(vty, xpath_base_abs, false);
 }
 
 int nb_cli_apply_changes_clear_pending(struct vty *vty,
 				       const char *xpath_base_fmt, ...)
 {
+	char xpath_base_abs[XPATH_MAXLEN] = {};
 	char xpath_base[XPATH_MAXLEN] = {};
 	bool implicit_commit;
 	int ret;
@@ -227,6 +251,9 @@ int nb_cli_apply_changes_clear_pending(struct vty *vty,
 		va_end(ap);
 	}
 
+	create_xpath_base_abs(vty, xpath_base_abs, sizeof(xpath_base_abs),
+			      xpath_base);
+
 	if (vty_mgmt_should_process_cli_apply_changes(vty)) {
 		VTY_CHECK_XPATH;
 		/*
@@ -238,13 +265,14 @@ int nb_cli_apply_changes_clear_pending(struct vty *vty,
 		 * conversions to mgmtd require full proper implementations.
 		 */
 		implicit_commit = vty_needs_implicit_commit(vty);
-		ret = vty_mgmt_send_config_data(vty, implicit_commit);
+		ret = vty_mgmt_send_config_data(vty, xpath_base_abs,
+						implicit_commit);
 		if (ret >= 0 && !implicit_commit)
 			vty->mgmt_num_pending_setcfg++;
 		return ret;
 	}
 
-	return nb_cli_apply_changes_internal(vty, xpath_base, true);
+	return nb_cli_apply_changes_internal(vty, xpath_base_abs, true);
 }
 
 int nb_cli_rpc(struct vty *vty, const char *xpath, struct list *input,
@@ -1411,11 +1439,9 @@ static int nb_cli_oper_data_cb(const struct lysc_node *snode,
 	}
 
 exit:
-	yang_data_free(data);
 	return NB_OK;
 
 error:
-	yang_data_free(data);
 	return NB_ERR;
 }
 
@@ -1464,9 +1490,14 @@ DEFPY (show_yang_operational_data,
 		ly_ctx = ly_native_ctx;
 
 	/* Obtain data. */
-	dnode = yang_dnode_new(ly_ctx, false);
-	ret = nb_oper_data_iterate(xpath, translator, 0, nb_cli_oper_data_cb,
-				   dnode);
+	if (translator) {
+		dnode = yang_dnode_new(ly_ctx, false);
+		ret = nb_oper_iterate_legacy(xpath, translator, 0,
+					   nb_cli_oper_data_cb, dnode, NULL);
+	} else {
+		dnode = NULL;
+		ret = nb_oper_iterate_legacy(xpath, NULL, 0, NULL, NULL, &dnode);
+	}
 	if (ret != NB_OK) {
 		if (format == LYD_JSON)
 			vty_out(vty, "{}\n");
@@ -1474,7 +1505,8 @@ DEFPY (show_yang_operational_data,
 			/* embed ly_last_errmsg() when we get newer libyang */
 			vty_out(vty, "<!-- Not found -->\n");
 		}
-		yang_dnode_free(dnode);
+		if (dnode)
+			yang_dnode_free(dnode);
 		return CMD_WARNING;
 	}
 
@@ -1741,13 +1773,15 @@ DEFPY (rollback_config,
 /* Debug CLI commands. */
 static struct debug *nb_debugs[] = {
 	&nb_dbg_cbs_config, &nb_dbg_cbs_state, &nb_dbg_cbs_rpc,
-	&nb_dbg_notif,      &nb_dbg_events,    &nb_dbg_libyang,
+	&nb_dbg_cbs_notify, &nb_dbg_notif,     &nb_dbg_events,
+	&nb_dbg_libyang,
 };
 
 static const char *const nb_debugs_conflines[] = {
 	"debug northbound callbacks configuration",
 	"debug northbound callbacks state",
 	"debug northbound callbacks rpc",
+	"debug northbound callbacks notify",
 	"debug northbound notifications",
 	"debug northbound events",
 	"debug northbound libyang",
@@ -1772,7 +1806,7 @@ DEFPY (debug_nb,
        debug_nb_cmd,
        "[no] debug northbound\
           [<\
-	    callbacks$cbs [{configuration$cbs_cfg|state$cbs_state|rpc$cbs_rpc}]\
+	    callbacks$cbs [{configuration$cbs_cfg|state$cbs_state|rpc$cbs_rpc|notify$cbs_notify}]\
 	    |notifications$notifications\
 	    |events$events\
 	    |libyang$libyang\
@@ -1785,13 +1819,14 @@ DEFPY (debug_nb,
        "State\n"
        "RPC\n"
        "Notifications\n"
+       "Notifications\n"
        "Events\n"
        "libyang debugging\n")
 {
 	uint32_t mode = DEBUG_NODE2MODE(vty->node);
 
 	if (cbs) {
-		bool none = (!cbs_cfg && !cbs_state && !cbs_rpc);
+		bool none = (!cbs_cfg && !cbs_state && !cbs_rpc && !cbs_notify);
 
 		if (none || cbs_cfg)
 			DEBUG_MODE_SET(&nb_dbg_cbs_config, mode, !no);
@@ -1799,6 +1834,8 @@ DEFPY (debug_nb,
 			DEBUG_MODE_SET(&nb_dbg_cbs_state, mode, !no);
 		if (none || cbs_rpc)
 			DEBUG_MODE_SET(&nb_dbg_cbs_rpc, mode, !no);
+		if (none || cbs_notify)
+			DEBUG_MODE_SET(&nb_dbg_cbs_notify, mode, !no);
 	}
 	if (notifications)
 		DEBUG_MODE_SET(&nb_dbg_notif, mode, !no);
diff --git a/lib/northbound_cli.h b/lib/northbound_cli.h
index c8f8a84..1a45794 100644
--- a/lib/northbound_cli.h
+++ b/lib/northbound_cli.h
@@ -32,7 +32,7 @@ extern struct nb_config *vty_shared_candidate_config;
  *    XPath (absolute or relative) of the configuration option being edited.
  *
  * operation
- *    Operation to apply (either NB_OP_CREATE, NB_OP_MODIFY or NB_OP_DELETE).
+ *    Operation to apply (either NB_OP_CREATE, NB_OP_MODIFY or NB_OP_DESTROY).
  *
  * value
  *    New value of the configuration option. Should be NULL for typeless YANG
diff --git a/lib/northbound_confd.c b/lib/northbound_confd.c
index 34406a1..8503d18 100644
--- a/lib/northbound_confd.c
+++ b/lib/northbound_confd.c
@@ -221,7 +221,7 @@ frr_confd_cdb_diff_iter(confd_hkeypath_t *kp, enum cdb_iter_op cdb_op,
 		nb_op = NB_OP_DESTROY;
 		break;
 	case MOP_VALUE_SET:
-		if (nb_operation_is_valid(NB_OP_MODIFY, nb_node->snode))
+		if (nb_is_operation_allowed(nb_node, NB_OP_MODIFY))
 			nb_op = NB_OP_MODIFY;
 		else
 			/* Ignore list keys modifications. */
diff --git a/lib/northbound_grpc.cpp b/lib/northbound_grpc.cpp
index 6c33351..7957752 100644
--- a/lib/northbound_grpc.cpp
+++ b/lib/northbound_grpc.cpp
@@ -427,25 +427,11 @@ static struct lyd_node *get_dnode_config(const std::string &path)
 	return dnode;
 }
 
-static int get_oper_data_cb(const struct lysc_node *snode,
-			    struct yang_translator *translator,
-			    struct yang_data *data, void *arg)
-{
-	struct lyd_node *dnode = static_cast<struct lyd_node *>(arg);
-	int ret = yang_dnode_edit(dnode, data->xpath, data->value);
-	yang_data_free(data);
-
-	return (ret == 0) ? NB_OK : NB_ERR;
-}
-
 static struct lyd_node *get_dnode_state(const std::string &path)
 {
-	struct lyd_node *dnode = yang_dnode_new(ly_native_ctx, false);
-	if (nb_oper_data_iterate(path.c_str(), NULL, 0, get_oper_data_cb, dnode)
-	    != NB_OK) {
-		yang_dnode_free(dnode);
-		return NULL;
-	}
+	struct lyd_node *dnode = NULL;
+
+	(void)nb_oper_iterate_legacy(path.c_str(), NULL, 0, NULL, NULL, &dnode);
 
 	return dnode;
 }
diff --git a/lib/northbound_oper.c b/lib/northbound_oper.c
new file mode 100644
index 0000000..2394b5e
--- /dev/null
+++ b/lib/northbound_oper.c
@@ -0,0 +1,1857 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * October 14 2023, Christian Hopps <chopps@labn.net>
+ *
+ * Copyright (C) 2018  NetDEF, Inc.
+ *                     Renato Westphal
+ * Copyright (c) 2023, LabN Consulting, L.L.C.
+ *
+ */
+
+#include <zebra.h>
+#include "darr.h"
+#include "debug.h"
+#include "frrevent.h"
+#include "frrstr.h"
+#include "lib_errors.h"
+#include "monotime.h"
+#include "northbound.h"
+
+/*
+ * YANG model yielding design restrictions:
+ *
+ * In order to be able to yield and guarantee we have a valid data tree at the
+ * point of yielding we must know that each parent has all it's siblings
+ * collected to represent a complete element.
+ *
+ * Basically, there should be a only single branch in the schema tree that
+ * supports yielding. In practice this means:
+ *
+ * list node schema with lookup next:
+ * - must not have any lookup-next list node sibling schema
+ * - must not have any list or container node siblings with lookup-next descendants.
+ * - any parent list nodes must also be lookup-next list nodes
+ *
+ * We must also process containers with lookup-next descendants last.
+ */
+
+DEFINE_MTYPE_STATIC(LIB, NB_YIELD_STATE, "NB Yield State");
+DEFINE_MTYPE_STATIC(LIB, NB_NODE_INFOS, "NB Node Infos");
+
+/* Amount of time allowed to spend constructing oper-state prior to yielding */
+#define NB_OP_WALK_INTERVAL_MS 50
+#define NB_OP_WALK_INTERVAL_US (NB_OP_WALK_INTERVAL_MS * 1000)
+
+/* ---------- */
+/* Data Types */
+/* ---------- */
+PREDECL_LIST(nb_op_walks);
+
+/*
+ * This is our information about a node on the branch we are looking at
+ */
+struct nb_op_node_info {
+	struct lyd_node *inner;
+	const struct lysc_node *schema; /* inner schema in case we rm inner */
+	struct yang_list_keys keys;	/* if list, keys to locate element */
+	const void *list_entry;		/* opaque entry from user or NULL */
+	uint xpath_len;		  /* length of the xpath string for this node */
+	uint niters;		  /* # list elems create this iteration */
+	uint nents;		  /* # list elems create so far */
+	bool query_specific_entry : 1; /* this info is specific specified */
+	bool has_lookup_next : 1; /* if this node support lookup next */
+	bool lookup_next_ok : 1;  /* if this and all previous support */
+};
+
+/**
+ * struct nb_op_yield_state - tracking required state for yielding.
+ *
+ * @xpath: current xpath representing the node_info stack.
+ * @xpath_orig: the original query string from the user
+ * @node_infos: the container stack for the walk from root to current
+ * @schema_path: the schema nodes along the path indicated by the query string.
+ *               this will include the choice and case nodes which are not
+ *               present in the query string.
+ * @query_tokstr: the query string tokenized with NUL bytes.
+ * @query_tokens: the string pointers to each query token (node).
+ * @non_specific_predicate: tracks if a query_token is non-specific predicate.
+ * @walk_root_level: The topmost specific node, +1 is where we start walking.
+ * @walk_start_level: @walk_root_level + 1.
+ * @query_base_level: the level the query string stops at and full walks
+ *                    commence below that.
+ */
+struct nb_op_yield_state {
+	/* Walking state */
+	char *xpath;
+	char *xpath_orig;
+	struct nb_op_node_info *node_infos;
+	const struct lysc_node **schema_path;
+	char *query_tokstr;
+	char **query_tokens;
+	uint8_t *non_specific_predicate;
+	int walk_root_level;
+	int walk_start_level;
+	int query_base_level;
+	bool query_list_entry; /* XXX query was for a specific list entry */
+
+	/* Yielding state */
+	bool query_did_entry;  /* currently processing the entry */
+	bool should_batch;
+	struct timeval start_time;
+	struct yang_translator *translator;
+	uint32_t flags;
+	nb_oper_data_cb cb;
+	void *cb_arg;
+	nb_oper_data_finish_cb finish;
+	void *finish_arg;
+	struct event *walk_ev;
+	struct nb_op_walks_item link;
+};
+
+DECLARE_LIST(nb_op_walks, struct nb_op_yield_state, link);
+
+/* ---------------- */
+/* Global Variables */
+/* ---------------- */
+
+static struct event_loop *event_loop;
+static struct nb_op_walks_head nb_op_walks;
+
+/* --------------------- */
+/* Function Declarations */
+/* --------------------- */
+
+static enum nb_error nb_op_yield(struct nb_op_yield_state *ys);
+static struct lyd_node *ys_root_node(struct nb_op_yield_state *ys);
+
+/* -------------------- */
+/* Function Definitions */
+/* -------------------- */
+
+static inline struct nb_op_yield_state *
+nb_op_create_yield_state(const char *xpath, struct yang_translator *translator,
+			 uint32_t flags, bool should_batch, nb_oper_data_cb cb,
+			 void *cb_arg, nb_oper_data_finish_cb finish,
+			 void *finish_arg)
+{
+	struct nb_op_yield_state *ys;
+
+	ys = XCALLOC(MTYPE_NB_YIELD_STATE, sizeof(*ys));
+	ys->xpath = darr_strdup_cap(xpath, (size_t)XPATH_MAXLEN);
+	ys->xpath_orig = darr_strdup(xpath);
+	ys->translator = translator;
+	ys->flags = flags;
+	ys->should_batch = should_batch;
+	ys->cb = cb;
+	ys->cb_arg = cb_arg;
+	ys->finish = finish;
+	ys->finish_arg = finish_arg;
+
+	nb_op_walks_add_tail(&nb_op_walks, ys);
+
+	return ys;
+}
+
+static inline void nb_op_free_yield_state(struct nb_op_yield_state *ys,
+					  bool nofree_tree)
+{
+	if (ys) {
+		EVENT_OFF(ys->walk_ev);
+		nb_op_walks_del(&nb_op_walks, ys);
+		/* if we have a branch then free up it's libyang tree */
+		if (!nofree_tree && ys_root_node(ys))
+			lyd_free_all(ys_root_node(ys));
+		darr_free(ys->query_tokens);
+		darr_free(ys->non_specific_predicate);
+		darr_free(ys->query_tokstr);
+		darr_free(ys->schema_path);
+		darr_free(ys->node_infos);
+		darr_free(ys->xpath_orig);
+		darr_free(ys->xpath);
+		XFREE(MTYPE_NB_YIELD_STATE, ys);
+	}
+}
+
+static const struct lysc_node *ys_get_walk_stem_tip(struct nb_op_yield_state *ys)
+{
+	if (ys->walk_start_level <= 0)
+		return NULL;
+	return ys->node_infos[ys->walk_start_level - 1].schema;
+}
+
+static struct lyd_node *ys_root_node(struct nb_op_yield_state *ys)
+{
+	if (!darr_len(ys->node_infos))
+		return NULL;
+	return ys->node_infos[0].inner;
+}
+
+static void ys_trim_xpath(struct nb_op_yield_state *ys)
+{
+	uint len = darr_len(ys->node_infos);
+
+	if (len == 0)
+		darr_setlen(ys->xpath, 1);
+	else
+		darr_setlen(ys->xpath, darr_last(ys->node_infos)->xpath_len + 1);
+	ys->xpath[darr_len(ys->xpath) - 1] = 0;
+}
+
+static void ys_pop_inner(struct nb_op_yield_state *ys)
+{
+	uint len = darr_len(ys->node_infos);
+
+	assert(len);
+	darr_setlen(ys->node_infos, len - 1);
+	ys_trim_xpath(ys);
+}
+
+static void ys_free_inner(struct nb_op_yield_state *ys,
+			  struct nb_op_node_info *ni)
+{
+	if (!CHECK_FLAG(ni->schema->nodetype, LYS_CASE | LYS_CHOICE))
+		lyd_free_tree(ni->inner);
+	ni->inner = NULL;
+}
+
+static void nb_op_get_keys(struct lyd_node_inner *list_node,
+			   struct yang_list_keys *keys)
+{
+	struct lyd_node *child;
+	uint n = 0;
+
+	keys->num = 0;
+	LY_LIST_FOR (list_node->child, child) {
+		if (!lysc_is_key(child->schema))
+			break;
+		strlcpy(keys->key[n], yang_dnode_get_string(child, NULL),
+			sizeof(keys->key[n]));
+		n++;
+	}
+
+	keys->num = n;
+}
+
+/**
+ * __move_back_to_next() - move back to the next lookup-next schema
+ */
+static bool __move_back_to_next(struct nb_op_yield_state *ys, int i)
+{
+	struct nb_op_node_info *ni;
+	int j;
+
+	/*
+	 * We will free the subtree we are trimming back to, or we will be done
+	 * with the walk and will free the root on cleanup.
+	 */
+
+	/* pop any node_info we dropped below on entry */
+	for (j = darr_ilen(ys->node_infos) - 1; j > i; j--)
+		ys_pop_inner(ys);
+
+	for (; i >= ys->walk_root_level; i--) {
+		if (ys->node_infos[i].has_lookup_next)
+			break;
+		ys_pop_inner(ys);
+	}
+
+	if (i < ys->walk_root_level)
+		return false;
+
+	ni = &ys->node_infos[i];
+
+	/*
+	 * The i'th node has been lost after a yield so trim it from the tree
+	 * now.
+	 */
+	ys_free_inner(ys, ni);
+	ni->list_entry = NULL;
+
+	/*
+	 * Leave the empty-of-data node_info on top, __walk will deal with
+	 * this, by doing a lookup-next with the keys which we still have.
+	 */
+
+	return true;
+}
+
+static void nb_op_resume_data_tree(struct nb_op_yield_state *ys)
+{
+	struct nb_op_node_info *ni;
+	struct nb_node *nn;
+	const void *parent_entry;
+	const void *list_entry;
+	uint i;
+
+	/*
+	 * IMPORTANT: On yielding: we always yield during list iteration and
+	 * after the initial list element has been created and handled, so the
+	 * top of the yield stack will always point at a list node.
+	 *
+	 * Additionally, that list node has been processed and was in the
+	 * process of being "get_next"d when we yielded. We process the
+	 * lookup-next list node last so all the rest of the data (to the left)
+	 * has been gotten. NOTE: To keep this simple we will require only a
+	 * single lookup-next sibling in any parents list of children.
+	 *
+	 * Walk the rightmost branch (the node info stack) from base to tip
+	 * verifying all list nodes are still present. If not we backup to the
+	 * node which has a lookup next, and we prune the branch to this node.
+	 * If the list node that went away is the topmost we will be using
+	 * lookup_next, but if it's a parent then the list_entry will have been
+	 * restored.
+	 */
+	darr_foreach_i (ys->node_infos, i) {
+		ni = &ys->node_infos[i];
+		nn = ni->schema->priv;
+
+		if (!CHECK_FLAG(ni->schema->nodetype, LYS_LIST))
+			continue;
+
+		assert(ni->list_entry != NULL ||
+		       ni == darr_last(ys->node_infos));
+
+		/* Verify the entry is still present */
+		parent_entry = (i == 0 ? NULL : ni[-1].list_entry);
+		list_entry = nb_callback_lookup_entry(nn, parent_entry,
+						      &ni->keys);
+		if (!list_entry || list_entry != ni->list_entry) {
+			/* May be NULL or a different pointer
+			 * move back to first of
+			 * container with last lookup_next list node
+			 * (which may be this one) and get next.
+			 */
+			if (!__move_back_to_next(ys, i))
+				DEBUGD(&nb_dbg_events,
+				       "%s: Nothing to resume after delete during walk (yield)",
+				       __func__);
+			return;
+		}
+	}
+}
+
+/*
+ * Can only yield if all list nodes to root have lookup_next() callbacks
+ *
+ * In order to support lookup_next() the list_node get_next() callback
+ * needs to return ordered (i.e., sorted) results.
+ */
+
+/* ======================= */
+/* Start of walk init code */
+/* ======================= */
+
+/**
+ * __xpath_pop_node() - remove the last node from xpath string
+ * @xpath: an xpath string
+ *
+ * Return: NB_OK or NB_ERR_NOT_FOUND if nothing left to pop.
+ */
+static int __xpath_pop_node(char *xpath)
+{
+	int len = strlen(xpath);
+	bool abs = xpath[0] == '/';
+	char *slash;
+
+	/* "//" or "/" => NULL */
+	if (abs && (len == 1 || (len == 2 && xpath[1] == '/')))
+		return NB_ERR_NOT_FOUND;
+
+	slash = (char *)frrstr_back_to_char(xpath, '/');
+	/* "/foo/bar/" or "/foo/bar//" => "/foo " */
+	if (slash && slash == &xpath[len - 1]) {
+		xpath[--len] = 0;
+		slash = (char *)frrstr_back_to_char(xpath, '/');
+		if (slash && slash == &xpath[len - 1]) {
+			xpath[--len] = 0;
+			slash = (char *)frrstr_back_to_char(xpath, '/');
+		}
+	}
+	if (!slash)
+		return NB_ERR_NOT_FOUND;
+	*slash = 0;
+	return NB_OK;
+}
+
+/**
+ * nb_op_xpath_to_trunk() - generate a lyd_node tree (trunk) using an xpath.
+ * @xpath_in: xpath query string to build trunk from.
+ * @dnode: resulting tree (trunk)
+ *
+ * Use the longest prefix of @xpath_in as possible to resolve to a tree (trunk).
+ * This is logically as if we walked along the xpath string resolving each
+ * nodename reference (in particular list nodes) until we could not.
+ *
+ * Return: error if any, if no error then @dnode contains the tree (trunk).
+ */
+static enum nb_error nb_op_xpath_to_trunk(const char *xpath_in,
+					  struct lyd_node **trunk)
+{
+	char *xpath = NULL;
+	enum nb_error ret = NB_OK;
+	LY_ERR err;
+
+	darr_in_strdup(xpath, xpath_in);
+	for (;;) {
+		err = lyd_new_path2(NULL, ly_native_ctx, xpath, NULL, 0, 0,
+				    LYD_NEW_PATH_UPDATE, NULL, trunk);
+		if (err == LY_SUCCESS)
+			break;
+
+		ret = __xpath_pop_node(xpath);
+		if (ret != NB_OK)
+			break;
+	}
+	darr_free(xpath);
+	return ret;
+}
+
+/*
+ * Finish initializing the node info based on the xpath string, and previous
+ * node_infos on the stack. If this node is a list node, obtain the specific
+ * list-entry object.
+ */
+static enum nb_error nb_op_ys_finalize_node_info(struct nb_op_yield_state *ys,
+						 uint index)
+{
+	struct nb_op_node_info *ni = &ys->node_infos[index];
+	struct lyd_node *inner = ni->inner;
+	struct nb_node *nn = ni->schema->priv;
+	bool yield_ok = ys->finish != NULL;
+
+	ni->has_lookup_next = nn->cbs.lookup_next != NULL;
+
+	/* track the last list_entry until updated by new list node */
+	ni->list_entry = index == 0 ? NULL : ni[-1].list_entry;
+
+	/* Assert that we are walking the rightmost branch */
+	assert(!inner->parent || inner == inner->parent->child->prev);
+
+	if (CHECK_FLAG(inner->schema->nodetype,
+		       LYS_CASE | LYS_CHOICE | LYS_CONTAINER)) {
+		/* containers have only zero or one child on a branch of a tree */
+		inner = ((struct lyd_node_inner *)inner)->child;
+		assert(!inner || inner->prev == inner);
+		ni->lookup_next_ok = yield_ok &&
+				     (index == 0 || ni[-1].lookup_next_ok);
+		return NB_OK;
+	}
+
+	assert(CHECK_FLAG(inner->schema->nodetype, LYS_LIST));
+
+	ni->lookup_next_ok = yield_ok && ni->has_lookup_next &&
+			     (index == 0 || ni[-1].lookup_next_ok);
+
+	nb_op_get_keys((struct lyd_node_inner *)inner, &ni->keys);
+
+	/* A list entry cannot be present in a tree w/o it's keys */
+	assert(ni->keys.num == yang_snode_num_keys(inner->schema));
+
+	/*
+	 * Get this nodes opaque list_entry object
+	 */
+
+	if (!nn->cbs.lookup_entry) {
+		flog_warn(EC_LIB_NB_OPERATIONAL_DATA,
+			  "%s: data path doesn't support iteration over operational data: %s",
+			  __func__, ys->xpath);
+		return NB_ERR_NOT_FOUND;
+	}
+
+	/* ni->list_entry starts as the parent entry of this node */
+	ni->list_entry = nb_callback_lookup_entry(nn, ni->list_entry, &ni->keys);
+	if (ni->list_entry == NULL) {
+		flog_warn(EC_LIB_NB_OPERATIONAL_DATA,
+			  "%s: list entry lookup failed", __func__);
+		return NB_ERR_NOT_FOUND;
+	}
+
+	/*
+	 * By definition any list element we can get a specific list_entry for
+	 * is specific.
+	 */
+	ni->query_specific_entry = true;
+
+	return NB_OK;
+}
+
+/**
+ * nb_op_ys_init_node_infos() - initialize the node info stack from the query.
+ * @ys: the yield state for this tree walk.
+ *
+ * On starting a walk we initialize the node_info stack as deeply as possible
+ * based on specific node references in the query string. We will stop at the
+ * point in the query string that is not specific (e.g., a list element without
+ * it's keys predicate)
+ *
+ * Return: northbound return value (enum nb_error)
+ */
+static enum nb_error nb_op_ys_init_node_infos(struct nb_op_yield_state *ys)
+{
+	struct nb_op_node_info *ni;
+	struct lyd_node *inner;
+	struct lyd_node *node = NULL;
+	enum nb_error ret;
+	uint i, len;
+	char *tmp;
+
+	/*
+	 * Obtain the trunk of the data node tree of the query.
+	 *
+	 * These are the nodes from the root that could be specifically
+	 * identified with the query string. The trunk ends when a no specific
+	 * node could be identified (e.g., a list-node name with no keys).
+	 */
+
+	ret = nb_op_xpath_to_trunk(ys->xpath, &node);
+	if (ret || !node) {
+		flog_warn(EC_LIB_LIBYANG,
+			  "%s: can't instantiate concrete path using xpath: %s",
+			  __func__, ys->xpath);
+		if (!ret)
+			ret = NB_ERR_NOT_FOUND;
+		return ret;
+	}
+
+	/* Move up to the container if on a leaf currently. */
+	if (node &&
+	    !CHECK_FLAG(node->schema->nodetype, LYS_CONTAINER | LYS_LIST)) {
+		struct lyd_node *leaf = node;
+
+		node = &node->parent->node;
+
+		/*
+		 * If the leaf is not a key, delete it, because it has a wrong
+		 *  empty value.
+		 */
+		if (!lysc_is_key(leaf->schema))
+			lyd_free_tree(leaf);
+	}
+	assert(!node ||
+	       CHECK_FLAG(node->schema->nodetype, LYS_CONTAINER | LYS_LIST));
+	if (!node)
+		return NB_ERR_NOT_FOUND;
+
+	inner = node;
+	for (len = 1; inner->parent; len++)
+		inner = &inner->parent->node;
+
+	darr_append_nz_mt(ys->node_infos, len, MTYPE_NB_NODE_INFOS);
+
+	/*
+	 * For each node find the prefix of the xpath query that identified it
+	 * -- save the prefix length.
+	 */
+	inner = node;
+	for (i = len; i > 0; i--, inner = &inner->parent->node) {
+		ni = &ys->node_infos[i - 1];
+		ni->inner = inner;
+		ni->schema = inner->schema;
+		/*
+		 * NOTE: we could build this by hand with a litte more effort,
+		 * but this simple implementation works and won't be expensive
+		 * since the number of nodes is small and only done once per
+		 * query.
+		 */
+		tmp = yang_dnode_get_path(inner, NULL, 0);
+		ni->xpath_len = strlen(tmp);
+
+		/* Replace users supplied xpath with the libyang returned value */
+		if (i == len)
+			darr_in_strdup(ys->xpath, tmp);
+
+		/* The prefix must match the prefix of the stored xpath */
+		assert(!strncmp(tmp, ys->xpath, ni->xpath_len));
+		free(tmp);
+	}
+
+	/*
+	 * Obtain the specific list-entry objects for each list node on the
+	 * trunk and finish initializing the node_info structs.
+	 */
+
+	darr_foreach_i (ys->node_infos, i) {
+		ret = nb_op_ys_finalize_node_info(ys, i);
+		if (ret != NB_OK) {
+			if (ys->node_infos[0].inner)
+				lyd_free_all(ys->node_infos[0].inner);
+			darr_free(ys->node_infos);
+			return ret;
+		}
+	}
+
+	ys->walk_start_level = darr_len(ys->node_infos);
+
+	ys->walk_root_level = (int)ys->walk_start_level - 1;
+
+	return NB_OK;
+}
+
+/* ================ */
+/* End of init code */
+/* ================ */
+
+/**
+ * nb_op_add_leaf() - Add leaf data to the get tree results
+ * @ys - the yield state for this tree walk.
+ * @nb_node - the northbound node representing this leaf.
+ * @xpath - the xpath (with key predicates) to this leaf value.
+ *
+ * Return: northbound return value (enum nb_error)
+ */
+static enum nb_error nb_op_iter_leaf(struct nb_op_yield_state *ys,
+				     const struct nb_node *nb_node,
+				     const char *xpath)
+{
+	const struct lysc_node *snode = nb_node->snode;
+	struct nb_op_node_info *ni = darr_last(ys->node_infos);
+	struct yang_data *data;
+	enum nb_error ret = NB_OK;
+	LY_ERR err;
+
+	if (CHECK_FLAG(snode->flags, LYS_CONFIG_W))
+		return NB_OK;
+
+	/* Ignore list keys. */
+	if (lysc_is_key(snode))
+		return NB_OK;
+
+	data = nb_callback_get_elem(nb_node, xpath, ni->list_entry);
+	if (data == NULL)
+		return NB_OK;
+
+	/* Add a dnode to our tree */
+	err = lyd_new_term(ni->inner, snode->module, snode->name, data->value,
+			   false, NULL);
+	if (err) {
+		yang_data_free(data);
+		return NB_ERR_RESOURCE;
+	}
+
+	if (ys->cb)
+		ret = (*ys->cb)(nb_node->snode, ys->translator, data,
+				ys->cb_arg);
+	yang_data_free(data);
+
+	return ret;
+}
+
+static enum nb_error nb_op_iter_leaflist(struct nb_op_yield_state *ys,
+					 const struct nb_node *nb_node,
+					 const char *xpath)
+{
+	const struct lysc_node *snode = nb_node->snode;
+	struct nb_op_node_info *ni = darr_last(ys->node_infos);
+	const void *list_entry = NULL;
+	enum nb_error ret = NB_OK;
+	LY_ERR err;
+
+	if (CHECK_FLAG(snode->flags, LYS_CONFIG_W))
+		return NB_OK;
+
+	do {
+		struct yang_data *data;
+
+		list_entry = nb_callback_get_next(nb_node, ni->list_entry,
+						  list_entry);
+		if (!list_entry)
+			/* End of the list. */
+			break;
+
+		data = nb_callback_get_elem(nb_node, xpath, list_entry);
+		if (data == NULL)
+			continue;
+
+		/* Add a dnode to our tree */
+		err = lyd_new_term(ni->inner, snode->module, snode->name,
+				   data->value, false, NULL);
+		if (err) {
+			yang_data_free(data);
+			return NB_ERR_RESOURCE;
+		}
+
+		if (ys->cb)
+			ret = (*ys->cb)(nb_node->snode, ys->translator, data,
+					ys->cb_arg);
+		yang_data_free(data);
+	} while (ret == NB_OK && list_entry);
+
+	return ret;
+}
+
+
+static bool nb_op_schema_path_has_predicate(struct nb_op_yield_state *ys,
+					    int level)
+{
+	if (level > darr_lasti(ys->query_tokens))
+		return false;
+	return strchr(ys->query_tokens[level], '[') != NULL;
+}
+
+/**
+ * nb_op_empty_container_ok() - determine if should keep empty container node.
+ *
+ * Return: true if the empty container should be kept.
+ */
+static bool nb_op_empty_container_ok(const struct lysc_node *snode,
+				     const char *xpath, const void *list_entry)
+{
+	struct nb_node *nn = snode->priv;
+	struct yang_data *data;
+
+	if (!CHECK_FLAG(snode->flags, LYS_PRESENCE))
+		return false;
+
+	if (!nn->cbs.get_elem)
+		return false;
+
+	data = nb_callback_get_elem(nn, xpath, list_entry);
+	if (data) {
+		yang_data_free(data);
+		return true;
+	}
+	return false;
+}
+
+/**
+ * nb_op_get_child_path() - add child node name to the xpath.
+ * @xpath_parent - a darr string for the parent node.
+ * @schild - the child schema node.
+ * @xpath_child - a previous return value from this function to reuse.
+ */
+static char *nb_op_get_child_path(const char *xpath_parent,
+				  const struct lysc_node *schild,
+				  char *xpath_child)
+{
+	/* "/childname" */
+	uint space, extra = strlen(schild->name) + 1;
+	bool new_mod = (!schild->parent ||
+			schild->parent->module != schild->module);
+	int n;
+
+	if (new_mod)
+		/* "modulename:" */
+		extra += strlen(schild->module->name) + 1;
+	space = darr_len(xpath_parent) + extra;
+
+	if (xpath_parent == xpath_child)
+		darr_ensure_cap(xpath_child, space);
+	else
+		darr_in_strdup_cap(xpath_child, xpath_parent, space);
+	if (new_mod)
+		n = snprintf(darr_strnul(xpath_child), extra + 1, "/%s:%s",
+			     schild->module->name, schild->name);
+	else
+		n = snprintf(darr_strnul(xpath_child), extra + 1, "/%s",
+			     schild->name);
+	assert(n == (int)extra);
+	_darr_len(xpath_child) += extra;
+	return xpath_child;
+}
+
+static bool __is_yielding_node(const struct lysc_node *snode)
+{
+	struct nb_node *nn = snode->priv;
+
+	return nn->cbs.lookup_next != NULL;
+}
+
+static const struct lysc_node *__sib_next(bool yn, const struct lysc_node *sib)
+{
+	for (; sib; sib = sib->next) {
+		/* Always skip keys. */
+		if (lysc_is_key(sib))
+			continue;
+		if (yn == __is_yielding_node(sib))
+			return sib;
+	}
+	return NULL;
+}
+
+/**
+ * nb_op_sib_next() - Return the next sibling to walk to
+ * @ys: the yield state for this tree walk.
+ * @sib: the currently being visited sibling
+ *
+ * Return: the next sibling to walk to, walking non-yielding before yielding.
+ */
+static const struct lysc_node *nb_op_sib_next(struct nb_op_yield_state *ys,
+					      const struct lysc_node *sib)
+{
+	struct lysc_node *parent = sib->parent;
+	bool yn = __is_yielding_node(sib);
+
+	/*
+	 * If the node info stack is shorter than the schema path then we are
+	 * doign specific query still on the node from the schema path (should
+	 * match) so just return NULL (i.e., don't process siblings)
+	 */
+	if (darr_len(ys->schema_path) > darr_len(ys->node_infos))
+		return NULL;
+	/*
+	 * If sib is on top of the node info stack then
+	 * 1) it's a container node -or-
+	 * 2) it's a list node that we were walking and we've reach the last entry
+	 * 3) if sib is a list and the list was empty we never would have
+	 * pushed sib on the stack so the top of the stack is the parent
+	 *
+	 * If the query string included this node then we do not process any
+	 * siblings as we are not walking all the parent's children just this
+	 * specified one give by the query string.
+	 */
+	if (sib == darr_last(ys->node_infos)->schema &&
+	    darr_len(ys->schema_path) >= darr_len(ys->node_infos))
+		return NULL;
+	/* case (3) */
+	else if (sib->nodetype == LYS_LIST &&
+		 parent == darr_last(ys->node_infos)->schema &&
+		 darr_len(ys->schema_path) > darr_len(ys->node_infos))
+		return NULL;
+
+	sib = __sib_next(yn, sib->next);
+	if (sib)
+		return sib;
+	if (yn)
+		return NULL;
+	return __sib_next(true, lysc_node_child(parent));
+}
+/*
+ * sib_walk((struct lyd_node *)ni->inner->node.parent->parent->parent->parent->parent->parent->parent)
+ */
+
+/**
+ * nb_op_sib_first() - obtain the first child to walk to
+ * @ys: the yield state for this tree walk.
+ * @parent: the parent whose child we seek
+ * @skip_keys: if should skip over keys
+ *
+ * Return: the first child to continue the walk to, starting with non-yielding
+ * siblings then yielding ones. There should be no more than 1 yielding sibling.
+ */
+static const struct lysc_node *nb_op_sib_first(struct nb_op_yield_state *ys,
+					       const struct lysc_node *parent)
+{
+	const struct lysc_node *sib = lysc_node_child(parent);
+	const struct lysc_node *first_sib;
+
+	/*
+	 * NOTE: when we want to handle root level walks we will need to use
+	 * lys_getnext() to walk root level of each module and
+	 * ly_ctx_get_module_iter() to walk the modules.
+	 */
+	assert(darr_len(ys->node_infos) > 0);
+
+	/*
+	 * The top of the node stack points at @parent.
+	 *
+	 * If the schema path (original query) is longer than our current node
+	 * info stack (current xpath location), we are building back up to the
+	 * base of the user query, return the next schema node from the query
+	 * string (schema_path).
+	 */
+	if (darr_last(ys->node_infos) != NULL &&
+	    !CHECK_FLAG(darr_last(ys->node_infos)->schema->nodetype,
+			LYS_CASE | LYS_CHOICE))
+		assert(darr_last(ys->node_infos)->schema == parent);
+	if (darr_lasti(ys->node_infos) < ys->query_base_level)
+		return ys->schema_path[darr_lasti(ys->node_infos) + 1];
+
+	/* We always skip keys. */
+	while (sib && lysc_is_key(sib))
+		sib = sib->next;
+	if (!sib)
+		return NULL;
+
+	/* Return non-yielding node's first */
+	first_sib = sib;
+	if (__is_yielding_node(sib)) {
+		sib = __sib_next(false, sib);
+		if (sib)
+			return sib;
+	}
+	return first_sib;
+}
+
+/*
+ * "3-dimensional" walk from base of the tree to the tip in-order.
+ *
+ * The actual tree is only 2-dimensional as list nodes are organized as adjacent
+ * siblings under a common parent perhaps with other siblings to each side;
+ * however, using 3d view here is easier to diagram.
+ *
+ * - A list node is yielding if it has a lookup_next callback.
+ * - All other node types are not yielding.
+ * - There's only one yielding node in a list of children (i.e., siblings).
+ *
+ * We visit all non-yielding children prior to the yielding child.
+ * That way we have the fullest tree possible even when something is deleted
+ * during a yield.
+ *                             --- child/parent descendant poinilnters
+ *                             ... next/prev sibling pointers
+ *                             o.o list entries pointers
+ *                             ~~~ diagram extension connector
+ *          1
+ *         / \
+ *        /   \         o~~~~12
+ *       /     \      .      / \
+ *      2.......5   o~~~9  13...14
+ *     / \      | .    / \
+ *    3...4     6    10...11      Cont Nodes: 1,2,5
+ *             / \                List Nodes: 6,9,12
+ *            7...8               Leaf Nodes: 3,4,7,8,10,11,13,14
+ *                             Schema Leaf A: 3
+ *                             Schema Leaf B: 4
+ *                             Schema Leaf C: 7,10,13
+ *                             Schema Leaf D: 8,11,14
+ */
+static enum nb_error __walk(struct nb_op_yield_state *ys, bool is_resume)
+{
+	const struct lysc_node *walk_stem_tip = ys_get_walk_stem_tip(ys);
+	const struct lysc_node *sib;
+	const void *parent_list_entry = NULL;
+	const void *list_entry = NULL;
+	struct nb_op_node_info *ni, *pni;
+	struct lyd_node *node;
+	struct nb_node *nn;
+	char *xpath_child = NULL;
+	// bool at_query_base;
+	bool at_root_level, list_start, is_specific_node;
+	enum nb_error ret = NB_OK;
+	LY_ERR err;
+	int at_clevel;
+	uint len;
+
+
+	monotime(&ys->start_time);
+
+	/* Don't currently support walking all root nodes */
+	if (!walk_stem_tip)
+		return NB_ERR_NOT_FOUND;
+
+	if (ys->schema_path[0]->nodetype == LYS_CHOICE) {
+		flog_err(EC_LIB_NB_OPERATIONAL_DATA,
+			 "%s: unable to walk root level choice node from module: %s",
+			 __func__, ys->schema_path[0]->module->name);
+		return NB_ERR;
+	}
+
+	/*
+	 * If we are resuming then start with the list container on top.
+	 * Otherwise get the first child of the container we are walking,
+	 * starting with non-yielding children.
+	 */
+	if (is_resume)
+		sib = darr_last(ys->node_infos)->schema;
+	else {
+		/*
+		 * Start with non-yielding children first.
+		 *
+		 * When adding root level walks, the sibling list are the root
+		 * level nodes of all modules
+		 */
+		sib = nb_op_sib_first(ys, walk_stem_tip);
+		if (!sib)
+			return NB_ERR_NOT_FOUND;
+	}
+
+
+	while (true) {
+		/* Grab the top container/list node info on the stack */
+		at_clevel = darr_lasti(ys->node_infos);
+		ni = &ys->node_infos[at_clevel];
+
+		/*
+		 * This is the level of the last specific node at init
+		 * time. +1 would be the first non-specific list or
+		 * non-container if present in the container node.
+		 */
+		at_root_level = at_clevel == ys->walk_root_level;
+
+		if (!sib) {
+			/*
+			 * We've reached the end of the siblings inside a
+			 * containing node; either a container, case, choice, or
+			 * a specific list node entry.
+			 *
+			 * We handle case/choice/container node inline; however,
+			 * for lists we are only done with a specific entry and
+			 * need to move to the next element on the list so we
+			 * drop down into the switch for that case.
+			 */
+
+			/* Grab the containing node. */
+			sib = ni->schema;
+
+			if (CHECK_FLAG(sib->nodetype,
+				       LYS_CASE | LYS_CHOICE | LYS_CONTAINER)) {
+				/* If we added an empty container node (no
+				 * children) and it's not a presence container
+				 * or it's not backed by the get_elem callback,
+				 * remove the node from the tree.
+				 */
+				if (sib->nodetype == LYS_CONTAINER &&
+				    !lyd_child(ni->inner) &&
+				    !nb_op_empty_container_ok(sib, ys->xpath,
+							      ni->list_entry))
+					ys_free_inner(ys, ni);
+
+				/* If we have returned to our original walk base,
+				 * then we are done with the walk.
+				 */
+				if (at_root_level) {
+					ret = NB_OK;
+					goto done;
+				}
+				/*
+				 * Grab the sibling of the container we are
+				 * about to pop, so we will be mid-walk on the
+				 * parent containers children.
+				 */
+				sib = nb_op_sib_next(ys, sib);
+
+				/* Pop container node to the parent container */
+				ys_pop_inner(ys);
+
+				/*
+				 * If are were working on a user narrowed path
+				 * then we are done with these siblings.
+				 */
+				if (darr_len(ys->schema_path) >
+				    darr_len(ys->node_infos))
+					sib = NULL;
+
+				/* Start over */
+				continue;
+			}
+			/*
+			 * If we are here we have reached the end of the
+			 * children of a list entry node. sib points
+			 * at the list node info.
+			 */
+		}
+
+		if (CHECK_FLAG(sib->nodetype,
+			       LYS_LEAF | LYS_LEAFLIST | LYS_CONTAINER))
+			xpath_child = nb_op_get_child_path(ys->xpath, sib,
+							   xpath_child);
+		else if (CHECK_FLAG(sib->nodetype, LYS_CASE | LYS_CHOICE))
+			darr_in_strdup(xpath_child, ys->xpath);
+
+		nn = sib->priv;
+
+		switch (sib->nodetype) {
+		case LYS_LEAF:
+			/*
+			 * If we have a non-specific walk to a specific leaf
+			 * (e.g., "..../route-entry/metric") and the leaf value
+			 * is not present, then we are left with the data nodes
+			 * of the stem of the branch to the missing leaf data.
+			 * For containers this will get cleaned up by the
+			 * container code above that looks for no children;
+			 * however, this doesn't work for lists.
+			 *
+			 * (FN:A) We need a similar check for empty list
+			 * elements. Empty list elements below the
+			 * query_base_level (i.e., the schema path length)
+			 * should be cleaned up as they don't support anything
+			 * the user is querying for, if they are above the
+			 * query_base_level then they are part of the walk and
+			 * should be kept.
+			 */
+			ret = nb_op_iter_leaf(ys, nn, xpath_child);
+			if (ret != NB_OK)
+				goto done;
+			sib = nb_op_sib_next(ys, sib);
+			continue;
+		case LYS_LEAFLIST:
+			ret = nb_op_iter_leaflist(ys, nn, xpath_child);
+			if (ret != NB_OK)
+				goto done;
+			sib = nb_op_sib_next(ys, sib);
+			continue;
+		case LYS_CASE:
+		case LYS_CHOICE:
+		case LYS_CONTAINER:
+			if (CHECK_FLAG(nn->flags, F_NB_NODE_CONFIG_ONLY)) {
+				sib = nb_op_sib_next(ys, sib);
+				continue;
+			}
+
+			if (sib->nodetype != LYS_CONTAINER) {
+				/* Case/choice use parent inner. */
+				/* TODO: thus we don't support root level choice */
+				node = ni->inner;
+			} else {
+				err = lyd_new_inner(ni->inner, sib->module,
+						    sib->name, false, &node);
+				if (err) {
+					ret = NB_ERR_RESOURCE;
+					goto done;
+				}
+			}
+
+			/* push this choice/container node on top of the stack */
+			ni = darr_appendz(ys->node_infos);
+			ni->inner = node;
+			ni->schema = sib;
+			ni->lookup_next_ok = ni[-1].lookup_next_ok;
+			ni->list_entry = ni[-1].list_entry;
+
+			darr_in_strdup(ys->xpath, xpath_child);
+			ni->xpath_len = darr_strlen(ys->xpath);
+
+			sib = nb_op_sib_first(ys, sib);
+			continue;
+		case LYS_LIST:
+
+			/*
+			 * Notes:
+			 *
+			 * NOTE: ni->inner may be NULL here if we resumed and it
+			 * was gone. ni->schema and ni->keys will still be
+			 * valid.
+			 *
+			 * NOTE: At this point sib is never NULL; however, if it
+			 * was NULL at the top of the loop, then we were done
+			 * working on a list element's children and will be
+			 * attempting to get the next list element here so sib
+			 * == ni->schema (i.e., !list_start).
+			 *
+			 * (FN:A): Before doing this let's remove empty list
+			 * elements that are "inside" the query string as they
+			 * represent a stem which didn't lead to actual data
+			 * being requested by the user -- for example,
+			 * ".../route-entry/metric" if metric is not present we
+			 * don't want to return an empty route-entry to the
+			 * user.
+			 */
+
+			node = NULL;
+			list_start = ni->schema != sib;
+			if (list_start) {
+				/*
+				 * List iteration: First Element
+				 * -----------------------------
+				 *
+				 * Our node info wasn't on top (wasn't an entry
+				 * for sib) so this is a new list iteration, we
+				 * will push our node info below. The top is our
+				 * parent.
+				 */
+				if (CHECK_FLAG(nn->flags,
+					       F_NB_NODE_CONFIG_ONLY)) {
+					sib = nb_op_sib_next(ys, sib);
+					continue;
+				}
+				/* we are now at one level higher */
+				at_clevel += 1;
+				pni = ni;
+				ni = NULL;
+			} else {
+				/*
+				 * List iteration: Next Element
+				 * ----------------------------
+				 *
+				 * This is the case where `sib == NULL` at the
+				 * top of the loop, so, we just completed the
+				 * walking the children of a list entry, i.e.,
+				 * we are done with that list entry.
+				 *
+				 * `sib` was reset to point at the our list node
+				 * at the top of node_infos.
+				 *
+				 * Within this node_info, `ys->xpath`, `inner`,
+				 * `list_entry`, and `xpath_len` are for the
+				 * previous list entry, and need to be updated.
+				 */
+				pni = darr_len(ys->node_infos) > 1 ? &ni[-1]
+								   : NULL;
+			}
+
+			parent_list_entry = pni ? pni->list_entry : NULL;
+			list_entry = ni ? ni->list_entry : NULL;
+
+			/*
+			 * Before yielding we check to see if we are doing a
+			 * specific list entry instead of a full list iteration.
+			 * We do not want to yield during specific list entry
+			 * processing.
+			 */
+
+			/*
+			 * If we are at a list start check to see if the node
+			 * has a predicate. If so we will try and fetch the data
+			 * node now that we've built part of the tree, if the
+			 * predicates are keys or only depend on the tree already
+			 * built, it should create the element for us.
+			 */
+			is_specific_node = false;
+			if (list_start &&
+			    at_clevel <= darr_lasti(ys->query_tokens) &&
+			    !ys->non_specific_predicate[at_clevel] &&
+			    nb_op_schema_path_has_predicate(ys, at_clevel)) {
+				err = lyd_new_path(pni->inner, NULL,
+						   ys->query_tokens[at_clevel],
+						   NULL, 0, &node);
+				if (!err)
+					is_specific_node = true;
+				else if (err == LY_EVALID)
+					ys->non_specific_predicate[at_clevel] = true;
+				else {
+					flog_err(EC_LIB_NB_OPERATIONAL_DATA,
+						  "%s: unable to create node for specific query string: %s: %s",
+						  __func__,
+						  ys->query_tokens[at_clevel],
+						  yang_ly_strerrcode(err));
+					ret = NB_ERR;
+					goto done;
+				}
+			}
+
+			if (list_entry && ni->query_specific_entry) {
+				/*
+				 * Ending specific list entry processing.
+				 */
+				assert(!list_start);
+				is_specific_node = true;
+				list_entry = NULL;
+			}
+
+			/*
+			 * Should we yield?
+			 *
+			 * Don't yield if we have a specific entry.
+			 */
+			if (!is_specific_node && ni && ni->lookup_next_ok &&
+			    // make sure we advance, if the interval is
+			    // fast and we are very slow.
+			    ((monotime_since(&ys->start_time, NULL) >
+				      NB_OP_WALK_INTERVAL_US &&
+			      ni->niters) ||
+			     (ni->niters + 1) % 10000 == 0)) {
+				/* This is a yield supporting list node and
+				 * we've been running at least our yield
+				 * interval, so yield.
+				 *
+				 * NOTE: we never yield on list_start, and we
+				 * are always about to be doing a get_next.
+				 */
+				DEBUGD(&nb_dbg_events,
+				       "%s: yielding after %u iterations",
+				       __func__, ni->niters);
+
+				ni->niters = 0;
+				ret = NB_YIELD;
+				goto done;
+			}
+
+			/*
+			 * Now get the backend list_entry opaque object for
+			 * this list entry from the backend.
+			 */
+
+			if (is_specific_node) {
+				/*
+				 * Specific List Entry:
+				 * --------------------
+				 */
+				if (list_start) {
+					list_entry =
+						nb_callback_lookup_node_entry(
+							node, parent_list_entry);
+					/*
+					 * If the node we created from a
+					 * specific predicate entry is not
+					 * actually there we need to delete the
+					 * node from our data tree
+					 */
+					if (!list_entry) {
+						lyd_free_tree(node);
+						node = NULL;
+					}
+				}
+			} else if (!list_start && !list_entry &&
+				   ni->has_lookup_next) {
+				/*
+				 * After Yield:
+				 * ------------
+				 * After a yield the list_entry may have become
+				 * invalid, so use lookup_next callback with
+				 * parent and keys instead to find next element.
+				 */
+				list_entry =
+					nb_callback_lookup_next(nn,
+								parent_list_entry,
+								&ni->keys);
+			} else {
+				/*
+				 * Normal List Iteration:
+				 * ----------------------
+				 * Start (list_entry == NULL) or continue
+				 * (list_entry != NULL) the list iteration.
+				 */
+				/* Obtain [next] list entry. */
+				list_entry =
+					nb_callback_get_next(nn,
+							     parent_list_entry,
+							     list_entry);
+			}
+
+			/*
+			 * (FN:A) Reap empty list element? Check to see if we
+			 * should reap an empty list element. We do this if the
+			 * empty list element exists at or below the query base
+			 * (i.e., it's not part of the walk, but a failed find
+			 * on a more specific query e.g., for below the
+			 * `route-entry` element for a query
+			 * `.../route-entry/metric` where the list element had
+			 * no metric value.
+			 *
+			 * However, if the user query is for a key of a list
+			 * element, then when we reach that list element it will
+			 * have no non-key children, check for this condition
+			 * and do not reap if true.
+			 */
+			if (!list_start && ni->inner &&
+			    !lyd_child_no_keys(ni->inner) &&
+			    /* not the top element with a key match */
+			    !((darr_ilen(ys->node_infos) ==
+			       darr_ilen(ys->schema_path) - 1) &&
+			      lysc_is_key((*darr_last(ys->schema_path)))) &&
+			    /* is this at or below the base? */
+			    darr_ilen(ys->node_infos) <= ys->query_base_level)
+				ys_free_inner(ys, ni);
+
+
+			if (!list_entry) {
+				/*
+				 * List Iteration Done
+				 * -------------------
+				 */
+
+				/*
+				 * Grab next sibling of the list node
+				 */
+				if (is_specific_node)
+					sib = NULL;
+				else
+					sib = nb_op_sib_next(ys, sib);
+
+				/*
+				 * If we are at the walk root (base) level then
+				 * that specifies a list and we are done iterating
+				 * the list, so we are done with the walk entirely.
+				 */
+				if (!sib && at_clevel == ys->walk_root_level) {
+					ret = NB_OK;
+					goto done;
+				}
+
+				/*
+				 * Pop the our list node info back to our
+				 * parent.
+				 *
+				 * We only do this if we've already pushed a
+				 * node for the current list schema. For
+				 * `list_start` this hasn't happened yet, as
+				 * would have happened below. So when list_start
+				 * is true but list_entry if NULL we
+				 * are processing an empty list.
+				 */
+				if (!list_start)
+					ys_pop_inner(ys);
+
+				/*
+				 * We should never be below the walk root
+				 */
+				assert(darr_lasti(ys->node_infos) >=
+				       ys->walk_root_level);
+
+				/* Move on to the sibling of the list node */
+				continue;
+			}
+
+			/*
+			 * From here on, we have selected a new top node_info
+			 * list entry (either newly pushed or replacing the
+			 * previous entry in the walk), and we are filling in
+			 * the details.
+			 */
+
+			if (list_start) {
+				/*
+				 * Starting iteration of a list type or
+				 * processing a specific entry, push the list
+				 * node_info on stack.
+				 */
+				ni = darr_appendz(ys->node_infos);
+				pni = &ni[-1]; /* memory may have moved */
+				ni->has_lookup_next = nn->cbs.lookup_next !=
+						      NULL;
+				ni->lookup_next_ok = ((!pni && ys->finish) ||
+						      pni->lookup_next_ok) &&
+						     ni->has_lookup_next;
+				ni->query_specific_entry = is_specific_node;
+				ni->niters = 0;
+				ni->nents = 0;
+
+				/* this will be our predicate-less xpath */
+				ys->xpath = nb_op_get_child_path(ys->xpath, sib,
+								 ys->xpath);
+			} else {
+				/*
+				 * Reset our xpath to the list node (i.e.,
+				 * remove the entry predicates)
+				 */
+				if (ni->query_specific_entry) {
+					flog_warn(EC_LIB_NB_OPERATIONAL_DATA,
+						  "%s: unexpected state",
+						  __func__);
+				}
+				assert(!ni->query_specific_entry);
+				len = strlen(sib->name) + 1; /* "/sibname" */
+				if (pni)
+					len += pni->xpath_len;
+				darr_setlen(ys->xpath, len + 1);
+				ys->xpath[len] = 0;
+				ni->xpath_len = len;
+			}
+
+			/* Need to get keys. */
+
+			if (!CHECK_FLAG(nn->flags, F_NB_NODE_KEYLESS_LIST)) {
+				ret = nb_callback_get_keys(nn, list_entry,
+							   &ni->keys);
+				if (ret) {
+					darr_pop(ys->node_infos);
+					ret = NB_ERR_RESOURCE;
+					goto done;
+				}
+			}
+			/*
+			 * Append predicates to xpath.
+			 */
+			len = darr_strlen(ys->xpath);
+			if (ni->keys.num) {
+				yang_get_key_preds(ys->xpath + len, sib,
+						   &ni->keys,
+						   darr_cap(ys->xpath) - len);
+			} else {
+				/* add a position predicate (1s based?) */
+				darr_ensure_avail(ys->xpath, 10);
+				snprintf(ys->xpath + len,
+					 darr_cap(ys->xpath) - len + 1, "[%u]",
+					 ni->nents + 1);
+			}
+			darr_setlen(ys->xpath,
+				    strlen(ys->xpath + len) + len + 1);
+			ni->xpath_len = darr_strlen(ys->xpath);
+
+			/*
+			 * Create the new list entry node.
+			 */
+
+			if (!node) {
+				err = yang_lyd_new_list((struct lyd_node_inner *)
+								ni[-1]
+									.inner,
+							sib, &ni->keys, &node);
+				if (err) {
+					darr_pop(ys->node_infos);
+					ret = NB_ERR_RESOURCE;
+					goto done;
+				}
+			}
+
+			/*
+			 * Save the new list entry with the list node info
+			 */
+			ni->inner = node;
+			ni->schema = node->schema;
+			ni->list_entry = list_entry;
+			ni->niters += 1;
+			ni->nents += 1;
+
+			/* Skip over the key children, they've been created. */
+			sib = nb_op_sib_first(ys, sib);
+			continue;
+
+		default:
+			/*FALLTHROUGH*/
+		case LYS_ANYXML:
+		case LYS_ANYDATA:
+			/* These schema types are not currently handled */
+			flog_warn(EC_LIB_NB_OPERATIONAL_DATA,
+				  "%s: unsupported schema node type: %s",
+				  __func__, lys_nodetype2str(sib->nodetype));
+			sib = nb_op_sib_next(ys, sib);
+			continue;
+		}
+	}
+
+done:
+	darr_free(xpath_child);
+	return ret;
+}
+
+static void nb_op_walk_continue(struct event *thread)
+{
+	struct nb_op_yield_state *ys = EVENT_ARG(thread);
+	enum nb_error ret = NB_OK;
+
+	DEBUGD(&nb_dbg_cbs_state, "northbound oper-state: resuming %s",
+	       ys->xpath);
+
+	nb_op_resume_data_tree(ys);
+
+	/* if we've popped past the walk start level we're done */
+	if (darr_lasti(ys->node_infos) < ys->walk_root_level)
+		goto finish;
+
+	/* otherwise we are at a resumable node */
+	assert(darr_last(ys->node_infos)->has_lookup_next);
+
+	ret = __walk(ys, true);
+	if (ret == NB_YIELD) {
+		if (nb_op_yield(ys) != NB_OK) {
+			if (ys->should_batch)
+				goto stopped;
+			else
+				goto finish;
+		}
+		return;
+	}
+finish:
+	(*ys->finish)(ys_root_node(ys), ys->finish_arg, ret);
+stopped:
+	nb_op_free_yield_state(ys, false);
+}
+
+static void __free_siblings(struct lyd_node *this)
+{
+	struct lyd_node *next, *sib;
+	uint count = 0;
+
+	LY_LIST_FOR_SAFE(lyd_first_sibling(this), next, sib)
+	{
+		if (lysc_is_key(sib->schema))
+			continue;
+		if (sib == this)
+			continue;
+		lyd_free_tree(sib);
+		count++;
+	}
+	DEBUGD(&nb_dbg_events, "NB oper-state: deleted %u siblings", count);
+}
+
+/*
+ * Trim Algorithm:
+ *
+ * Delete final lookup-next list node and subtree, leave stack slot with keys.
+ *
+ * Then walking up the stack, delete all siblings except:
+ * 1. right-most container or list node (must be lookup-next by design)
+ * 2. keys supporting existing parent list node.
+ *
+ * NOTE the topmost node on the stack will be the final lookup-nexxt list node,
+ * as we only yield on lookup-next list nodes.
+ *
+ */
+static void nb_op_trim_yield_state(struct nb_op_yield_state *ys)
+{
+	struct nb_op_node_info *ni;
+	int i = darr_lasti(ys->node_infos);
+
+	assert(i >= 0);
+
+	DEBUGD(&nb_dbg_events, "NB oper-state: start trimming: top: %d", i);
+
+	ni = &ys->node_infos[i];
+	assert(ni->has_lookup_next);
+
+	DEBUGD(&nb_dbg_events, "NB oper-state: deleting tree at level %d", i);
+	__free_siblings(ni->inner);
+	ys_free_inner(ys, ni);
+
+	while (--i > 0) {
+		DEBUGD(&nb_dbg_events,
+		       "NB oper-state: deleting siblings at level: %d", i);
+		__free_siblings(ys->node_infos[i].inner);
+	}
+	DEBUGD(&nb_dbg_events, "NB oper-state: stop trimming: new top: %d",
+	       (int)darr_lasti(ys->node_infos));
+}
+
+static enum nb_error nb_op_yield(struct nb_op_yield_state *ys)
+{
+	enum nb_error ret;
+	unsigned long min_us = MAX(1, NB_OP_WALK_INTERVAL_US / 50000);
+	struct timeval tv = { .tv_sec = 0, .tv_usec = min_us };
+
+	DEBUGD(&nb_dbg_events, "NB oper-state: yielding %s for %lus (should_batch %d)",
+	       ys->xpath, tv.tv_usec, ys->should_batch);
+
+	if (ys->should_batch) {
+		/*
+		 * TODO: add ability of finish to influence the timer.
+		 * This will allow, for example, flow control based on how long
+		 * it takes finish to process the batch.
+		 */
+		ret = (*ys->finish)(ys_root_node(ys), ys->finish_arg, NB_YIELD);
+		if (ret != NB_OK)
+			return ret;
+		/* now trim out that data we just "finished" */
+		nb_op_trim_yield_state(ys);
+
+	}
+
+	event_add_timer_tv(event_loop, nb_op_walk_continue, ys, &tv,
+			   &ys->walk_ev);
+	return NB_OK;
+}
+
+static enum nb_error nb_op_ys_init_schema_path(struct nb_op_yield_state *ys,
+					       struct nb_node **last)
+{
+	struct nb_node **nb_nodes = NULL;
+	const struct lysc_node *sn;
+	struct nb_node *nblast;
+	char *s, *s2;
+	int count;
+	uint i;
+
+	/*
+	 * Get the schema node stack for the entire query string
+	 *
+	 * The user might pass in something like "//metric" which may resolve to
+	 * more than one schema node ("trunks"). nb_node_find() returns a single
+	 * node though. We should expand the functionality to get the set of
+	 * nodes that matches the xpath (not path) query and save that set in
+	 * the yield state. Then we should do a walk using the users query
+	 * string over each schema trunk in the set.
+	 */
+	nblast = nb_node_find(ys->xpath);
+	if (!nblast) {
+		nb_nodes = nb_nodes_find(ys->xpath);
+		nblast = darr_len(nb_nodes) ? nb_nodes[0] : NULL;
+		darr_free(nb_nodes);
+	}
+	if (!nblast) {
+		flog_warn(EC_LIB_YANG_UNKNOWN_DATA_PATH,
+			  "%s: unknown data path: %s", __func__, ys->xpath);
+		return NB_ERR;
+	}
+	*last = nblast;
+
+	/*
+	 * Create a stack of schema nodes one element per node in the query
+	 * path, only the top (last) element may be a non-container type.
+	 *
+	 * NOTE: appears to be a bug in nb_node linkage where parent can be NULL,
+	 * or I'm misunderstanding the code, in any case we use the libyang
+	 * linkage to walk which works fine.
+	 *
+	 * XXX: we don't actually support choice/case yet, they are container
+	 * types in the libyang schema, but won't be in data so our length
+	 * checking gets messed up.
+	 */
+	for (sn = nblast->snode, count = 0; sn; count++, sn = sn->parent)
+		if (sn != nblast->snode)
+			assert(CHECK_FLAG(sn->nodetype,
+					  LYS_CONTAINER | LYS_LIST |
+						  LYS_CHOICE | LYS_CASE));
+	/* create our arrays */
+	darr_append_n(ys->schema_path, count);
+	darr_append_n(ys->query_tokens, count);
+	darr_append_nz(ys->non_specific_predicate, count);
+	for (sn = nblast->snode; sn; sn = sn->parent)
+		ys->schema_path[--count] = sn;
+
+	/*
+	 * Now tokenize the query string and get pointers to each token
+	 */
+
+	/* Get copy of query string start after initial '/'s */
+	s = ys->xpath;
+	while (*s && *s == '/')
+		s++;
+	ys->query_tokstr = darr_strdup(s);
+	s = ys->query_tokstr;
+
+	darr_foreach_i (ys->schema_path, i) {
+		const char *modname = ys->schema_path[i]->module->name;
+		const char *name = ys->schema_path[i]->name;
+		int nlen = strlen(name);
+		int mnlen = 0;
+
+		/*
+		 * Technically the query_token for choice/case should probably be pointing at
+		 * the child (leaf) rather than the parent (container), however,
+		 * we only use these for processing list nodes so KISS.
+		 */
+		if (CHECK_FLAG(ys->schema_path[i]->nodetype,
+			       LYS_CASE | LYS_CHOICE)) {
+			ys->query_tokens[i] = ys->query_tokens[i - 1];
+			continue;
+		}
+
+		while (true) {
+			s2 = strstr(s, name);
+			if (!s2)
+				goto error;
+
+			if (s2[-1] == ':') {
+				mnlen = strlen(modname) + 1;
+				if (ys->query_tokstr > s2 - mnlen ||
+				    strncmp(s2 - mnlen, modname, mnlen - 1))
+					goto error;
+				s2 -= mnlen;
+				nlen += mnlen;
+			}
+
+			s = s2;
+			if ((i == 0 || s[-1] == '/') &&
+			    (s[nlen] == 0 || s[nlen] == '[' || s[nlen] == '/'))
+				break;
+			/*
+			 * Advance past the incorrect match, must have been
+			 * part of previous predicate.
+			 */
+			s += nlen;
+		}
+
+		/* NUL terminate previous token and save this one */
+		if (i > 0)
+			s[-1] = 0;
+		ys->query_tokens[i] = s;
+		s += nlen;
+	}
+
+	/* NOTE: need to subtract choice/case nodes when these are supported */
+	ys->query_base_level = darr_lasti(ys->schema_path);
+
+	return NB_OK;
+
+error:
+	darr_free(ys->query_tokstr);
+	darr_free(ys->schema_path);
+	darr_free(ys->query_tokens);
+	darr_free(ys->non_specific_predicate);
+	return NB_ERR;
+}
+
+
+/**
+ * nb_op_walk_start() - Start walking oper-state directed by query string.
+ * @ys: partially initialized yield state for this walk.
+ *
+ */
+static enum nb_error nb_op_walk_start(struct nb_op_yield_state *ys)
+{
+	struct nb_node *nblast;
+	enum nb_error ret;
+
+	/*
+	 * Get nb_node path (stack) corresponding to the xpath query
+	 */
+	ret = nb_op_ys_init_schema_path(ys, &nblast);
+	if (ret != NB_OK)
+		return ret;
+
+
+	/*
+	 * Get the node_info path (stack) corresponding to the uniquely
+	 * resolvable data nodes from the beginning of the xpath query.
+	 */
+	ret = nb_op_ys_init_node_infos(ys);
+	if (ret != NB_OK)
+		return ret;
+
+	return __walk(ys, false);
+}
+
+
+void *nb_oper_walk(const char *xpath, struct yang_translator *translator,
+		   uint32_t flags, bool should_batch, nb_oper_data_cb cb,
+		   void *cb_arg, nb_oper_data_finish_cb finish, void *finish_arg)
+{
+	struct nb_op_yield_state *ys;
+	enum nb_error ret;
+
+	ys = nb_op_create_yield_state(xpath, translator, flags, should_batch,
+				      cb, cb_arg, finish, finish_arg);
+
+	ret = nb_op_walk_start(ys);
+	if (ret == NB_YIELD) {
+		if (nb_op_yield(ys) != NB_OK) {
+			if (ys->should_batch)
+				goto stopped;
+			else
+				goto finish;
+		}
+		return ys;
+	}
+finish:
+	(void)(*ys->finish)(ys_root_node(ys), ys->finish_arg, ret);
+stopped:
+	nb_op_free_yield_state(ys, false);
+	return NULL;
+}
+
+
+void nb_oper_cancel_walk(void *walk)
+{
+	if (walk)
+		nb_op_free_yield_state(walk, false);
+}
+
+
+void nb_oper_cancel_all_walks(void)
+{
+	struct nb_op_yield_state *ys;
+
+	frr_each_safe (nb_op_walks, &nb_op_walks, ys)
+		nb_oper_cancel_walk(ys);
+}
+
+
+/*
+ * The old API -- remove when we've update the users to yielding.
+ */
+enum nb_error nb_oper_iterate_legacy(const char *xpath,
+				     struct yang_translator *translator,
+				     uint32_t flags, nb_oper_data_cb cb,
+				     void *cb_arg, struct lyd_node **tree)
+{
+	struct nb_op_yield_state *ys;
+	enum nb_error ret;
+
+	ys = nb_op_create_yield_state(xpath, translator, flags, false, cb,
+				      cb_arg, NULL, NULL);
+
+	ret = nb_op_walk_start(ys);
+	assert(ret != NB_YIELD);
+
+	if (tree && ret == NB_OK)
+		*tree = ys_root_node(ys);
+	else {
+		if (ys_root_node(ys))
+			yang_dnode_free(ys_root_node(ys));
+		if (tree)
+			*tree = NULL;
+	}
+
+	nb_op_free_yield_state(ys, true);
+	return ret;
+}
+
+void nb_oper_init(struct event_loop *loop)
+{
+	event_loop = loop;
+	nb_op_walks_init(&nb_op_walks);
+}
+
+void nb_oper_terminate(void)
+{
+	nb_oper_cancel_all_walks();
+}
diff --git a/lib/northbound_sysrepo.c b/lib/northbound_sysrepo.c
index 7fd4af8..4942d66 100644
--- a/lib/northbound_sysrepo.c
+++ b/lib/northbound_sysrepo.c
@@ -118,6 +118,9 @@ static int yang_data_frr2sr(struct yang_data *frr_data, sr_val_t *sr_data)
 		sr_data->type = SR_INT64_T;
 		sr_data->data.int64_val = yang_str2int64(frr_data->value);
 		break;
+	case LY_TYPE_LEAFREF:
+		sr_val_set_str_data(sr_data, SR_STRING_T, frr_data->value);
+		break;
 	case LY_TYPE_STRING:
 		sr_val_set_str_data(sr_data, SR_STRING_T, frr_data->value);
 		break;
@@ -137,6 +140,11 @@ static int yang_data_frr2sr(struct yang_data *frr_data, sr_val_t *sr_data)
 		sr_data->type = SR_UINT64_T;
 		sr_data->data.uint64_val = yang_str2uint64(frr_data->value);
 		break;
+	case LY_TYPE_UNION:
+		/* No way to deal with this using un-typed yang_data object */
+		sr_val_set_str_data(sr_data, SR_STRING_T, frr_data->value);
+		break;
+	case LY_TYPE_UNKNOWN:
 	default:
 		return -1;
 	}
@@ -178,12 +186,12 @@ static int frr_sr_process_change(struct nb_config *candidate,
 	/* Map operation values. */
 	switch (sr_op) {
 	case SR_OP_CREATED:
+		nb_op = NB_OP_CREATE;
+		break;
 	case SR_OP_MODIFIED:
-		if (nb_operation_is_valid(NB_OP_CREATE, nb_node->snode))
-			nb_op = NB_OP_CREATE;
-		else if (nb_operation_is_valid(NB_OP_MODIFY, nb_node->snode)) {
+		if (nb_is_operation_allowed(nb_node, NB_OP_MODIFY))
 			nb_op = NB_OP_MODIFY;
-		} else
+		else
 			/* Ignore list keys modifications. */
 			return NB_OK;
 		break;
@@ -193,7 +201,7 @@ static int frr_sr_process_change(struct nb_config *candidate,
 		 * notified about the removal of all of its leafs, even the ones
 		 * that are non-optional. We need to ignore these notifications.
 		 */
-		if (!nb_operation_is_valid(NB_OP_DESTROY, nb_node->snode))
+		if (!nb_is_operation_allowed(nb_node, NB_OP_DESTROY))
 			return NB_OK;
 
 		nb_op = NB_OP_DESTROY;
@@ -213,7 +221,7 @@ static int frr_sr_process_change(struct nb_config *candidate,
 
 	ret = nb_candidate_edit(candidate, nb_node, nb_op, xpath, NULL, data);
 	yang_data_free(data);
-	if (ret != NB_OK && ret != NB_ERR_NOT_FOUND) {
+	if (ret != NB_OK) {
 		flog_warn(
 			EC_LIB_NB_CANDIDATE_EDIT_ERROR,
 			"%s: failed to edit candidate configuration: operation [%s] xpath [%s]",
@@ -271,11 +279,12 @@ static int frr_sr_config_change_cb_prepare(sr_session_ctx_t *session,
 	ret = nb_candidate_commit_prepare(context, candidate, NULL,
 					  &transaction, false, false, errmsg,
 					  sizeof(errmsg));
-	if (ret != NB_OK && ret != NB_ERR_NO_CHANGES)
-		flog_warn(
-			EC_LIB_LIBSYSREPO,
-			"%s: failed to prepare configuration transaction: %s (%s)",
-			__func__, nb_err_name(ret), errmsg);
+	if (ret != NB_OK && ret != NB_ERR_NO_CHANGES) {
+		flog_warn(EC_LIB_LIBSYSREPO,
+			  "%s: failed to prepare configuration transaction: %s (%s)",
+			  __func__, nb_err_name(ret), errmsg);
+		sr_session_set_error_message(session, errmsg);
+	}
 
 	if (!transaction)
 		nb_config_free(candidate);
@@ -340,6 +349,8 @@ static int frr_sr_config_change_cb(sr_session_ctx_t *session, uint32_t sub_id,
 		return frr_sr_config_change_cb_apply(session, module_name);
 	case SR_EV_ABORT:
 		return frr_sr_config_change_cb_abort(session, module_name);
+	case SR_EV_RPC:
+	case SR_EV_UPDATE:
 	default:
 		flog_err(EC_LIB_LIBSYSREPO, "%s: unexpected sysrepo event: %u",
 			 __func__, sr_ev);
@@ -347,39 +358,16 @@ static int frr_sr_config_change_cb(sr_session_ctx_t *session, uint32_t sub_id,
 	}
 }
 
-static int frr_sr_state_data_iter_cb(const struct lysc_node *snode,
-				     struct yang_translator *translator,
-				     struct yang_data *data, void *arg)
-{
-	struct lyd_node *dnode = arg;
-	LY_ERR ly_errno;
-
-	ly_errno = 0;
-	ly_errno = lyd_new_path(NULL, ly_native_ctx, data->xpath, data->value,
-				0, &dnode);
-	if (ly_errno) {
-		flog_warn(EC_LIB_LIBYANG, "%s: lyd_new_path() failed",
-			  __func__);
-		yang_data_free(data);
-		return NB_ERR;
-	}
-
-	yang_data_free(data);
-	return NB_OK;
-}
-
 /* Callback for state retrieval. */
 static int frr_sr_state_cb(sr_session_ctx_t *session, uint32_t sub_id,
 			   const char *module_name, const char *xpath,
 			   const char *request_xpath, uint32_t request_id,
 			   struct lyd_node **parent, void *private_ctx)
 {
-	struct lyd_node *dnode;
+	struct lyd_node *dnode = NULL;
 
 	dnode = *parent;
-	if (nb_oper_data_iterate(request_xpath, NULL, 0,
-				 frr_sr_state_data_iter_cb, dnode)
-	    != NB_OK) {
+	if (nb_oper_iterate_legacy(request_xpath, NULL, 0, NULL, NULL, &dnode)) {
 		flog_warn(EC_LIB_NB_OPERATIONAL_DATA,
 			  "%s: failed to obtain operational data [xpath %s]",
 			  __func__, xpath);
diff --git a/lib/ntop.c b/lib/ntop.c
index 49e1b15..89b4d5e 100644
--- a/lib/ntop.c
+++ b/lib/ntop.c
@@ -158,7 +158,7 @@ inet4:
 	return dst;
 }
 
-#if !defined(INET_NTOP_NO_OVERRIDE) && !defined(__APPLE__)
+#if !defined(INET_NTOP_NO_OVERRIDE)
 /* we want to override libc inet_ntop, but make sure it shows up in backtraces
  * as frr_inet_ntop (to avoid confusion while debugging)
  */
diff --git a/lib/pbr.h b/lib/pbr.h
index d8c06e7..fe2d32a 100644
--- a/lib/pbr.h
+++ b/lib/pbr.h
@@ -138,7 +138,7 @@ struct pbr_rule {
 	struct pbr_filter filter;
 	struct pbr_action action;
 
-	char ifname[INTERFACE_NAMSIZ + 1];
+	char ifname[IFNAMSIZ + 1];
 };
 
 /* TCP flags value shared
diff --git a/lib/pid_output.c b/lib/pid_output.c
index 064a7bb..ce1b7d1 100644
--- a/lib/pid_output.c
+++ b/lib/pid_output.c
@@ -5,6 +5,7 @@
  */
 
 #include <zebra.h>
+#include <sys/stat.h>
 #include <fcntl.h>
 #include <log.h>
 #include "lib/version.h"
diff --git a/lib/plist.c b/lib/plist.c
index 2f5827c..618d92b 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -1229,7 +1229,7 @@ static int vty_clear_prefix_list(struct vty *vty, afi_t afi, const char *name,
 
 DEFPY (show_ip_prefix_list,
        show_ip_prefix_list_cmd,
-       "show ip prefix-list [WORD [seq$dseq (1-4294967295)$arg]] [json$uj]",
+       "show ip prefix-list [PREFIXLIST4_NAME$name [seq$dseq (1-4294967295)$arg]] [json$uj]",
        SHOW_STR
        IP_STR
        PREFIX_LIST_STR
@@ -1242,13 +1242,13 @@ DEFPY (show_ip_prefix_list,
 	if (dseq)
 		dtype = sequential_display;
 
-	return vty_show_prefix_list(vty, AFI_IP, prefix_list, arg_str, dtype,
+	return vty_show_prefix_list(vty, AFI_IP, name, arg_str, dtype,
 				    !!uj);
 }
 
 DEFPY (show_ip_prefix_list_prefix,
        show_ip_prefix_list_prefix_cmd,
-       "show ip prefix-list WORD A.B.C.D/M$prefix [longer$dl|first-match$dfm]",
+       "show ip prefix-list PREFIXLIST4_NAME$name A.B.C.D/M$prefix [longer$dl|first-match$dfm]",
        SHOW_STR
        IP_STR
        PREFIX_LIST_STR
@@ -1263,13 +1263,13 @@ DEFPY (show_ip_prefix_list_prefix,
 	else if (dfm)
 		dtype = first_match_display;
 
-	return vty_show_prefix_list_prefix(vty, AFI_IP, prefix_list, prefix_str,
+	return vty_show_prefix_list_prefix(vty, AFI_IP, name, prefix_str,
 					   dtype);
 }
 
 DEFPY (show_ip_prefix_list_summary,
        show_ip_prefix_list_summary_cmd,
-       "show ip prefix-list summary [WORD$prefix_list] [json$uj]",
+       "show ip prefix-list summary [PREFIXLIST4_NAME$name] [json$uj]",
        SHOW_STR
        IP_STR
        PREFIX_LIST_STR
@@ -1277,13 +1277,13 @@ DEFPY (show_ip_prefix_list_summary,
        "Name of a prefix list\n"
        JSON_STR)
 {
-	return vty_show_prefix_list(vty, AFI_IP, prefix_list, NULL,
+	return vty_show_prefix_list(vty, AFI_IP, name, NULL,
 				    summary_display, !!uj);
 }
 
 DEFPY (show_ip_prefix_list_detail,
        show_ip_prefix_list_detail_cmd,
-       "show ip prefix-list detail [WORD$prefix_list] [json$uj]",
+       "show ip prefix-list detail [PREFIXLIST4_NAME$name] [json$uj]",
        SHOW_STR
        IP_STR
        PREFIX_LIST_STR
@@ -1291,25 +1291,25 @@ DEFPY (show_ip_prefix_list_detail,
        "Name of a prefix list\n"
        JSON_STR)
 {
-	return vty_show_prefix_list(vty, AFI_IP, prefix_list, NULL,
+	return vty_show_prefix_list(vty, AFI_IP, name, NULL,
 				    detail_display, !!uj);
 }
 
 DEFPY (clear_ip_prefix_list,
        clear_ip_prefix_list_cmd,
-       "clear ip prefix-list [WORD [A.B.C.D/M$prefix]]",
+       "clear ip prefix-list [PREFIXLIST4_NAME$name [A.B.C.D/M$prefix]]",
        CLEAR_STR
        IP_STR
        PREFIX_LIST_STR
        "Name of a prefix list\n"
        "IP prefix <network>/<length>, e.g., 35.0.0.0/8\n")
 {
-	return vty_clear_prefix_list(vty, AFI_IP, prefix_list, prefix_str);
+	return vty_clear_prefix_list(vty, AFI_IP, name, prefix_str);
 }
 
 DEFPY (show_ipv6_prefix_list,
        show_ipv6_prefix_list_cmd,
-       "show ipv6 prefix-list [WORD [seq$dseq (1-4294967295)$arg]] [json$uj]",
+       "show ipv6 prefix-list [PREFIXLIST6_NAME$name [seq$dseq (1-4294967295)$arg]] [json$uj]",
        SHOW_STR
        IPV6_STR
        PREFIX_LIST_STR
@@ -1322,13 +1322,13 @@ DEFPY (show_ipv6_prefix_list,
 	if (dseq)
 		dtype = sequential_display;
 
-	return vty_show_prefix_list(vty, AFI_IP6, prefix_list, arg_str, dtype,
+	return vty_show_prefix_list(vty, AFI_IP6, name, arg_str, dtype,
 				    !!uj);
 }
 
 DEFPY (show_ipv6_prefix_list_prefix,
        show_ipv6_prefix_list_prefix_cmd,
-       "show ipv6 prefix-list WORD X:X::X:X/M$prefix [longer$dl|first-match$dfm]",
+       "show ipv6 prefix-list PREFIXLIST6_NAME$name X:X::X:X/M$prefix [longer$dl|first-match$dfm]",
        SHOW_STR
        IPV6_STR
        PREFIX_LIST_STR
@@ -1343,13 +1343,13 @@ DEFPY (show_ipv6_prefix_list_prefix,
 	else if (dfm)
 		dtype = first_match_display;
 
-	return vty_show_prefix_list_prefix(vty, AFI_IP6, prefix_list,
+	return vty_show_prefix_list_prefix(vty, AFI_IP6, name,
 					   prefix_str, dtype);
 }
 
 DEFPY (show_ipv6_prefix_list_summary,
        show_ipv6_prefix_list_summary_cmd,
-       "show ipv6 prefix-list summary [WORD$prefix-list] [json$uj]",
+       "show ipv6 prefix-list summary [PREFIXLIST6_NAME$name] [json$uj]",
        SHOW_STR
        IPV6_STR
        PREFIX_LIST_STR
@@ -1357,13 +1357,13 @@ DEFPY (show_ipv6_prefix_list_summary,
        "Name of a prefix list\n"
        JSON_STR)
 {
-	return vty_show_prefix_list(vty, AFI_IP6, prefix_list, NULL,
+	return vty_show_prefix_list(vty, AFI_IP6, name, NULL,
 				    summary_display, !!uj);
 }
 
 DEFPY (show_ipv6_prefix_list_detail,
        show_ipv6_prefix_list_detail_cmd,
-       "show ipv6 prefix-list detail [WORD$prefix-list] [json$uj]",
+       "show ipv6 prefix-list detail [PREFIXLIST6_NAME$name] [json$uj]",
        SHOW_STR
        IPV6_STR
        PREFIX_LIST_STR
@@ -1371,20 +1371,20 @@ DEFPY (show_ipv6_prefix_list_detail,
        "Name of a prefix list\n"
        JSON_STR)
 {
-	return vty_show_prefix_list(vty, AFI_IP6, prefix_list, NULL,
+	return vty_show_prefix_list(vty, AFI_IP6, name, NULL,
 				    detail_display, !!uj);
 }
 
 DEFPY (clear_ipv6_prefix_list,
        clear_ipv6_prefix_list_cmd,
-       "clear ipv6 prefix-list [WORD [X:X::X:X/M$prefix]]",
+       "clear ipv6 prefix-list [PREFIXLIST6_NAME$name [X:X::X:X/M$prefix]]",
        CLEAR_STR
        IPV6_STR
        PREFIX_LIST_STR
        "Name of a prefix list\n"
        "IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n")
 {
-	return vty_clear_prefix_list(vty, AFI_IP6, prefix_list, prefix_str);
+	return vty_clear_prefix_list(vty, AFI_IP6, name, prefix_str);
 }
 
 DEFPY (debug_prefix_list_match,
@@ -1632,12 +1632,26 @@ static void plist_autocomplete(vector comps, struct cmd_token *token)
 	plist_autocomplete_afi(AFI_IP6, comps, token);
 }
 
+static void plist4_autocomplete(vector comps, struct cmd_token *token)
+{
+	plist_autocomplete_afi(AFI_IP, comps, token);
+}
+
+static void plist6_autocomplete(vector comps, struct cmd_token *token)
+{
+	plist_autocomplete_afi(AFI_IP6, comps, token);
+}
+
 static const struct cmd_variable_handler plist_var_handlers[] = {
 	{/* "prefix-list WORD" */
 	 .varname = "prefix_list",
 	 .completions = plist_autocomplete},
 	{.tokenname = "PREFIXLIST_NAME",
 	 .completions = plist_autocomplete},
+	{.tokenname = "PREFIXLIST4_NAME",
+	 .completions = plist4_autocomplete},
+	{.tokenname = "PREFIXLIST6_NAME",
+	 .completions = plist6_autocomplete},
 	{.completions = NULL}};
 
 
diff --git a/lib/prefix.h b/lib/prefix.h
index fc6e32d..14f2695 100644
--- a/lib/prefix.h
+++ b/lib/prefix.h
@@ -286,23 +286,25 @@ struct prefix_sg {
 	struct in_addr grp;
 };
 
+/* clang-format off */
 union prefixptr {
-	prefixtype(prefixptr, struct prefix,      p)
-	prefixtype(prefixptr, struct prefix_ipv4, p4)
-	prefixtype(prefixptr, struct prefix_ipv6, p6)
-	prefixtype(prefixptr, struct prefix_evpn, evp)
-	prefixtype(prefixptr, struct prefix_fs,   fs)
-	prefixtype(prefixptr, struct prefix_rd,   rd)
+	uniontype(prefixptr, struct prefix,      p)
+	uniontype(prefixptr, struct prefix_ipv4, p4)
+	uniontype(prefixptr, struct prefix_ipv6, p6)
+	uniontype(prefixptr, struct prefix_evpn, evp)
+	uniontype(prefixptr, struct prefix_fs,   fs)
+	uniontype(prefixptr, struct prefix_rd,   rd)
 } TRANSPARENT_UNION;
 
 union prefixconstptr {
-	prefixtype(prefixconstptr, const struct prefix,      p)
-	prefixtype(prefixconstptr, const struct prefix_ipv4, p4)
-	prefixtype(prefixconstptr, const struct prefix_ipv6, p6)
-	prefixtype(prefixconstptr, const struct prefix_evpn, evp)
-	prefixtype(prefixconstptr, const struct prefix_fs,   fs)
-	prefixtype(prefixconstptr, const struct prefix_rd,   rd)
+	uniontype(prefixconstptr, const struct prefix,      p)
+	uniontype(prefixconstptr, const struct prefix_ipv4, p4)
+	uniontype(prefixconstptr, const struct prefix_ipv6, p6)
+	uniontype(prefixconstptr, const struct prefix_evpn, evp)
+	uniontype(prefixconstptr, const struct prefix_fs,   fs)
+	uniontype(prefixconstptr, const struct prefix_rd,   rd)
 } TRANSPARENT_UNION;
+/* clang-format on */
 
 #ifndef INET_ADDRSTRLEN
 #define INET_ADDRSTRLEN 16
diff --git a/lib/printf/printf-pos.c b/lib/printf/printf-pos.c
index ac775be..b2ba1a7 100644
--- a/lib/printf/printf-pos.c
+++ b/lib/printf/printf-pos.c
@@ -355,7 +355,7 @@ reswitch:	switch (ch) {
 			goto rflag;
 		case 'C':
 			flags |= LONGINT;
-			/*FALLTHROUGH*/
+			fallthrough;
 		case 'c':
 			error = addtype(&types,
 					(flags & LONGINT) ? T_WINT : T_INT);
@@ -364,7 +364,7 @@ reswitch:	switch (ch) {
 			break;
 		case 'D':
 			flags |= LONGINT;
-			/*FALLTHROUGH*/
+			fallthrough;
 		case 'd':
 		case 'i':
 			if ((error = addsarg(&types, flags)))
@@ -408,7 +408,7 @@ reswitch:	switch (ch) {
 #endif
 		case 'O':
 			flags |= LONGINT;
-			/*FALLTHROUGH*/
+			fallthrough;
 		case 'o':
 			if ((error = adduarg(&types, flags)))
 				goto error;
@@ -419,7 +419,7 @@ reswitch:	switch (ch) {
 			break;
 		case 'S':
 			flags |= LONGINT;
-			/*FALLTHROUGH*/
+			fallthrough;
 		case 's':
 			error = addtype(&types,
 					(flags & LONGINT) ? TP_WCHAR : TP_CHAR);
@@ -428,7 +428,7 @@ reswitch:	switch (ch) {
 			break;
 		case 'U':
 			flags |= LONGINT;
-			/*FALLTHROUGH*/
+			fallthrough;
 		case 'u':
 		case 'X':
 		case 'x':
@@ -549,7 +549,7 @@ reswitch:	switch (ch) {
 			goto rflag;
 		case 'C':
 			flags |= LONGINT;
-			/*FALLTHROUGH*/
+			fallthrough;
 		case 'c':
 			error = addtype(&types,
 					(flags & LONGINT) ? T_WINT : T_INT);
@@ -558,7 +558,7 @@ reswitch:	switch (ch) {
 			break;
 		case 'D':
 			flags |= LONGINT;
-			/*FALLTHROUGH*/
+			fallthrough;
 		case 'd':
 		case 'i':
 			if ((error = addsarg(&types, flags)))
@@ -602,7 +602,7 @@ reswitch:	switch (ch) {
 #endif
 		case 'O':
 			flags |= LONGINT;
-			/*FALLTHROUGH*/
+			fallthrough;
 		case 'o':
 			if ((error = adduarg(&types, flags)))
 				goto error;
@@ -613,7 +613,7 @@ reswitch:	switch (ch) {
 			break;
 		case 'S':
 			flags |= LONGINT;
-			/*FALLTHROUGH*/
+			fallthrough;
 		case 's':
 			error = addtype(&types,
 			    (flags & LONGINT) ? TP_WCHAR : TP_CHAR);
@@ -622,7 +622,7 @@ reswitch:	switch (ch) {
 			break;
 		case 'U':
 			flags |= LONGINT;
-			/*FALLTHROUGH*/
+			fallthrough;
 		case 'u':
 		case 'X':
 		case 'x':
diff --git a/lib/printf/vfprintf.c b/lib/printf/vfprintf.c
index 78f8be0..2083642 100644
--- a/lib/printf/vfprintf.c
+++ b/lib/printf/vfprintf.c
@@ -340,7 +340,7 @@ reswitch:	switch (ch) {
 			if (width >= 0)
 				goto rflag;
 			width = -width;
-			/* FALLTHROUGH */
+			fallthrough;
 		case '-':
 			flags |= LADJUST;
 			goto rflag;
@@ -434,7 +434,7 @@ reswitch:	switch (ch) {
 			break;
 		case 'C':
 			flags |= LONGINT;
-			/*FALLTHROUGH*/
+			fallthrough;
 		case 'c':
 #ifdef WCHAR_SUPPORT
 			if (flags & LONGINT) {
@@ -460,7 +460,7 @@ reswitch:	switch (ch) {
 			break;
 		case 'D':
 			flags |= LONGINT;
-			/*FALLTHROUGH*/
+			fallthrough;
 		case 'd':
 		case 'i':
 			if (flags & INTMAX_SIZE)
@@ -551,7 +551,7 @@ reswitch:	switch (ch) {
 			break;
 		case 'O':
 			flags |= LONGINT;
-			/*FALLTHROUGH*/
+			fallthrough;
 		case 'o':
 			if (flags & INTMAX_SIZE)
 				ujval = UJARG();
@@ -595,7 +595,7 @@ reswitch:	switch (ch) {
 			goto nosign;
 		case 'S':
 			flags |= LONGINT;
-			/*FALLTHROUGH*/
+			fallthrough;
 		case 's':
 #ifdef WCHAR_SUPPORT
 			if (flags & LONGINT) {
@@ -621,7 +621,7 @@ reswitch:	switch (ch) {
 			break;
 		case 'U':
 			flags |= LONGINT;
-			/*FALLTHROUGH*/
+			fallthrough;
 		case 'u':
 			if (flags & INTMAX_SIZE)
 				ujval = UJARG();
diff --git a/lib/privs.c b/lib/privs.c
index accd989..717a2e4 100644
--- a/lib/privs.c
+++ b/lib/privs.c
@@ -6,6 +6,15 @@
  * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
  */
 #include <zebra.h>
+
+#include <pwd.h>
+#include <grp.h>
+
+#ifdef HAVE_LCAPS
+#include <sys/capability.h>
+#include <sys/prctl.h>
+#endif /* HAVE_LCAPS */
+
 #include "log.h"
 #include "privs.h"
 #include "memory.h"
diff --git a/lib/pullwr.c b/lib/pullwr.c
index 3967eb5..919a663 100644
--- a/lib/pullwr.c
+++ b/lib/pullwr.c
@@ -6,6 +6,8 @@
 
 #include "zebra.h"
 
+#include <sys/ioctl.h>
+
 #include "pullwr.h"
 #include "memory.h"
 #include "monotime.h"
diff --git a/lib/resolver.c b/lib/resolver.c
index 99bf356..d8245e3 100644
--- a/lib/resolver.c
+++ b/lib/resolver.c
@@ -335,3 +335,8 @@ void resolver_init(struct event_loop *tm)
 	install_element(CONFIG_NODE, &debug_resolver_cmd);
 	install_element(ENABLE_NODE, &debug_resolver_cmd);
 }
+
+void resolver_terminate(void)
+{
+	ares_destroy(state.channel);
+}
diff --git a/lib/resolver.h b/lib/resolver.h
index 87e8ecd..882f960 100644
--- a/lib/resolver.h
+++ b/lib/resolver.h
@@ -23,6 +23,7 @@ struct resolver_query {
 };
 
 void resolver_init(struct event_loop *tm);
+void resolver_terminate(void);
 void resolver_resolve(struct resolver_query *query, int af, vrf_id_t vrf_id,
 		      const char *hostname,
 		      void (*cb)(struct resolver_query *, const char *, int,
diff --git a/lib/route_types.txt b/lib/route_types.txt
index a82273a..93cbc36 100644
--- a/lib/route_types.txt
+++ b/lib/route_types.txt
@@ -49,6 +49,7 @@
 ZEBRA_ROUTE_SYSTEM,     system,    NULL,   'X', 0, 0, 0,     "Reserved",      none
 ZEBRA_ROUTE_KERNEL,     kernel,    zebra,  'K', 1, 1, 1,     "kernel route",  zebra
 ZEBRA_ROUTE_CONNECT,    connected, zebra,  'C', 1, 1, 1,     "connected",     zebra
+ZEBRA_ROUTE_LOCAL,      local,     zebra,  'L', 1, 1, 1,     "local",         zebra
 ZEBRA_ROUTE_STATIC,     static,    zebra,  'S', 1, 1, 1,     "static",        zebra
 ZEBRA_ROUTE_RIP,        rip,       ripd,   'R', 1, 0, 1,     "RIP",           ripd
 ZEBRA_ROUTE_RIPNG,      ripng,     ripngd, 'R', 0, 1, 1,     "RIPng",         ripngd
@@ -86,6 +87,7 @@ ZEBRA_ROUTE_OPENFABRIC, openfabric, fabricd,  'f', 1, 1, 1,  "OpenFabric",    fa
 ZEBRA_ROUTE_VRRP,       vrrp,      vrrpd,  '-', 0, 0, 0,     "VRRP",          vrrpd
 ZEBRA_ROUTE_NHG,        zebra,     none,   '-', 0, 0, 0,     "Nexthop Group", none
 ZEBRA_ROUTE_SRTE,       srte,      none,   '-', 0, 0, 0,     "SR-TE",         none
+ZEBRA_ROUTE_TABLE_DIRECT,      table-direct,     zebra,  't', 1, 1, 1,     "Table-Direct",         zebra
 ZEBRA_ROUTE_ALL,        wildcard,  none,   '-', 0, 0, 0,     "-",             none
 
 
@@ -93,6 +95,7 @@ ZEBRA_ROUTE_ALL,        wildcard,  none,   '-', 0, 0, 0,     "-",             no
 ZEBRA_ROUTE_SYSTEM, "Reserved route type, for internal use only"
 ZEBRA_ROUTE_KERNEL, "Kernel routes (not installed via the zebra RIB)"
 ZEBRA_ROUTE_CONNECT,"Connected routes (directly attached subnet or host)"
+ZEBRA_ROUTE_LOCAL,  "Local routes (directly attached host route)"
 ZEBRA_ROUTE_STATIC, "Statically configured routes"
 ZEBRA_ROUTE_RIP,    "Routing Information Protocol (RIP)"
 ZEBRA_ROUTE_RIPNG,  "Routing Information Protocol next-generation (IPv6) (RIPng)"
@@ -116,3 +119,4 @@ ZEBRA_ROUTE_BFD, "Bidirectional Fowarding Detection (BFD)"
 ZEBRA_ROUTE_VRRP, "Virtual Router Redundancy Protocol (VRRP)"
 ZEBRA_ROUTE_OPENFABRIC, "OpenFabric Routing Protocol"
 ZEBRA_ROUTE_NHG, "Zebra Nexthop Groups (NHG)"
+ZEBRA_ROUTE_TABLE_DIRECT,  "Non-main Kernel Routing Table - Direct"
diff --git a/lib/routemap.c b/lib/routemap.c
index e0b0eb7..ea917eb 100644
--- a/lib/routemap.c
+++ b/lib/routemap.c
@@ -1070,20 +1070,17 @@ static int vty_show_route_map(struct vty *vty, const char *name, bool use_json)
 {
 	struct route_map *map;
 	json_object *json = NULL;
-	json_object *json_proto = NULL;
 
-	if (use_json) {
+	if (use_json)
 		json = json_object_new_object();
-		json_proto = json_object_new_object();
-		json_object_object_add(json, frr_protonameinst, json_proto);
-	} else
+	else
 		vty_out(vty, "%s:\n", frr_protonameinst);
 
 	if (name) {
 		map = route_map_lookup_by_name(name);
 
 		if (map) {
-			vty_show_route_map_entry(vty, map, json_proto);
+			vty_show_route_map_entry(vty, map, json);
 		} else if (!use_json) {
 			vty_out(vty, "%s: 'route-map %s' not found\n",
 				frr_protonameinst, name);
@@ -1099,7 +1096,7 @@ static int vty_show_route_map(struct vty *vty, const char *name, bool use_json)
 		list_sort(maplist, sort_route_map);
 
 		for (ALL_LIST_ELEMENTS_RO(maplist, ln, map))
-			vty_show_route_map_entry(vty, map, json_proto);
+			vty_show_route_map_entry(vty, map, json);
 
 		list_delete(&maplist);
 	}
@@ -2551,7 +2548,6 @@ route_map_result_t route_map_apply_ext(struct route_map *map,
 	struct route_map_index *index = NULL;
 	struct route_map_rule *set = NULL;
 	bool skip_match_clause = false;
-	struct prefix conv;
 
 	if (recursion > RMAP_RECURSION_LIMIT) {
 		if (map)
@@ -2574,31 +2570,14 @@ route_map_result_t route_map_apply_ext(struct route_map *map,
 
 	map->applied++;
 
-	/*
-	 * Handling for matching evpn_routes in the prefix table.
-	 *
-	 * We convert type2/5 prefix to ipv4/6 prefix to do longest
-	 * prefix matching on.
-	 */
 	if (prefix->family == AF_EVPN) {
-		if (evpn_prefix2prefix(prefix, &conv) != 0) {
-			if (unlikely(CHECK_FLAG(rmap_debug,
-						DEBUG_ROUTEMAP_DETAIL)))
-				zlog_debug(
-					"Unable to convert EVPN prefix %pFX into IPv4/IPv6 prefix. Falling back to non-optimized route-map lookup",
-					prefix);
-		} else {
-			if (unlikely(CHECK_FLAG(rmap_debug,
-						DEBUG_ROUTEMAP_DETAIL)))
-				zlog_debug(
-					"Converted EVPN prefix %pFX into %pFX for optimized route-map lookup",
-					prefix, &conv);
-
-			prefix = &conv;
-		}
+		index = map->head;
+	} else {
+		skip_match_clause = true;
+		index = route_map_get_index(map, prefix, match_object,
+					    &match_ret);
 	}
 
-	index = route_map_get_index(map, prefix, match_object, &match_ret);
 	if (index) {
 		index->applied++;
 		if (unlikely(CHECK_FLAG(rmap_debug, DEBUG_ROUTEMAP)))
@@ -2622,7 +2601,6 @@ route_map_result_t route_map_apply_ext(struct route_map *map,
 			ret = RMAP_DENYMATCH;
 		goto route_map_apply_end;
 	}
-	skip_match_clause = true;
 
 	for (; index; index = index->next) {
 		if (!skip_match_clause) {
@@ -3145,13 +3123,13 @@ DEFPY (rmap_clear_counters,
 
 }
 
-DEFUN (rmap_show_name,
-       rmap_show_name_cmd,
-       "show route-map [WORD] [json]",
-       SHOW_STR
-       "route-map information\n"
-       "route-map name\n"
-       JSON_STR)
+DEFUN_NOSH (rmap_show_name,
+            rmap_show_name_cmd,
+            "show route-map [WORD] [json]",
+            SHOW_STR
+            "route-map information\n"
+            "route-map name\n"
+            JSON_STR)
 {
 	bool uj = use_json(argc, argv);
 	int idx = 0;
@@ -3412,7 +3390,7 @@ DEFUN_HIDDEN(show_route_map_pfx_tbl, show_route_map_pfx_tbl_cmd,
 }
 
 /* Initialization of route map vector. */
-void route_map_init(void)
+void route_map_init_new(bool in_backend)
 {
 	int i;
 
@@ -3427,7 +3405,10 @@ void route_map_init(void)
 
 	UNSET_FLAG(rmap_debug, DEBUG_ROUTEMAP);
 
-	route_map_cli_init();
+	if (!in_backend) {
+		/* we do not want to handle config commands in the backend */
+		route_map_cli_init();
+	}
 
 	/* Install route map top node. */
 	install_node(&rmap_debug_node);
@@ -3447,3 +3428,8 @@ void route_map_init(void)
 
 	install_element(ENABLE_NODE, &show_route_map_pfx_tbl_cmd);
 }
+
+void route_map_init(void)
+{
+	route_map_init_new(false);
+}
diff --git a/lib/routemap.h b/lib/routemap.h
index 08e3412..dfb84ce 100644
--- a/lib/routemap.h
+++ b/lib/routemap.h
@@ -401,6 +401,7 @@ enum ecommunity_lb_type {
 
 /* Prototypes. */
 extern void route_map_init(void);
+extern void route_map_init_new(bool in_backend);
 
 /*
  * This should only be called on shutdown
@@ -1024,6 +1025,7 @@ routemap_hook_context_insert(struct route_map_index *rmi);
 void routemap_hook_context_free(struct routemap_hook_context *rhc);
 
 extern const struct frr_yang_module_info frr_route_map_info;
+extern const struct frr_yang_module_info frr_route_map_cli_info;
 
 /* routemap_cli.c */
 extern int route_map_instance_cmp(const struct lyd_node *dnode1,
diff --git a/lib/routemap_cli.c b/lib/routemap_cli.c
index 20a157e..88b341c 100644
--- a/lib/routemap_cli.c
+++ b/lib/routemap_cli.c
@@ -90,8 +90,8 @@ DEFPY_YANG(
 int route_map_instance_cmp(const struct lyd_node *dnode1,
 			   const struct lyd_node *dnode2)
 {
-	uint16_t seq1 = yang_dnode_get_uint16(dnode1, "./sequence");
-	uint16_t seq2 = yang_dnode_get_uint16(dnode2, "./sequence");
+	uint16_t seq1 = yang_dnode_get_uint16(dnode1, "sequence");
+	uint16_t seq2 = yang_dnode_get_uint16(dnode2, "sequence");
 
 	return seq1 - seq2;
 }
@@ -100,8 +100,8 @@ void route_map_instance_show(struct vty *vty, const struct lyd_node *dnode,
 			     bool show_defaults)
 {
 	const char *name = yang_dnode_get_string(dnode, "../name");
-	const char *action = yang_dnode_get_string(dnode, "./action");
-	const char *sequence = yang_dnode_get_string(dnode, "./sequence");
+	const char *action = yang_dnode_get_string(dnode, "action");
+	const char *sequence = yang_dnode_get_string(dnode, "sequence");
 
 	vty_out(vty, "route-map %s %s %s\n", name, action, sequence);
 
@@ -188,7 +188,7 @@ DEFPY_YANG(
 DEFPY_YANG(
 	match_ip_address_prefix_list,
 	match_ip_address_prefix_list_cmd,
-	"match ip address prefix-list PREFIXLIST_NAME$name",
+	"match ip address prefix-list PREFIXLIST4_NAME$name",
 	MATCH_STR
 	IP_STR
 	"Match address of route\n"
@@ -209,7 +209,7 @@ DEFPY_YANG(
 
 DEFPY_YANG(
 	no_match_ip_address_prefix_list, no_match_ip_address_prefix_list_cmd,
-	"no match ip address prefix-list [PREFIXLIST_NAME]",
+	"no match ip address prefix-list [PREFIXLIST4_NAME]",
 	NO_STR
 	MATCH_STR
 	IP_STR
@@ -265,7 +265,7 @@ DEFPY_YANG(
 DEFPY_YANG(
 	match_ip_next_hop_prefix_list,
 	match_ip_next_hop_prefix_list_cmd,
-	"match ip next-hop prefix-list PREFIXLIST_NAME$name",
+	"match ip next-hop prefix-list PREFIXLIST4_NAME$name",
 	MATCH_STR
 	IP_STR
 	"Match next-hop address of route\n"
@@ -287,7 +287,7 @@ DEFPY_YANG(
 DEFPY_YANG(
 	no_match_ip_next_hop_prefix_list,
 	no_match_ip_next_hop_prefix_list_cmd,
-	"no match ip next-hop prefix-list [PREFIXLIST_NAME]",
+	"no match ip next-hop prefix-list [PREFIXLIST4_NAME]",
 	NO_STR
 	MATCH_STR
 	IP_STR
@@ -379,7 +379,7 @@ DEFPY_YANG(
 
 DEFPY_YANG(
 	match_ipv6_address_prefix_list, match_ipv6_address_prefix_list_cmd,
-	"match ipv6 address prefix-list PREFIXLIST_NAME$name",
+	"match ipv6 address prefix-list PREFIXLIST6_NAME$name",
 	MATCH_STR
 	IPV6_STR
 	"Match address of route\n"
@@ -401,7 +401,7 @@ DEFPY_YANG(
 DEFPY_YANG(
 	no_match_ipv6_address_prefix_list,
 	no_match_ipv6_address_prefix_list_cmd,
-	"no match ipv6 address prefix-list [PREFIXLIST_NAME]",
+	"no match ipv6 address prefix-list [PREFIXLIST6_NAME]",
 	NO_STR
 	MATCH_STR
 	IPV6_STR
@@ -526,7 +526,7 @@ DEFPY_YANG(
 void route_map_condition_show(struct vty *vty, const struct lyd_node *dnode,
 			      bool show_defaults)
 {
-	const char *condition = yang_dnode_get_string(dnode, "./condition");
+	const char *condition = yang_dnode_get_string(dnode, "condition");
 	const struct lyd_node *ln;
 	const char *acl;
 
@@ -1050,7 +1050,7 @@ DEFUN_YANG (no_set_srte_color,
 void route_map_action_show(struct vty *vty, const struct lyd_node *dnode,
 			   bool show_defaults)
 {
-	const char *action = yang_dnode_get_string(dnode, "./action");
+	const char *action = yang_dnode_get_string(dnode, "action");
 	const struct lyd_node *ln;
 	const char *acl;
 
@@ -1102,7 +1102,7 @@ void route_map_action_show(struct vty *vty, const struct lyd_node *dnode,
 					      "./rmap-set-action/max-metric"));
 	} else if (IS_SET_TAG(action)) {
 		vty_out(vty, " set tag %s\n",
-			yang_dnode_get_string(dnode, "./rmap-set-action/tag"));
+			yang_dnode_get_string(dnode, "rmap-set-action/tag"));
 	} else if (IS_SET_SR_TE_COLOR(action)) {
 		vty_out(vty, " set sr-te color %s\n",
 			yang_dnode_get_string(dnode,
@@ -1196,7 +1196,7 @@ void route_map_action_show(struct vty *vty, const struct lyd_node *dnode,
 		vty_out(vty, " set large-comm-list %s delete\n", acl);
 	} else if (IS_SET_EXTCOMM_LIST_DEL(action)) {
 		acl = NULL;
-		ln = yang_dnode_get(dnode, "./rmap-set-action/frr-bgp-route-map:comm-list-name");
+		ln = yang_dnode_get(dnode, "rmap-set-action/frr-bgp-route-map:comm-list-name");
 
 		if (ln)
 			acl = yang_dnode_get_string(ln, NULL);
diff --git a/lib/routemap_northbound.c b/lib/routemap_northbound.c
index 5767e0a..1bba4da 100644
--- a/lib/routemap_northbound.c
+++ b/lib/routemap_northbound.c
@@ -98,7 +98,7 @@ static int lib_route_map_create(struct nb_cb_create_args *args)
 		/* NOTHING */
 		break;
 	case NB_EV_APPLY:
-		rm_name = yang_dnode_get_string(args->dnode, "./name");
+		rm_name = yang_dnode_get_string(args->dnode, "name");
 		rm = route_map_get(rm_name);
 		nb_running_set_entry(args->dnode, rm);
 		break;
@@ -167,8 +167,8 @@ static int lib_route_map_entry_create(struct nb_cb_create_args *args)
 		/* NOTHING */
 		break;
 	case NB_EV_APPLY:
-		sequence = yang_dnode_get_uint16(args->dnode, "./sequence");
-		action = yang_dnode_get_enum(args->dnode, "./action") == 0
+		sequence = yang_dnode_get_uint16(args->dnode, "sequence");
+		action = yang_dnode_get_enum(args->dnode, "action") == 0
 				 ? RMAP_PERMIT
 				 : RMAP_DENY;
 		rm = nb_running_get_entry(args->dnode, NULL, true);
@@ -364,7 +364,6 @@ lib_route_map_entry_exit_policy_modify(struct nb_cb_modify_args *args)
 		case 0: /* permit-or-deny */
 			break;
 		case 1: /* next */
-			/* FALLTHROUGH */
 		case 2: /* goto */
 			rm_action =
 				yang_dnode_get_enum(args->dnode, "../action");
@@ -885,7 +884,7 @@ static int lib_route_map_entry_set_action_ipv4_address_modify(
 		yang_dnode_get_ipv4(&ia, args->dnode, NULL);
 		if (ia.s_addr == INADDR_ANY || !ipv4_unicast_valid(&ia))
 			return NB_ERR_VALIDATION;
-		/* FALLTHROUGH */
+		return NB_OK;
 	case NB_EV_PREPARE:
 	case NB_EV_ABORT:
 		return NB_OK;
@@ -944,7 +943,7 @@ static int lib_route_map_entry_set_action_ipv6_address_modify(
 		yang_dnode_get_ipv6(&i6a, args->dnode, NULL);
 		if (!IN6_IS_ADDR_LINKLOCAL(&i6a))
 			return NB_ERR_VALIDATION;
-		/* FALLTHROUGH */
+		return NB_OK;
 	case NB_EV_PREPARE:
 	case NB_EV_ABORT:
 		return NB_OK;
@@ -1551,3 +1550,45 @@ const struct frr_yang_module_info frr_route_map_info = {
 		},
 	}
 };
+
+const struct frr_yang_module_info frr_route_map_cli_info = {
+	.name = "frr-route-map",
+	.ignore_cfg_cbs = true,
+	.nodes = {
+		{
+			.xpath = "/frr-route-map:lib/route-map/optimization-disabled",
+			.cbs.cli_show = route_map_optimization_disabled_show,
+		},
+		{
+			.xpath = "/frr-route-map:lib/route-map/entry",
+			.cbs = {
+				.cli_cmp = route_map_instance_cmp,
+				.cli_show = route_map_instance_show,
+				.cli_show_end = route_map_instance_show_end,
+			}
+		},
+		{
+			.xpath = "/frr-route-map:lib/route-map/entry/description",
+			.cbs.cli_show = route_map_description_show,
+		},
+		{
+			.xpath = "/frr-route-map:lib/route-map/entry/call",
+			.cbs.cli_show = route_map_call_show,
+		},
+		{
+			.xpath = "/frr-route-map:lib/route-map/entry/exit-policy",
+			.cbs.cli_show = route_map_exit_policy_show,
+		},
+		{
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition",
+			.cbs.cli_show = route_map_condition_show,
+		},
+		{
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action",
+			.cbs.cli_show = route_map_action_show,
+		},
+		{
+			.xpath = NULL,
+		},
+	}
+};
diff --git a/lib/routing_nb.c b/lib/routing_nb.c
index 3d837bc..33372d1 100644
--- a/lib/routing_nb.c
+++ b/lib/routing_nb.c
@@ -27,3 +27,13 @@ const struct frr_yang_module_info frr_routing_info = {
 		},
 	}
 };
+
+const struct frr_yang_module_info frr_routing_cli_info = {
+	.name = "frr-routing",
+	.ignore_cfg_cbs = true,
+	.nodes = {
+		{
+			.xpath = NULL,
+		},
+	}
+};
diff --git a/lib/routing_nb.h b/lib/routing_nb.h
index c185091..e805e1c 100644
--- a/lib/routing_nb.h
+++ b/lib/routing_nb.h
@@ -6,6 +6,7 @@ extern "C" {
 #endif
 
 extern const struct frr_yang_module_info frr_routing_info;
+extern const struct frr_yang_module_info frr_routing_cli_info;
 
 /* Mandatory callbacks. */
 int routing_control_plane_protocols_control_plane_protocol_create(
@@ -29,6 +30,8 @@ int routing_control_plane_protocols_control_plane_protocol_destroy(
  * based on the control plane protocol
  */
 DECLARE_HOOK(routing_conf_event, (struct nb_cb_create_args *args), (args));
+DECLARE_HOOK(routing_create, (struct nb_cb_create_args *args), (args));
+DECLARE_KOOH(routing_destroy, (struct nb_cb_destroy_args *args), (args));
 
 void routing_control_plane_protocols_register_vrf_dependency(void);
 
diff --git a/lib/routing_nb_config.c b/lib/routing_nb_config.c
index f4fe48f..d532279 100644
--- a/lib/routing_nb_config.c
+++ b/lib/routing_nb_config.c
@@ -14,6 +14,8 @@
 
 
 DEFINE_HOOK(routing_conf_event, (struct nb_cb_create_args *args), (args));
+DEFINE_HOOK(routing_create, (struct nb_cb_create_args *args), (args));
+DEFINE_KOOH(routing_destroy, (struct nb_cb_destroy_args *args), (args));
 
 /*
  * XPath: /frr-routing:routing/control-plane-protocols/control-plane-protocol
@@ -44,11 +46,12 @@ int routing_control_plane_protocols_control_plane_protocol_create(
 		 * find the vrf and store the pointer.
 		 */
 		if (nb_node_has_dependency(args->dnode->schema->priv)) {
-			vrfname = yang_dnode_get_string(args->dnode, "./vrf");
+			vrfname = yang_dnode_get_string(args->dnode, "vrf");
 			vrf = vrf_lookup_by_name(vrfname);
 			assert(vrf);
 			nb_running_set_entry(args->dnode, vrf);
 		}
+		hook_call(routing_create, args);
 		break;
 	};
 
@@ -61,6 +64,8 @@ int routing_control_plane_protocols_control_plane_protocol_destroy(
 	if (args->event != NB_EV_APPLY)
 		return NB_OK;
 
+	hook_call(routing_destroy, args);
+
 	/*
 	 * If dependency on VRF module is registered, then VRF
 	 * pointer was stored and must be cleared.
@@ -76,7 +81,7 @@ static void vrf_to_control_plane_protocol(const struct lyd_node *dnode,
 {
 	const char *vrf;
 
-	vrf = yang_dnode_get_string(dnode, "./name");
+	vrf = yang_dnode_get_string(dnode, "name");
 
 	snprintf(xpath, XPATH_MAXLEN, FRR_ROUTING_KEY_XPATH_VRF, vrf);
 }
@@ -86,7 +91,7 @@ static void control_plane_protocol_to_vrf(const struct lyd_node *dnode,
 {
 	const char *vrf;
 
-	vrf = yang_dnode_get_string(dnode, "./vrf");
+	vrf = yang_dnode_get_string(dnode, "vrf");
 
 	snprintf(xpath, XPATH_MAXLEN, FRR_VRF_KEY_XPATH, vrf);
 }
diff --git a/lib/sigevent.c b/lib/sigevent.c
index 3cd65eb..06f80db 100644
--- a/lib/sigevent.c
+++ b/lib/sigevent.c
@@ -4,6 +4,8 @@
  */
 
 #include <zebra.h>
+
+#include <signal.h>
 #include <sigevent.h>
 #include <log.h>
 #include <memory.h>
diff --git a/lib/sockopt.c b/lib/sockopt.c
index 41fcc41..74bc034 100644
--- a/lib/sockopt.c
+++ b/lib/sockopt.c
@@ -10,13 +10,12 @@
 #include "sockunion.h"
 #include "lib_errors.h"
 
-#if (defined(__FreeBSD__)                                                      \
-     && ((__FreeBSD_version >= 500022 && __FreeBSD_version < 700000)           \
-	 || (__FreeBSD_version < 500000 && __FreeBSD_version >= 440000)))      \
-	|| (defined(__NetBSD__) && defined(__NetBSD_Version__)                 \
-	    && __NetBSD_Version__ >= 106010000)                                \
-	|| defined(__OpenBSD__) || defined(__APPLE__)                          \
-	|| defined(__DragonFly__) || defined(__sun)
+#if (defined(__FreeBSD__) &&                                                   \
+     ((__FreeBSD_version >= 500022 && __FreeBSD_version < 700000) ||           \
+      (__FreeBSD_version < 500000 && __FreeBSD_version >= 440000))) ||         \
+	(defined(__NetBSD__) && defined(__NetBSD_Version__) &&                 \
+	 __NetBSD_Version__ >= 106010000) ||                                   \
+	defined(__OpenBSD__) || defined(__DragonFly__) || defined(__sun)
 #define HAVE_BSD_STRUCT_IP_MREQ_HACK
 #endif
 
@@ -673,6 +672,9 @@ int sockopt_tcp_mss_get(int sock)
 	int tcp_maxseg = 0;
 	socklen_t tcp_maxseg_len = sizeof(tcp_maxseg);
 
+	if (sock < 0)
+		return 0;
+
 	ret = getsockopt(sock, IPPROTO_TCP, TCP_MAXSEG, &tcp_maxseg,
 			 &tcp_maxseg_len);
 	if (ret != 0) {
diff --git a/lib/sockunion.h b/lib/sockunion.h
index e507255..1466512 100644
--- a/lib/sockunion.h
+++ b/lib/sockunion.h
@@ -7,10 +7,13 @@
 #ifndef _ZEBRA_SOCKUNION_H
 #define _ZEBRA_SOCKUNION_H
 
+#include "compiler.h"
+
 #include "privs.h"
 #include "if.h"
 #include <sys/un.h>
 #ifdef __OpenBSD__
+#include <net/route.h>
 #include <netmpls/mpls.h>
 #endif
 
@@ -27,8 +30,40 @@ union sockunion {
 	struct sockaddr_mpls smpls;
 	struct sockaddr_rtlabel rtlabel;
 #endif
+
+	/* sockaddr_storage is guaranteed to be larger than the others */
+	struct sockaddr_storage sa_storage;
 };
 
+/* clang-format off */
+/* for functions that want to accept any sockaddr pointer without casts */
+union sockaddrptr {
+	uniontype(sockaddrptr, union sockunion, su)
+	uniontype(sockaddrptr, struct sockaddr, sa)
+	uniontype(sockaddrptr, struct sockaddr_in, sin)
+	uniontype(sockaddrptr, struct sockaddr_in6, sin6)
+	uniontype(sockaddrptr, struct sockaddr_un, sun)
+#ifdef __OpenBSD__
+	uniontype(sockaddrptr, struct sockaddr_mpls, smpls)
+	uniontype(sockaddrptr, struct sockaddr_rtlabel, rtlabel)
+#endif
+	uniontype(sockaddrptr, struct sockaddr_storage, sa_storage)
+} TRANSPARENT_UNION;
+
+union sockaddrconstptr {
+	uniontype(sockaddrconstptr, const union sockunion, su)
+	uniontype(sockaddrconstptr, const struct sockaddr, sa)
+	uniontype(sockaddrconstptr, const struct sockaddr_in, sin)
+	uniontype(sockaddrconstptr, const struct sockaddr_in6, sin6)
+	uniontype(sockaddrconstptr, const struct sockaddr_un, sun)
+#ifdef __OpenBSD__
+	uniontype(sockaddrconstptr, const struct sockaddr_mpls, smpls)
+	uniontype(sockaddrconstptr, const struct sockaddr_rtlabel, rtlabel)
+#endif
+	uniontype(sockaddrconstptr, const struct sockaddr_storage, sa_storage)
+} TRANSPARENT_UNION;
+/* clang-format on */
+
 enum connect_result { connect_error, connect_success, connect_in_progress };
 
 /* Default address family. */
diff --git a/lib/srv6.c b/lib/srv6.c
index 09835f3..dceb6ab 100644
--- a/lib/srv6.c
+++ b/lib/srv6.c
@@ -108,7 +108,7 @@ const char *seg6local_context2str(char *str, size_t size,
 	}
 }
 
-static void srv6_locator_chunk_list_free(void *data)
+void srv6_locator_chunk_list_free(void *data)
 {
 	struct srv6_locator_chunk *chunk = data;
 
diff --git a/lib/srv6.h b/lib/srv6.h
index fb34f86..433c5c1 100644
--- a/lib/srv6.h
+++ b/lib/srv6.h
@@ -252,6 +252,7 @@ int snprintf_seg6_segs(char *str,
 extern struct srv6_locator *srv6_locator_alloc(const char *name);
 extern struct srv6_locator_chunk *srv6_locator_chunk_alloc(void);
 extern void srv6_locator_free(struct srv6_locator *locator);
+extern void srv6_locator_chunk_list_free(void *data);
 extern void srv6_locator_chunk_free(struct srv6_locator_chunk **chunk);
 json_object *srv6_locator_chunk_json(const struct srv6_locator_chunk *chunk);
 json_object *srv6_locator_json(const struct srv6_locator *loc);
diff --git a/lib/subdir.am b/lib/subdir.am
index d7b28ff..6893049 100644
--- a/lib/subdir.am
+++ b/lib/subdir.am
@@ -68,6 +68,7 @@ lib_libfrr_la_SOURCES = \
 	lib/mgmt_be_client.c \
 	lib/mgmt_fe_client.c \
 	lib/mgmt_msg.c \
+	lib/mgmt_msg_native.c \
 	lib/mlag.c \
 	lib/module.c \
 	lib/mpls.c \
@@ -80,6 +81,7 @@ lib_libfrr_la_SOURCES = \
 	lib/northbound.c \
 	lib/northbound_cli.c \
 	lib/northbound_db.c \
+	lib/northbound_oper.c \
 	lib/ntop.c \
 	lib/openbsd-tree.c \
 	lib/pid_output.c \
@@ -219,11 +221,13 @@ pkginclude_HEADERS += \
 	lib/filter.h \
 	lib/flex_algo.h \
 	lib/freebsd-queue.h \
+	lib/frrdistance.h \
 	lib/frrlua.h \
 	lib/frrscript.h \
 	lib/frr_pthread.h \
 	lib/frratomic.h \
 	lib/frrcu.h \
+	lib/frrsendmmsg.h \
 	lib/frrstr.h \
 	lib/graph.h \
 	lib/hash.h \
@@ -252,8 +256,10 @@ pkginclude_HEADERS += \
 	lib/memory.h \
 	lib/mgmt.pb-c.h \
 	lib/mgmt_be_client.h \
+	lib/mgmt_defines.h \
 	lib/mgmt_fe_client.h \
 	lib/mgmt_msg.h \
+	lib/mgmt_msg_native.h \
 	lib/mgmt_pb.h \
 	lib/module.h \
 	lib/monotime.h \
@@ -534,12 +540,22 @@ EXTRA_DIST += \
 BUILT_SOURCES += \
 	lib/gitversion.h \
 	lib/route_types.h \
+	lib/vtysh_daemons.h \
 	# end
 
 ## force route_types.h
 $(lib_clippy_OBJECTS): lib/route_types.h
 $(lib_libfrr_la_OBJECTS): lib/route_types.h
 
+# force lib_daemons.h
+$(lib_libfrr_la_OBJECTS): lib/vtysh_daemons.h
+
+CLEANFILES += lib/vtysh_daemons.h
+lib/vtysh_daemons.h:
+	@$(MKDIR_P) lib
+	$(PERL) $(top_srcdir)/vtysh/daemons.pl $(vtysh_daemons) > lib/vtysh_daemons.h
+
+
 AM_YFLAGS = -d -Dapi.prefix=@BISON_OPENBRACE@cmd_yy@BISON_CLOSEBRACE@ @BISON_VERBOSE@
 
 lib/command_lex.h: lib/command_lex.c
diff --git a/lib/systemd.c b/lib/systemd.c
index 56a53a6..a82c376 100644
--- a/lib/systemd.c
+++ b/lib/systemd.c
@@ -5,6 +5,7 @@
  */
 
 #include <zebra.h>
+#include <sys/stat.h>
 #include <sys/un.h>
 
 #include "frrevent.h"
diff --git a/lib/vector.c b/lib/vector.c
index bbea67c..60d3831 100644
--- a/lib/vector.c
+++ b/lib/vector.c
@@ -4,6 +4,7 @@
  */
 
 #include <zebra.h>
+#include <string.h>
 
 #include "vector.h"
 #include "memory.h"
diff --git a/lib/vrf.c b/lib/vrf.c
index b279e8b..e907626 100644
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -5,6 +5,7 @@
  */
 
 #include <zebra.h>
+#include <sys/ioctl.h>
 
 #include "if.h"
 #include "vrf.h"
@@ -325,6 +326,33 @@ void vrf_disable(struct vrf *vrf)
 		(*vrf_master.vrf_disable_hook)(vrf);
 }
 
+void vrf_iterate(vrf_iter_func fnc)
+{
+	struct vrf *vrf, *tmp;
+
+	if (debug_vrf)
+		zlog_debug("%s:  vrf subsystem iteration", __func__);
+
+	RB_FOREACH_SAFE (vrf, vrf_id_head, &vrfs_by_id, tmp) {
+		if (vrf->vrf_id == VRF_DEFAULT)
+			continue;
+
+		fnc(vrf);
+	}
+
+	RB_FOREACH_SAFE (vrf, vrf_name_head, &vrfs_by_name, tmp) {
+		if (vrf->vrf_id == VRF_DEFAULT)
+			continue;
+
+		fnc(vrf);
+	}
+
+	/* Finally process default VRF */
+	vrf = vrf_lookup_by_id(VRF_DEFAULT);
+	if (vrf)
+		fnc(vrf);
+}
+
 const char *vrf_id_to_name(vrf_id_t vrf_id)
 {
 	struct vrf *vrf;
@@ -541,32 +569,12 @@ static void vrf_terminate_single(struct vrf *vrf)
 	vrf_delete(vrf);
 }
 
-/* Terminate VRF module. */
 void vrf_terminate(void)
 {
-	struct vrf *vrf, *tmp;
-
 	if (debug_vrf)
 		zlog_debug("%s: Shutting down vrf subsystem", __func__);
 
-	RB_FOREACH_SAFE (vrf, vrf_id_head, &vrfs_by_id, tmp) {
-		if (vrf->vrf_id == VRF_DEFAULT)
-			continue;
-
-		vrf_terminate_single(vrf);
-	}
-
-	RB_FOREACH_SAFE (vrf, vrf_name_head, &vrfs_by_name, tmp) {
-		if (vrf->vrf_id == VRF_DEFAULT)
-			continue;
-
-		vrf_terminate_single(vrf);
-	}
-
-	/* Finally terminate default VRF */
-	vrf = vrf_lookup_by_id(VRF_DEFAULT);
-	if (vrf)
-		vrf_terminate_single(vrf);
+	vrf_iterate(vrf_terminate_single);
 }
 
 int vrf_socket(int domain, int type, int protocol, vrf_id_t vrf_id,
@@ -680,18 +688,6 @@ DEFUN_YANG (no_vrf,
 	const char *vrfname = argv[2]->arg;
 	char xpath_list[XPATH_MAXLEN];
 
-	struct vrf *vrfp;
-
-	vrfp = vrf_lookup_by_name(vrfname);
-
-	if (vrfp == NULL)
-		return CMD_SUCCESS;
-
-	if (CHECK_FLAG(vrfp->status, VRF_ACTIVE)) {
-		vty_out(vty, "%% Only inactive VRFs can be deleted\n");
-		return CMD_WARNING_CONFIG_FAILED;
-	}
-
 	if (vrf_get_backend() == VRF_BACKEND_VRF_LITE) {
 		/*
 		 * Remove the VRF interface config when removing the VRF.
@@ -914,7 +910,7 @@ static int lib_vrf_create(struct nb_cb_create_args *args)
 	const char *vrfname;
 	struct vrf *vrfp;
 
-	vrfname = yang_dnode_get_string(args->dnode, "./name");
+	vrfname = yang_dnode_get_string(args->dnode, "name");
 
 	if (args->event != NB_EV_APPLY)
 		return NB_OK;
@@ -955,6 +951,25 @@ static int lib_vrf_destroy(struct nb_cb_destroy_args *args)
 	return NB_OK;
 }
 
+static void lib_vrf_cli_write(struct vty *vty, const struct lyd_node *dnode,
+			      bool show_defaults)
+{
+	const char *name = yang_dnode_get_string(dnode, "name");
+
+	if (strcmp(name, VRF_DEFAULT_NAME)) {
+		vty_out(vty, "!\n");
+		vty_out(vty, "vrf %s\n", name);
+	}
+}
+
+static void lib_vrf_cli_write_end(struct vty *vty, const struct lyd_node *dnode)
+{
+	const char *name = yang_dnode_get_string(dnode, "name");
+
+	if (strcmp(name, VRF_DEFAULT_NAME))
+		vty_out(vty, "exit-vrf\n");
+}
+
 static const void *lib_vrf_get_next(struct nb_cb_get_next_args *args)
 {
 	struct vrf *vrfp = (struct vrf *)args->list_entry;
@@ -987,6 +1002,19 @@ static const void *lib_vrf_lookup_entry(struct nb_cb_lookup_entry_args *args)
 	return vrf;
 }
 
+static const void *lib_vrf_lookup_next(struct nb_cb_lookup_entry_args *args)
+{
+	const char *vrfname = args->keys->key[0];
+	struct vrf vrfkey, *vrf;
+
+	strlcpy(vrfkey.name, vrfname, sizeof(vrfkey.name));
+	vrf = RB_FIND(vrf_name_head, &vrfs_by_name, &vrfkey);
+	if (!strcmp(vrf->name, vrfname))
+		vrf = RB_NEXT(vrf_name_head, vrf);
+
+	return vrf;
+}
+
 /*
  * XPath: /frr-vrf:lib/vrf/id
  */
@@ -1013,6 +1041,8 @@ lib_vrf_state_active_get_elem(struct nb_cb_get_elem_args *args)
 }
 
 /* clang-format off */
+
+/* cli_show callbacks are kept here for daemons not yet converted to mgmtd */
 const struct frr_yang_module_info frr_vrf_info = {
 	.name = "frr-vrf",
 	.nodes = {
@@ -1021,9 +1051,12 @@ const struct frr_yang_module_info frr_vrf_info = {
 			.cbs = {
 				.create = lib_vrf_create,
 				.destroy = lib_vrf_destroy,
+				.cli_show = lib_vrf_cli_write,
+				.cli_show_end = lib_vrf_cli_write_end,
 				.get_next = lib_vrf_get_next,
 				.get_keys = lib_vrf_get_keys,
 				.lookup_entry = lib_vrf_lookup_entry,
+				.lookup_next = lib_vrf_lookup_next,
 			},
 			.priority = NB_DFLT_PRIORITY - 2,
 		},
@@ -1045,3 +1078,19 @@ const struct frr_yang_module_info frr_vrf_info = {
 	}
 };
 
+const struct frr_yang_module_info frr_vrf_cli_info = {
+	.name = "frr-vrf",
+	.ignore_cfg_cbs = true,
+	.nodes = {
+		{
+			.xpath = "/frr-vrf:lib/vrf",
+			.cbs = {
+				.cli_show = lib_vrf_cli_write,
+				.cli_show_end = lib_vrf_cli_write_end,
+			},
+		},
+		{
+			.xpath = NULL,
+		},
+	}
+};
diff --git a/lib/vrf.h b/lib/vrf.h
index f66a9e6..3ebb6dd 100644
--- a/lib/vrf.h
+++ b/lib/vrf.h
@@ -202,6 +202,12 @@ extern void vrf_init(int (*create)(struct vrf *vrf),
 		     int (*destroy)(struct vrf *vrf));
 
 /*
+ * Iterate over custom VRFs and round up by processing the default VRF.
+ */
+typedef void (*vrf_iter_func)(struct vrf *vrf);
+extern void vrf_iterate(vrf_iter_func fnc);
+
+/*
  * Call vrf_terminate when the protocol is being shutdown
  */
 extern void vrf_terminate(void);
@@ -294,6 +300,7 @@ extern int vrf_enable(struct vrf *vrf);
 extern void vrf_delete(struct vrf *vrf);
 
 extern const struct frr_yang_module_info frr_vrf_info;
+extern const struct frr_yang_module_info frr_vrf_cli_info;
 
 #ifdef __cplusplus
 }
diff --git a/lib/vty.c b/lib/vty.c
index ed8b71e..1c9cff4 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -6,6 +6,8 @@
 
 #include <zebra.h>
 
+#include <fcntl.h>
+#include <sys/stat.h>
 #include <lib/version.h>
 #include <sys/types.h>
 #include <sys/types.h>
@@ -44,6 +46,8 @@
 #include <arpa/telnet.h>
 #include <termios.h>
 
+#include "lib/config_paths.h"
+
 #include "lib/vty_clippy.c"
 
 DEFINE_MTYPE_STATIC(LIB, VTY, "VTY");
@@ -122,6 +126,13 @@ bool vty_log_commands;
 static bool vty_log_commands_perm;
 
 char const *const mgmt_daemons[] = {
+	"zebra",
+#ifdef HAVE_RIPD
+	"ripd",
+#endif
+#ifdef HAVE_RIPNGD
+	"ripngd",
+#endif
 #ifdef HAVE_STATICD
 	"staticd",
 #endif
@@ -157,10 +168,9 @@ static int vty_mgmt_unlock_running_inline(struct vty *vty)
 	return vty->mgmt_locked_running_ds ? -1 : 0;
 }
 
-void vty_mgmt_resume_response(struct vty *vty, bool success)
+void vty_mgmt_resume_response(struct vty *vty, int ret)
 {
 	uint8_t header[4] = {0, 0, 0, 0};
-	int ret = CMD_SUCCESS;
 
 	if (!vty->mgmt_req_pending_cmd) {
 		zlog_err(
@@ -168,14 +178,10 @@ void vty_mgmt_resume_response(struct vty *vty, bool success)
 		return;
 	}
 
-	if (!success)
-		ret = CMD_WARNING_CONFIG_FAILED;
-
-	MGMTD_FE_CLIENT_DBG(
-		"resuming CLI cmd after %s on vty session-id: %" PRIu64
-		" with '%s'",
-		vty->mgmt_req_pending_cmd, vty->mgmt_session_id,
-		success ? "succeeded" : "failed");
+	debug_fe_client("resuming CLI cmd after %s on vty session-id: %" PRIu64
+			" with '%s'",
+			vty->mgmt_req_pending_cmd, vty->mgmt_session_id,
+			ret == CMD_SUCCESS ? "success" : "failed");
 
 	vty->mgmt_req_pending_cmd = NULL;
 
@@ -383,11 +389,14 @@ int vty_json_no_pretty(struct vty *vty, struct json_object *json)
 	return vty_json_helper(vty, json, JSON_C_TO_STRING_NOSLASHESCAPE);
 }
 
-void vty_json_empty(struct vty *vty)
+void vty_json_empty(struct vty *vty, struct json_object *json)
 {
-	json_object *json = json_object_new_object();
+	json_object *jsonobj = json;
+
+	if (!json)
+		jsonobj = json_object_new_object();
 
-	vty_json(vty, json);
+	vty_json(vty, jsonobj);
 }
 
 /* Output current time to the vty. */
@@ -1565,7 +1574,7 @@ static void vty_read(struct event *thread)
 			break;
 		case '\r':
 			vty->escape = VTY_CR;
-			/* fallthru */
+			fallthrough;
 		case '\n':
 			vty_out(vty, "\n");
 			buffer_flush_available(vty->obuf, vty->wfd);
@@ -2256,19 +2265,6 @@ bool mgmt_vty_read_configs(void)
 
 	snprintf(path, sizeof(path), "%s/mgmtd.conf", frr_sysconfdir);
 	confp = vty_open_config(path, config_default);
-	if (!confp) {
-		char *orig;
-
-		snprintf(path, sizeof(path), "%s/zebra.conf", frr_sysconfdir);
-		orig = XSTRDUP(MTYPE_TMP, host_config_get());
-
-		zlog_info("mgmtd: trying backup config file: %s", path);
-		confp = vty_open_config(path, config_default);
-
-		host_config_set(path);
-		XFREE(MTYPE_TMP, orig);
-	}
-
 	if (confp) {
 		zlog_info("mgmtd: reading config file: %s", path);
 
@@ -2406,10 +2402,9 @@ static void vtysh_read(struct event *thread)
 				 * we get response through callback.
 				 */
 				if (vty->mgmt_req_pending_cmd) {
-					MGMTD_FE_CLIENT_DBG(
-						"postpone CLI response pending mgmtd %s on vty session-id %" PRIu64,
-						vty->mgmt_req_pending_cmd,
-						vty->mgmt_session_id);
+					debug_fe_client("postpone CLI response pending mgmtd %s on vty session-id %" PRIu64,
+							vty->mgmt_req_pending_cmd,
+							vty->mgmt_session_id);
 					return;
 				}
 
@@ -2490,14 +2485,14 @@ void vty_close(struct vty *vty)
 	 * so warn the user.
 	 */
 	if (vty->mgmt_num_pending_setcfg)
-		MGMTD_FE_CLIENT_ERR(
+		log_err_fe_client(
 			"vty closed, uncommitted config will be lost.");
 
 	/* Drop out of configure / transaction if needed. */
 	vty_config_exit(vty);
 
 	if (mgmt_fe_client && vty->mgmt_session_id) {
-		MGMTD_FE_CLIENT_DBG("closing vty session");
+		debug_fe_client("closing vty session");
 		mgmt_fe_destroy_client_session(mgmt_fe_client,
 					       vty->mgmt_client_id);
 		vty->mgmt_session_id = 0;
@@ -3477,9 +3472,8 @@ void vty_init_vtysh(void)
 static void vty_mgmt_server_connected(struct mgmt_fe_client *client,
 				      uintptr_t usr_data, bool connected)
 {
-	MGMTD_FE_CLIENT_DBG("Got %sconnected %s MGMTD Frontend Server",
-			    !connected ? "dis: " : "",
-			    !connected ? "from" : "to");
+	debug_fe_client("Got %sconnected %s MGMTD Frontend Server",
+			!connected ? "dis: " : "", !connected ? "from" : "to");
 
 	/*
 	 * We should not have any sessions for connecting or disconnecting case.
@@ -3515,8 +3509,8 @@ static void vty_mgmt_session_notify(struct mgmt_fe_client *client,
 		return;
 	}
 
-	MGMTD_FE_CLIENT_DBG("%s session for client %" PRIu64 " successfully",
-			    create ? "Created" : "Destroyed", client_id);
+	debug_fe_client("%s session for client %" PRIu64 " successfully",
+			create ? "Created" : "Destroyed", client_id);
 
 	if (create) {
 		assert(session_id != 0);
@@ -3547,8 +3541,8 @@ static void vty_mgmt_ds_lock_notified(struct mgmt_fe_client *client,
 		zlog_err("%socking for DS %u failed, Err: '%s' vty %p",
 			 lock_ds ? "L" : "Unl", ds_id, errmsg_if_any, vty);
 	else {
-		MGMTD_FE_CLIENT_DBG("%socked DS %u successfully",
-				    lock_ds ? "L" : "Unl", ds_id);
+		debug_fe_client("%socked DS %u successfully",
+				lock_ds ? "L" : "Unl", ds_id);
 		if (ds_id == MGMTD_DS_CANDIDATE)
 			vty->mgmt_locked_candidate_ds = lock_ds;
 		else
@@ -3557,7 +3551,8 @@ static void vty_mgmt_ds_lock_notified(struct mgmt_fe_client *client,
 
 	if (!is_short_circuit && vty->mgmt_req_pending_cmd) {
 		assert(!strcmp(vty->mgmt_req_pending_cmd, "MESSAGE_LOCKDS_REQ"));
-		vty_mgmt_resume_response(vty, success);
+		vty_mgmt_resume_response(vty,
+					 success ? CMD_SUCCESS : CMD_WARNING);
 	}
 }
 
@@ -3578,9 +3573,9 @@ static void vty_mgmt_set_config_result_notified(
 		vty_out(vty, "ERROR: SET_CONFIG request failed, Error: %s\n",
 			errmsg_if_any ? errmsg_if_any : "Unknown");
 	} else {
-		MGMTD_FE_CLIENT_DBG("SET_CONFIG request for client 0x%" PRIx64
-				    " req-id %" PRIu64 " was successfull",
-				    client_id, req_id);
+		debug_fe_client("SET_CONFIG request for client 0x%" PRIx64
+				" req-id %" PRIu64 " was successfull",
+				client_id, req_id);
 	}
 
 	if (implicit_commit) {
@@ -3589,7 +3584,8 @@ static void vty_mgmt_set_config_result_notified(
 		vty_mgmt_unlock_running_inline(vty);
 	}
 
-	vty_mgmt_resume_response(vty, success);
+	vty_mgmt_resume_response(vty, success ? CMD_SUCCESS
+					      : CMD_WARNING_CONFIG_FAILED);
 }
 
 static void vty_mgmt_commit_config_result_notified(
@@ -3609,15 +3605,15 @@ static void vty_mgmt_commit_config_result_notified(
 		vty_out(vty, "ERROR: COMMIT_CONFIG request failed, Error: %s\n",
 			errmsg_if_any ? errmsg_if_any : "Unknown");
 	} else {
-		MGMTD_FE_CLIENT_DBG(
-			"COMMIT_CONFIG request for client 0x%" PRIx64
-			" req-id %" PRIu64 " was successfull",
-			client_id, req_id);
+		debug_fe_client("COMMIT_CONFIG request for client 0x%" PRIx64
+				" req-id %" PRIu64 " was successfull",
+				client_id, req_id);
 		if (errmsg_if_any)
 			vty_out(vty, "MGMTD: %s\n", errmsg_if_any);
 	}
 
-	vty_mgmt_resume_response(vty, success);
+	vty_mgmt_resume_response(vty, success ? CMD_SUCCESS
+					      : CMD_WARNING_CONFIG_FAILED);
 }
 
 static int vty_mgmt_get_data_result_notified(
@@ -3637,13 +3633,13 @@ static int vty_mgmt_get_data_result_notified(
 			 client_id, errmsg_if_any ? errmsg_if_any : "Unknown");
 		vty_out(vty, "ERROR: GET_DATA request failed, Error: %s\n",
 			errmsg_if_any ? errmsg_if_any : "Unknown");
-		vty_mgmt_resume_response(vty, success);
+		vty_mgmt_resume_response(vty, CMD_WARNING);
 		return -1;
 	}
 
-	MGMTD_FE_CLIENT_DBG("GET_DATA request succeeded, client 0x%" PRIx64
-			    " req-id %" PRIu64,
-			    client_id, req_id);
+	debug_fe_client("GET_DATA request succeeded, client 0x%" PRIx64
+			" req-id %" PRIu64,
+			client_id, req_id);
 
 	if (req_id != mgmt_last_req_id) {
 		mgmt_last_req_id = req_id;
@@ -3656,12 +3652,211 @@ static int vty_mgmt_get_data_result_notified(
 	}
 	if (next_key < 0) {
 		vty_out(vty, "]\n");
-		vty_mgmt_resume_response(vty, success);
+		vty_mgmt_resume_response(vty, CMD_SUCCESS);
 	}
 
 	return 0;
 }
 
+static ssize_t vty_mgmt_libyang_print(void *user_data, const void *buf,
+				      size_t count)
+{
+	struct vty *vty = user_data;
+
+	vty_out(vty, "%.*s", (int)count, (const char *)buf);
+	return count;
+}
+
+static void vty_out_yang_error(struct vty *vty, LYD_FORMAT format,
+			       struct ly_err_item *ei)
+{
+	bool have_apptag = ei->apptag && ei->apptag[0] != 0;
+	bool have_path = ei->path && ei->path[0] != 0;
+	bool have_msg = ei->msg && ei->msg[0] != 0;
+	const char *severity = NULL;
+	const char *evalid = NULL;
+	const char *ecode = NULL;
+	LY_ERR err = ei->no;
+
+	if (ei->level == LY_LLERR)
+		severity = "error";
+	else if (ei->level == LY_LLWRN)
+		severity = "warning";
+
+	ecode = yang_ly_strerrcode(err);
+	if (err == LY_EVALID && ei->vecode != LYVE_SUCCESS)
+		evalid = yang_ly_strvecode(ei->vecode);
+
+	switch (format) {
+	case LYD_XML:
+		vty_out(vty,
+			"<rpc-error xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">");
+		vty_out(vty, "<error-type>application</error-type>");
+		if (severity)
+			vty_out(vty, "<error-severity>%s</error-severity>",
+				severity);
+		if (ecode)
+			vty_out(vty, "<error-code>%s</error-code>", ecode);
+		if (evalid)
+			vty_out(vty, "<error-validation>%s</error-validation>\n",
+				evalid);
+		if (have_path)
+			vty_out(vty, "<error-path>%s</error-path>\n", ei->path);
+		if (have_apptag)
+			vty_out(vty, "<error-app-tag>%s</error-app-tag>\n",
+				ei->apptag);
+		if (have_msg)
+			vty_out(vty, "<error-message>%s</error-message>\n",
+				ei->msg);
+
+		vty_out(vty, "</rpc-error>");
+		break;
+	case LYD_JSON:
+		vty_out(vty, "{ \"error-type\": \"application\"");
+		if (severity)
+			vty_out(vty, ", \"error-severity\": \"%s\"", severity);
+		if (ecode)
+			vty_out(vty, ", \"error-code\": \"%s\"", ecode);
+		if (evalid)
+			vty_out(vty, ", \"error-validation\": \"%s\"", evalid);
+		if (have_path)
+			vty_out(vty, ", \"error-path\": \"%s\"", ei->path);
+		if (have_apptag)
+			vty_out(vty, ", \"error-app-tag\": \"%s\"", ei->apptag);
+		if (have_msg)
+			vty_out(vty, ", \"error-message\": \"%s\"", ei->msg);
+
+		vty_out(vty, "}");
+		break;
+	case LYD_UNKNOWN:
+	case LYD_LYB:
+	default:
+		vty_out(vty, "%% error");
+		if (severity)
+			vty_out(vty, " severity: %s", severity);
+		if (evalid)
+			vty_out(vty, " invalid: %s", evalid);
+		if (have_path)
+			vty_out(vty, " path: %s", ei->path);
+		if (have_apptag)
+			vty_out(vty, " app-tag: %s", ei->apptag);
+		if (have_msg)
+			vty_out(vty, " msg: %s", ei->msg);
+		break;
+	}
+}
+
+static uint vty_out_yang_errors(struct vty *vty, LYD_FORMAT format)
+{
+	struct ly_err_item *ei = ly_err_first(ly_native_ctx);
+	uint count;
+
+	if (!ei)
+		return 0;
+
+	if (format == LYD_JSON)
+		vty_out(vty, "\"ietf-restconf:errors\": [ ");
+
+	for (count = 0; ei; count++, ei = ei->next) {
+		if (count)
+			vty_out(vty, ", ");
+		vty_out_yang_error(vty, format, ei);
+	}
+
+	if (format == LYD_JSON)
+		vty_out(vty, " ]");
+
+	ly_err_clean(ly_native_ctx, NULL);
+
+	return count;
+}
+
+
+static int vty_mgmt_get_tree_result_notified(
+	struct mgmt_fe_client *client, uintptr_t user_data, uint64_t client_id,
+	uint64_t session_id, uintptr_t session_ctx, uint64_t req_id,
+	Mgmtd__DatastoreId ds_id, LYD_FORMAT result_type, void *result,
+	size_t len, int partial_error)
+{
+	struct vty *vty;
+	struct lyd_node *dnode;
+	int ret = CMD_SUCCESS;
+	LY_ERR err;
+
+	vty = (struct vty *)session_ctx;
+
+	debug_fe_client("GET_TREE request %ssucceeded, client 0x%" PRIx64
+			" req-id %" PRIu64,
+			partial_error ? "partially " : "", client_id, req_id);
+
+	assert(result_type == LYD_LYB ||
+	       result_type == vty->mgmt_req_pending_data);
+
+	if (vty->mgmt_req_pending_data == LYD_XML && partial_error)
+		vty_out(vty,
+			"<!-- some errors occurred gathering results -->\n");
+
+	if (result_type == LYD_LYB) {
+		/*
+		 * parse binary into tree and print in the specified format
+		 */
+		result_type = vty->mgmt_req_pending_data;
+
+		err = lyd_parse_data_mem(ly_native_ctx, result, LYD_LYB, 0, 0,
+					 &dnode);
+		if (!err)
+			err = lyd_print_clb(vty_mgmt_libyang_print, vty, dnode,
+					    result_type, LYD_PRINT_WITHSIBLINGS);
+		lyd_free_all(dnode);
+
+		if (vty_out_yang_errors(vty, result_type) || err)
+			ret = CMD_WARNING;
+	} else {
+		/*
+		 * Print the in-format result
+		 */
+		assert(result_type == LYD_XML || result_type == LYD_JSON);
+		vty_out(vty, "%.*s\n", (int)len - 1, (const char *)result);
+	}
+
+	vty_mgmt_resume_response(vty, ret);
+
+	return 0;
+}
+
+static int vty_mgmt_error_notified(struct mgmt_fe_client *client,
+				   uintptr_t user_data, uint64_t client_id,
+				   uint64_t session_id, uintptr_t session_ctx,
+				   uint64_t req_id, int error,
+				   const char *errstr)
+{
+	struct vty *vty = (struct vty *)session_ctx;
+	const char *cname = mgmt_fe_client_name(client);
+
+	if (!vty->mgmt_req_pending_cmd) {
+		debug_fe_client("Erorr with no pending command: %d returned for client %s 0x%" PRIx64
+				" session-id %" PRIu64 " req-id %" PRIu64
+				"error-str %s",
+				error, cname, client_id, session_id, req_id,
+				errstr);
+		vty_out(vty,
+			"%% Error %d from MGMTD for %s with no pending command: %s\n",
+			error, cname, errstr);
+		return CMD_WARNING;
+	}
+
+	debug_fe_client("Erorr %d returned for client %s 0x%" PRIx64
+			" session-id %" PRIu64 " req-id %" PRIu64 "error-str %s",
+			error, cname, client_id, session_id, req_id, errstr);
+
+	vty_out(vty, "%% %s (for %s, client %s)\n", errstr,
+		vty->mgmt_req_pending_cmd, cname);
+
+	vty_mgmt_resume_response(vty, error ? CMD_WARNING : CMD_SUCCESS);
+
+	return 0;
+}
+
 static struct mgmt_fe_client_cbs mgmt_cbs = {
 	.client_connect_notify = vty_mgmt_server_connected,
 	.client_session_notify = vty_mgmt_session_notify,
@@ -3669,6 +3864,9 @@ static struct mgmt_fe_client_cbs mgmt_cbs = {
 	.set_config_notify = vty_mgmt_set_config_result_notified,
 	.commit_config_notify = vty_mgmt_commit_config_result_notified,
 	.get_data_notify = vty_mgmt_get_data_result_notified,
+	.get_tree_notify = vty_mgmt_get_tree_result_notified,
+	.error_notify = vty_mgmt_error_notified,
+
 };
 
 void vty_init_mgmt_fe(void)
@@ -3715,12 +3913,15 @@ int vty_mgmt_send_lockds_req(struct vty *vty, Mgmtd__DatastoreId ds_id,
 	return 0;
 }
 
-int vty_mgmt_send_config_data(struct vty *vty, bool implicit_commit)
+int vty_mgmt_send_config_data(struct vty *vty, const char *xpath_base,
+			      bool implicit_commit)
 {
 	Mgmtd__YangDataValue value[VTY_MAXCFGCHANGES];
 	Mgmtd__YangData cfg_data[VTY_MAXCFGCHANGES];
 	Mgmtd__YangCfgDataReq cfg_req[VTY_MAXCFGCHANGES];
 	Mgmtd__YangCfgDataReq *cfgreq[VTY_MAXCFGCHANGES] = {0};
+	char xpath[VTY_MAXCFGCHANGES][XPATH_MAXLEN];
+	char *change_xpath;
 	size_t indx;
 
 	if (vty->type == VTY_FILE) {
@@ -3756,6 +3957,9 @@ int vty_mgmt_send_config_data(struct vty *vty, bool implicit_commit)
 		}
 	}
 
+	if (xpath_base == NULL)
+		xpath_base = "";
+
 	for (indx = 0; indx < vty->num_cfg_changes; indx++) {
 		mgmt_yang_data_init(&cfg_data[indx]);
 
@@ -3768,29 +3972,47 @@ int vty_mgmt_send_config_data(struct vty *vty, bool implicit_commit)
 			cfg_data[indx].value = &value[indx];
 		}
 
-		cfg_data[indx].xpath = vty->cfg_changes[indx].xpath;
+		change_xpath = vty->cfg_changes[indx].xpath;
+
+		memset(xpath[indx], 0, sizeof(xpath[indx]));
+		/* If change xpath is relative, prepend base xpath. */
+		if (change_xpath[0] == '.') {
+			strlcpy(xpath[indx], xpath_base, sizeof(xpath[indx]));
+			change_xpath++; /* skip '.' */
+		}
+		strlcat(xpath[indx], change_xpath, sizeof(xpath[indx]));
+
+		cfg_data[indx].xpath = xpath[indx];
 
 		mgmt_yang_cfg_data_req_init(&cfg_req[indx]);
 		cfg_req[indx].data = &cfg_data[indx];
 		switch (vty->cfg_changes[indx].operation) {
-		case NB_OP_DESTROY:
+		case NB_OP_DELETE:
 			cfg_req[indx].req_type =
 				MGMTD__CFG_DATA_REQ_TYPE__DELETE_DATA;
 			break;
 
+		case NB_OP_DESTROY:
+			cfg_req[indx].req_type =
+				MGMTD__CFG_DATA_REQ_TYPE__REMOVE_DATA;
+			break;
+
+		case NB_OP_CREATE_EXCL:
+			cfg_req[indx].req_type =
+				MGMTD__CFG_DATA_REQ_TYPE__CREATE_DATA;
+			break;
+
+		case NB_OP_REPLACE:
+			cfg_req[indx].req_type =
+				MGMTD__CFG_DATA_REQ_TYPE__REPLACE_DATA;
+			break;
+
 		case NB_OP_CREATE:
 		case NB_OP_MODIFY:
 		case NB_OP_MOVE:
-		case NB_OP_PRE_VALIDATE:
-		case NB_OP_APPLY_FINISH:
 			cfg_req[indx].req_type =
 				MGMTD__CFG_DATA_REQ_TYPE__SET_DATA;
 			break;
-		case NB_OP_GET_ELEM:
-		case NB_OP_GET_NEXT:
-		case NB_OP_GET_KEYS:
-		case NB_OP_LOOKUP_ENTRY:
-		case NB_OP_RPC:
 		default:
 			assertf(false,
 				"Invalid operation type for send config: %d",
@@ -3874,6 +4096,30 @@ int vty_mgmt_send_get_req(struct vty *vty, bool is_config,
 	return 0;
 }
 
+int vty_mgmt_send_get_data_req(struct vty *vty, uint8_t datastore,
+			       LYD_FORMAT result_type, uint8_t flags,
+			       uint8_t defaults, const char *xpath)
+{
+	LYD_FORMAT intern_format = result_type;
+
+	vty->mgmt_req_id++;
+
+	if (mgmt_fe_send_get_data_req(mgmt_fe_client, vty->mgmt_session_id,
+				      vty->mgmt_req_id, datastore,
+				      intern_format, flags, defaults, xpath)) {
+		zlog_err("Failed to send GET-DATA to MGMTD session-id: %" PRIu64
+			 " req-id %" PRIu64 ".",
+			 vty->mgmt_session_id, vty->mgmt_req_id);
+		vty_out(vty, "Failed to send GET-DATA to MGMTD!\n");
+		return -1;
+	}
+
+	vty->mgmt_req_pending_cmd = "MESSAGE_GET_DATA_REQ";
+	vty->mgmt_req_pending_data = result_type;
+
+	return 0;
+}
+
 /* Install vty's own commands like `who' command. */
 void vty_init(struct event_loop *master_thread, bool do_command_logging)
 {
diff --git a/lib/vty.h b/lib/vty.h
index a8654f8..a59ac7a 100644
--- a/lib/vty.h
+++ b/lib/vty.h
@@ -229,12 +229,9 @@ struct vty {
 	 * CLI command and we are waiting on the reply so we can respond to the
 	 * vty user. */
 	const char *mgmt_req_pending_cmd;
+	uintptr_t mgmt_req_pending_data;
 	bool mgmt_locked_candidate_ds;
 	bool mgmt_locked_running_ds;
-	/* Need to track when we file-lock in vtysh to re-lock on end/conf t
-	 * workaround
-	 */
-	bool vtysh_file_locked;
 };
 
 static inline void vty_push_context(struct vty *vty, int node, uint64_t id)
@@ -377,7 +374,7 @@ extern bool vty_set_include(struct vty *vty, const char *regexp);
  */
 extern int vty_json(struct vty *vty, struct json_object *json);
 extern int vty_json_no_pretty(struct vty *vty, struct json_object *json);
-extern void vty_json_empty(struct vty *vty);
+extern void vty_json_empty(struct vty *vty, struct json_object *json);
 /* post fd to be passed to the vtysh client
  * fd is owned by the VTY code after this and will be closed when done
  */
@@ -412,15 +409,19 @@ extern bool vty_mgmt_fe_enabled(void);
 extern bool vty_mgmt_should_process_cli_apply_changes(struct vty *vty);
 
 extern bool mgmt_vty_read_configs(void);
-extern int vty_mgmt_send_config_data(struct vty *vty, bool implicit_commit);
+extern int vty_mgmt_send_config_data(struct vty *vty, const char *xpath_base,
+				     bool implicit_commit);
 extern int vty_mgmt_send_commit_config(struct vty *vty, bool validate_only,
 				       bool abort);
 extern int vty_mgmt_send_get_req(struct vty *vty, bool is_config,
 				 Mgmtd__DatastoreId datastore,
 				 const char **xpath_list, int num_req);
+extern int vty_mgmt_send_get_data_req(struct vty *vty, uint8_t datastore,
+				      LYD_FORMAT result_type, uint8_t flags,
+				      uint8_t defaults, const char *xpath);
 extern int vty_mgmt_send_lockds_req(struct vty *vty, Mgmtd__DatastoreId ds_id,
 				    bool lock, bool scok);
-extern void vty_mgmt_resume_response(struct vty *vty, bool success);
+extern void vty_mgmt_resume_response(struct vty *vty, int ret);
 
 static inline bool vty_needs_implicit_commit(struct vty *vty)
 {
diff --git a/lib/workqueue.c b/lib/workqueue.c
index fa5d585..d630af1 100644
--- a/lib/workqueue.c
+++ b/lib/workqueue.c
@@ -42,6 +42,15 @@ static void work_queue_item_free(struct work_queue_item *item)
 	return;
 }
 
+static inline void work_queue_item_dequeue(struct work_queue *wq,
+					   struct work_queue_item *item)
+{
+	assert(wq->item_count > 0);
+
+	wq->item_count--;
+	STAILQ_REMOVE(&wq->items, item, work_queue_item, wq);
+}
+
 static void work_queue_item_remove(struct work_queue *wq,
 				   struct work_queue_item *item)
 {
@@ -133,6 +142,13 @@ static int work_queue_schedule(struct work_queue *wq, unsigned int delay)
 		return 0;
 }
 
+static inline void work_queue_item_enqueue(struct work_queue *wq,
+					   struct work_queue_item *item)
+{
+	STAILQ_INSERT_TAIL(&wq->items, item, wq);
+	wq->item_count++;
+}
+
 void work_queue_add(struct work_queue *wq, void *data)
 {
 	struct work_queue_item *item;
@@ -265,17 +281,14 @@ void work_queue_run(struct event *thread)
 		do {
 			ret = wq->spec.workfunc(wq, item->data);
 			item->ran++;
-		} while ((ret == WQ_RETRY_NOW)
-			 && (item->ran < wq->spec.max_retries));
+		} while (item->ran < wq->spec.max_retries);
 
 		switch (ret) {
 		case WQ_QUEUE_BLOCKED: {
 			/* decrement item->ran again, cause this isn't an item
-			 * specific error, and fall through to WQ_RETRY_LATER
+			 * specific error, and retry later
 			 */
 			item->ran--;
-		}
-		case WQ_RETRY_LATER: {
 			goto stats;
 		}
 		case WQ_REQUEUE: {
@@ -295,10 +308,6 @@ void work_queue_run(struct event *thread)
 				titem = item;
 			break;
 		}
-		case WQ_RETRY_NOW:
-		/* a RETRY_NOW that gets here has exceeded max_tries, same as
-		 * ERROR */
-		/* fallthru */
 		case WQ_SUCCESS:
 		default: {
 			work_queue_item_remove(wq, item);
@@ -350,8 +359,7 @@ stats:
 
 	/* Is the queue done yet? If it is, call the completion callback. */
 	if (!work_queue_empty(wq)) {
-		if (ret == WQ_RETRY_LATER ||
-		    ret == WQ_QUEUE_BLOCKED)
+		if (ret == WQ_QUEUE_BLOCKED)
 			work_queue_schedule(wq, wq->spec.retry);
 		else
 			work_queue_schedule(wq, 0);
diff --git a/lib/workqueue.h b/lib/workqueue.h
index 5d84739..a495fe8 100644
--- a/lib/workqueue.h
+++ b/lib/workqueue.h
@@ -26,9 +26,7 @@ DECLARE_MTYPE(WORK_QUEUE);
 /* action value, for use by item processor and item error handlers */
 typedef enum {
 	WQ_SUCCESS = 0,
-	WQ_RETRY_NOW,     /* retry immediately */
-	WQ_RETRY_LATER,   /* retry later, cease processing work queue */
-	WQ_REQUEUE,       /* requeue item, continue processing work queue */
+	WQ_REQUEUE,	  /* requeue item, continue processing work queue */
 	WQ_QUEUE_BLOCKED, /* Queue cant be processed at this time.
 			   * Similar to WQ_RETRY_LATER, but doesn't penalise
 			   * the particular item.. */
@@ -117,22 +115,6 @@ work_queue_last_item(struct work_queue *wq)
 	return STAILQ_LAST(&wq->items, work_queue_item, wq);
 }
 
-static inline void work_queue_item_enqueue(struct work_queue *wq,
-					   struct work_queue_item *item)
-{
-	STAILQ_INSERT_TAIL(&wq->items, item, wq);
-	wq->item_count++;
-}
-
-static inline void work_queue_item_dequeue(struct work_queue *wq,
-					   struct work_queue_item *item)
-{
-	assert(wq->item_count > 0);
-
-	wq->item_count--;
-	STAILQ_REMOVE(&wq->items, item, work_queue_item, wq);
-}
-
 /* create a new work queue, of given name.
  * user must fill in the spec of the returned work queue before adding
  * anything to it
@@ -160,6 +142,7 @@ bool work_queue_is_scheduled(struct work_queue *wq);
 /* Helpers, exported for thread.c and command.c */
 extern void work_queue_run(struct event *thread);
 
+/* Function to initialize the workqueue cli */
 extern void workqueue_cmd_init(void);
 
 #ifdef __cplusplus
diff --git a/lib/yang.c b/lib/yang.c
index 4dd8654..03044fc 100644
--- a/lib/yang.c
+++ b/lib/yang.c
@@ -6,12 +6,15 @@
 
 #include <zebra.h>
 
+#include "darr.h"
 #include "log.h"
 #include "lib_errors.h"
 #include "yang.h"
 #include "yang_translator.h"
 #include "northbound.h"
 
+#include "lib/config_paths.h"
+
 DEFINE_MTYPE_STATIC(LIB, YANG_MODULE, "YANG module");
 DEFINE_MTYPE_STATIC(LIB, YANG_DATA, "YANG data structure");
 
@@ -37,7 +40,8 @@ static LY_ERR yang_module_imp_clb(const char *mod_name, const char *mod_rev,
 	struct yang_module_embed *e;
 
 	if (!strcmp(mod_name, "ietf-inet-types") ||
-	    !strcmp(mod_name, "ietf-yang-types"))
+	    !strcmp(mod_name, "ietf-yang-types") ||
+	    !strcmp(mod_name, "ietf-yang-metadata"))
 		/* libyang has these built in, don't try finding them here */
 		return LY_ENOTFOUND;
 
@@ -97,13 +101,14 @@ RB_GENERATE(yang_modules, yang_module, entry, yang_module_compare)
 
 struct yang_modules yang_modules = RB_INITIALIZER(&yang_modules);
 
-struct yang_module *yang_module_load(const char *module_name)
+struct yang_module *yang_module_load(const char *module_name,
+				     const char **features)
 {
 	struct yang_module *module;
 	const struct lys_module *module_info;
 
-	module_info =
-		ly_ctx_load_module(ly_native_ctx, module_name, NULL, NULL);
+	module_info = ly_ctx_load_module(ly_native_ctx, module_name, NULL,
+					 features);
 	if (!module_info) {
 		flog_err(EC_LIB_YANG_MODULE_LOAD,
 			 "%s: failed to load data model: %s", __func__,
@@ -127,8 +132,10 @@ struct yang_module *yang_module_load(const char *module_name)
 
 void yang_module_load_all(void)
 {
+	static const char * const all_features[] = { "*", NULL };
+
 	for (size_t i = 0; i < array_size(frr_native_modules); i++)
-		yang_module_load(frr_native_modules[i]);
+		yang_module_load(frr_native_modules[i], (const char **)all_features);
 }
 
 struct yang_module *yang_module_find(const char *module_name)
@@ -250,19 +257,44 @@ void yang_snode_get_path(const struct lysc_node *snode,
 	}
 }
 
-struct lysc_node *yang_find_snode(struct ly_ctx *ly_ctx, const char *xpath,
-				  uint32_t options)
+LY_ERR yang_resolve_snode_xpath(struct ly_ctx *ly_ctx, const char *xpath,
+				struct lysc_node ***snodes, bool *simple)
 {
 	struct lysc_node *snode;
 	struct ly_set *set;
 	LY_ERR err;
 
-	err = lys_find_xpath(ly_native_ctx, NULL, xpath, options, &set);
-	if (err || !set->count)
-		return NULL;
+	/* lys_find_path will not resolve complex xpaths */
+	snode = (struct lysc_node *)lys_find_path(ly_ctx, NULL, xpath, 0);
+	if (snode) {
+		*darr_append(*snodes) = snode;
+		*simple = true;
+		return LY_SUCCESS;
+	}
+
+	/* Try again to catch complex query cases */
+	err = lys_find_xpath(ly_native_ctx, NULL, xpath, 0, &set);
+	if (err)
+		return err;
+	if (!set->count) {
+		ly_set_free(set, NULL);
+		return LY_ENOTFOUND;
+	}
 
-	snode = set->snodes[0];
+	*simple = false;
+	darr_ensure_i(*snodes, set->count - 1);
+	memcpy(*snodes, set->snodes, set->count * sizeof(set->snodes[0]));
 	ly_set_free(set, NULL);
+	return LY_SUCCESS;
+}
+
+
+struct lysc_node *yang_find_snode(struct ly_ctx *ly_ctx, const char *xpath,
+				  uint32_t options)
+{
+	struct lysc_node *snode;
+
+	snode = (struct lysc_node *)lys_find_path(ly_ctx, NULL, xpath, 0);
 
 	return snode;
 }
@@ -370,33 +402,10 @@ unsigned int yang_snode_num_keys(const struct lysc_node *snode)
 	return count;
 }
 
-void yang_dnode_get_path(const struct lyd_node *dnode, char *xpath,
-			 size_t xpath_len)
-{
-	lyd_path(dnode, LYD_PATH_STD, xpath, xpath_len);
-}
-
-const char *yang_dnode_get_schema_name(const struct lyd_node *dnode,
-				       const char *xpath_fmt, ...)
+char *yang_dnode_get_path(const struct lyd_node *dnode, char *xpath,
+			  size_t xpath_len)
 {
-	if (xpath_fmt) {
-		va_list ap;
-		char xpath[XPATH_MAXLEN];
-
-		va_start(ap, xpath_fmt);
-		vsnprintf(xpath, sizeof(xpath), xpath_fmt, ap);
-		va_end(ap);
-
-		dnode = yang_dnode_get(dnode, xpath);
-		if (!dnode) {
-			flog_err(EC_LIB_YANG_DNODE_NOT_FOUND,
-				 "%s: couldn't find %s", __func__, xpath);
-			zlog_backtrace(LOG_ERR);
-			abort();
-		}
-	}
-
-	return dnode->schema->name;
+	return lyd_path(dnode, LYD_PATH_STD, xpath, xpath_len);
 }
 
 struct lyd_node *yang_dnode_get(const struct lyd_node *dnode, const char *xpath)
@@ -505,6 +514,30 @@ void yang_dnode_iterate(yang_dnode_iter_cb cb, void *arg,
 	ly_set_free(set, NULL);
 }
 
+uint32_t yang_dnode_count(const struct lyd_node *dnode, const char *xpath_fmt,
+			  ...)
+{
+	va_list ap;
+	char xpath[XPATH_MAXLEN];
+	struct ly_set *set;
+	uint32_t count;
+
+	va_start(ap, xpath_fmt);
+	vsnprintf(xpath, sizeof(xpath), xpath_fmt, ap);
+	va_end(ap);
+
+	if (lyd_find_xpath(dnode, xpath, &set)) {
+		assert(0);
+		return 0;
+	}
+
+	count = set->count;
+
+	ly_set_free(set, NULL);
+
+	return count;
+}
+
 bool yang_dnode_is_default(const struct lyd_node *dnode, const char *xpath)
 {
 	const struct lysc_node *snode;
@@ -596,7 +629,8 @@ struct lyd_node *yang_dnode_dup(const struct lyd_node *dnode)
 {
 	struct lyd_node *dup = NULL;
 	LY_ERR err;
-	err = lyd_dup_siblings(dnode, NULL, LYD_DUP_RECURSIVE, &dup);
+	err = lyd_dup_siblings(dnode, NULL,
+			       LYD_DUP_RECURSIVE | LYD_DUP_WITH_FLAGS, &dup);
 	assert(!err);
 	return dup;
 }
@@ -680,10 +714,122 @@ static void ly_log_cb(LY_LOG_LEVEL level, const char *msg, const char *path)
 		zlog(priority, "libyang: %s", msg);
 }
 
+LY_ERR yang_parse_notification(const char *xpath, LYD_FORMAT format,
+			       const char *data, struct lyd_node **notif)
+{
+	struct lyd_node *tree;
+	struct ly_set *set = NULL;
+	struct ly_in *in = NULL;
+	LY_ERR err;
+
+	err = ly_in_new_memory(data, &in);
+	if (err) {
+		zlog_err("Failed to initialize ly_in: %s", ly_last_errmsg());
+		return err;
+	}
+
+	err = lyd_parse_op(ly_native_ctx, NULL, in, format, LYD_TYPE_NOTIF_YANG,
+			   &tree, NULL);
+	ly_in_free(in, 0);
+	if (err) {
+		zlog_err("Failed to parse notification: %s", ly_last_errmsg());
+		return err;
+	}
+
+	err = lyd_find_xpath3(NULL, tree, xpath, NULL, &set);
+	if (err) {
+		zlog_err("Failed to parse notification: %s", ly_last_errmsg());
+		lyd_free_all(tree);
+		return err;
+	}
+	if (set->count == 0) {
+		zlog_err("Notification not found in the parsed tree: %s", xpath);
+		ly_set_free(set, NULL);
+		lyd_free_all(tree);
+		return LY_ENOTFOUND;
+	}
+	*notif = set->dnodes[0];
+	ly_set_free(set, NULL);
+	return LY_SUCCESS;
+}
+
+static ssize_t yang_print_darr(void *arg, const void *buf, size_t count)
+{
+	uint8_t *dst = darr_append_n(*(uint8_t **)arg, count);
+
+	memcpy(dst, buf, count);
+	return count;
+}
+
+LY_ERR yang_print_tree_append(uint8_t **darr, const struct lyd_node *root,
+			      LYD_FORMAT format, uint32_t options)
+{
+	LY_ERR err;
+
+	err = lyd_print_clb(yang_print_darr, darr, root, format, options);
+	if (err)
+		zlog_err("Failed to save yang tree: %s", ly_last_errmsg());
+	else if (format != LYD_LYB)
+		*darr_append(*darr) = 0;
+	return err;
+}
+
+uint8_t *yang_print_tree(const struct lyd_node *root, LYD_FORMAT format,
+			 uint32_t options)
+{
+	uint8_t *darr = NULL;
+
+	if (yang_print_tree_append(&darr, root, format, options))
+		return NULL;
+	return darr;
+}
+
+char *yang_convert_lyd_format(const char *data, size_t data_len,
+			      LYD_FORMAT in_format, LYD_FORMAT out_format,
+			      bool shrink)
+{
+	struct lyd_node *tree = NULL;
+	uint32_t options = LYD_PRINT_WD_EXPLICIT | LYD_PRINT_WITHSIBLINGS;
+	uint8_t *result = NULL;
+	LY_ERR err;
+
+	assert(out_format != LYD_LYB);
+
+	if (in_format != LYD_LYB && !MGMT_MSG_VALIDATE_NUL_TERM(data, data_len)) {
+		zlog_err("Corrupt input data, no NUL terminating byte");
+		return NULL;
+	}
+
+	if (in_format == out_format)
+		return darr_strdup((const char *)data);
+
+	err = lyd_parse_data_mem(ly_native_ctx, (const char *)data, in_format,
+				 LYD_PARSE_ONLY, 0, &tree);
+
+	if (err) {
+		flog_err_sys(EC_LIB_LIBYANG,
+			     "cannot parse input data to convert: %s",
+			     ly_last_errmsg());
+		return NULL;
+	}
+
+	if (shrink)
+		options |= LYD_PRINT_SHRINK;
+
+	/* Take a guess at the initial capacity based on input data size */
+	darr_ensure_cap(result, data_len);
+	err = yang_print_tree_append(&result, tree, out_format, options);
+	lyd_free_all(tree);
+	if (err) {
+		darr_free(result);
+		return NULL;
+	}
+	return (char *)result;
+}
+
 const char *yang_print_errors(struct ly_ctx *ly_ctx, char *buf, size_t buf_len)
 {
 	struct ly_err_item *ei;
-	const char *path;
 
 	ei = ly_err_first(ly_ctx);
 	if (!ei)
@@ -691,18 +837,16 @@ const char *yang_print_errors(struct ly_ctx *ly_ctx, char *buf, size_t buf_len)
 
 	strlcpy(buf, "YANG error(s):\n", buf_len);
 	for (; ei; ei = ei->next) {
-		strlcat(buf, " ", buf_len);
+		if (ei->path) {
+			strlcat(buf, " Path: ", buf_len);
+			strlcat(buf, ei->path, buf_len);
+			strlcat(buf, "\n", buf_len);
+		}
+		strlcat(buf, " Error: ", buf_len);
 		strlcat(buf, ei->msg, buf_len);
 		strlcat(buf, "\n", buf_len);
 	}
 
-	path = ly_errpath(ly_ctx);
-	if (path) {
-		strlcat(buf, " YANG path: ", buf_len);
-		strlcat(buf, path, buf_len);
-		strlcat(buf, "\n", buf_len);
-	}
-
 	ly_err_clean(ly_ctx, NULL);
 
 	return buf;
@@ -723,6 +867,7 @@ struct ly_ctx *yang_ctx_new_setup(bool embedded_modules, bool explicit_compile)
 {
 	struct ly_ctx *ctx = NULL;
 	const char *yang_models_path = YANG_MODELS_PATH;
+	uint options;
 	LY_ERR err;
 
 	if (access(yang_models_path, R_OK | X_OK)) {
@@ -736,7 +881,7 @@ struct ly_ctx *yang_ctx_new_setup(bool embedded_modules, bool explicit_compile)
 				     YANG_MODELS_PATH);
 	}
 
-	uint options = LY_CTX_NO_YANGLIBRARY | LY_CTX_DISABLE_SEARCHDIR_CWD;
+	options = LY_CTX_NO_YANGLIBRARY | LY_CTX_DISABLE_SEARCHDIR_CWD;
 	if (explicit_compile)
 		options |= LY_CTX_EXPLICIT_COMPILE;
 	err = ly_ctx_new(yang_models_path, options, &ctx);
@@ -927,3 +1072,274 @@ uint32_t yang_get_list_elements_count(const struct lyd_node *node)
 	} while (node);
 	return count;
 }
+
+int yang_get_key_preds(char *s, const struct lysc_node *snode,
+		       struct yang_list_keys *keys, ssize_t space)
+{
+	const struct lysc_node_leaf *skey;
+	ssize_t len2, len = 0;
+	ssize_t i = 0;
+
+	LY_FOR_KEYS (snode, skey) {
+		assert(i < keys->num);
+		len2 = snprintf(s + len, space - len, "[%s='%s']", skey->name,
+				keys->key[i]);
+		if (len2 > space - len)
+			len = space;
+		else
+			len += len2;
+		i++;
+	}
+
+	assert(i == keys->num);
+	return i;
+}
+
+int yang_get_node_keys(struct lyd_node *node, struct yang_list_keys *keys)
+{
+	struct lyd_node *child = lyd_child(node);
+
+	keys->num = 0;
+	for (; child && lysc_is_key(child->schema); child = child->next) {
+		const char *value = lyd_get_value(child);
+
+		if (!value)
+			return NB_ERR;
+		strlcpy(keys->key[keys->num], value,
+			sizeof(keys->key[keys->num]));
+		keys->num++;
+	}
+	return NB_OK;
+}
+
+/*
+ * ------------------------
+ * Libyang Future Functions
+ * ------------------------
+ *
+ * All these functions are implemented in libyang versions (perhaps unreleased)
+ * beyond what we require currently so we must supply the functionality.
+ */
+
+/*
+ * Safe to remove after libyang v2.1.xxx is required (.144 has a bug so
+ * something > .144) https://github.com/CESNET/libyang/issues/2149
+ */
+LY_ERR yang_lyd_new_list(struct lyd_node_inner *parent,
+			 const struct lysc_node *snode,
+			 const struct yang_list_keys *list_keys,
+			 struct lyd_node **node)
+{
+#if defined(HAVE_LYD_NEW_LIST3) && 0
+	LY_ERR err;
+	const char *keys[LIST_MAXKEYS];
+
+	assert(list_keys->num <= LIST_MAXKEYS);
+	for (int i = 0; i < list_keys->num; i++)
+		keys[i] = list_keys->key[i];
+
+	err = lyd_new_list3(&parent->node, snode->module, snode->name, keys,
+			    NULL, 0, node);
+	return err;
+#else
+	struct lyd_node *pnode = &parent->node;
+	const char(*keys)[LIST_MAXKEYLEN] = list_keys->key;
+
+	assert(list_keys->num <= 8);
+	switch (list_keys->num) {
+	case 0:
+		return lyd_new_list(pnode, snode->module, snode->name, false,
+				    node);
+	case 1:
+		return lyd_new_list(pnode, snode->module, snode->name, false,
+				    node, keys[0]);
+	case 2:
+		return lyd_new_list(pnode, snode->module, snode->name, false,
+				    node, keys[0], keys[1]);
+	case 3:
+		return lyd_new_list(pnode, snode->module, snode->name, false,
+				    node, keys[0], keys[1], keys[2]);
+	case 4:
+		return lyd_new_list(pnode, snode->module, snode->name, false,
+				    node, keys[0], keys[1], keys[2], keys[3]);
+	case 5:
+		return lyd_new_list(pnode, snode->module, snode->name, false,
+				    node, keys[0], keys[1], keys[2], keys[3],
+				    keys[4]);
+	case 6:
+		return lyd_new_list(pnode, snode->module, snode->name, false,
+				    node, keys[0], keys[1], keys[2], keys[3],
+				    keys[4], keys[5]);
+	case 7:
+		return lyd_new_list(pnode, snode->module, snode->name, false,
+				    node, keys[0], keys[1], keys[2], keys[3],
+				    keys[4], keys[5], keys[6]);
+	case 8:
+		return lyd_new_list(pnode, snode->module, snode->name, false,
+				    node, keys[0], keys[1], keys[2], keys[3],
+				    keys[4], keys[5], keys[6], keys[7]);
+	}
+	_Static_assert(LIST_MAXKEYS == 8, "max key mismatch in switch unroll");
+	/*NOTREACHED*/
+	return LY_EINVAL;
+#endif
+}
+
+
+/*
+ * Safe to remove after libyang v2.1.144 is required
+ */
+LY_ERR yang_lyd_trim_xpath(struct lyd_node **root, const char *xpath)
+{
+	LY_ERR err;
+#ifdef HAVE_LYD_TRIM_XPATH
+	err = lyd_trim_xpath(root, xpath, NULL);
+	if (err) {
+		flog_err_sys(EC_LIB_LIBYANG,
+			     "cannot obtain specific result for xpath \"%s\": %s",
+			     xpath, yang_ly_strerrcode(err));
+		return err;
+	}
+	return LY_SUCCESS;
+#else
+	struct lyd_node *node, *sib;
+	struct lyd_node **remove = NULL;
+	struct ly_set *set = NULL;
+	uint32_t i;
+
+	*root = lyd_first_sibling(*root);
+
+	err = lyd_find_xpath3(NULL, *root, xpath, NULL, &set);
+	if (err) {
+		flog_err_sys(EC_LIB_LIBYANG,
+			     "cannot obtain specific result for xpath \"%s\": %s",
+			     xpath, yang_ly_strerrcode(err));
+		return err;
+	}
+	/*
+	 * Mark keepers and sweep deleting non-keepers.
+	 *
+	 * NOTE: We assume the data-nodes have NULL priv pointers and use that
+	 * for our mark.
+	 */
+
+	/* Mark */
+	for (i = 0; i < set->count; i++) {
+		for (node = set->dnodes[i]; node; node = &node->parent->node) {
+			if (node->priv)
+				break;
+			if (node == set->dnodes[i])
+				node->priv = (void *)2;
+			else
+				node->priv = (void *)1;
+		}
+	}
+
+	darr_ensure_cap(remove, 128);
+	LY_LIST_FOR(*root, sib) {
+		LYD_TREE_DFS_BEGIN (sib, node) {
+			/*
+			 * If this is a direct matching node then include its
+			 * subtree which won't be marked and would otherwise
+			 * be removed.
+			 */
+			if (node->priv == (void *)2)
+				LYD_TREE_DFS_continue = 1;
+			else if (!node->priv) {
+				*darr_append(remove) = node;
+				LYD_TREE_DFS_continue = 1;
+			}
+			LYD_TREE_DFS_END(sib, node);
+		}
+	}
+	darr_foreach_i (remove, i) {
+		if (remove[i] == *root)
+			*root = (*root)->next;
+		lyd_free_tree(remove[i]);
+	}
+	darr_free(remove);
+
+	ly_set_free(set, NULL);
+
+	return LY_SUCCESS;
+#endif
+}
+
+/*
+ * Safe to remove after libyang v2.1.128 is required
+ */
+const char *yang_ly_strerrcode(LY_ERR err)
+{
+#ifdef HAVE_LY_STRERRCODE
+	return ly_strerrcode(err);
+#else
+	switch (err) {
+	case LY_SUCCESS:
+		return "ok";
+	case LY_EMEM:
+		return "out of memory";
+	case LY_ESYS:
+		return "system error";
+	case LY_EINVAL:
+		return "invalid value given";
+	case LY_EEXIST:
+		return "item exists";
+	case LY_ENOTFOUND:
+		return "item not found";
+	case LY_EINT:
+		return "operation interrupted";
+	case LY_EVALID:
+		return "validation failed";
+	case LY_EDENIED:
+		return "access denied";
+	case LY_EINCOMPLETE:
+		return "incomplete";
+	case LY_ERECOMPILE:
+		return "compile error";
+	case LY_ENOT:
+		return "not";
+	case LY_EPLUGIN:
+	case LY_EOTHER:
+		return "other";
+	default:
+		return "unknown";
+	}
+#endif
+}
+
+/*
+ * Safe to remove after libyang v2.1.128 is required
+ */
+const char *yang_ly_strvecode(LY_VECODE vecode)
+{
+#ifdef HAVE_LY_STRVECODE
+	return ly_strvecode(vecode);
+#else
+	switch (vecode) {
+	case LYVE_SUCCESS:
+		return "";
+	case LYVE_SYNTAX:
+		return "syntax";
+	case LYVE_SYNTAX_YANG:
+		return "yang-syntax";
+	case LYVE_SYNTAX_YIN:
+		return "yin-syntax";
+	case LYVE_REFERENCE:
+		return "reference";
+	case LYVE_XPATH:
+		return "xpath";
+	case LYVE_SEMANTICS:
+		return "semantics";
+	case LYVE_SYNTAX_XML:
+		return "xml-syntax";
+	case LYVE_SYNTAX_JSON:
+		return "json-syntax";
+	case LYVE_DATA:
+		return "data";
+	case LYVE_OTHER:
+		return "other";
+	default:
+		return "unknown";
+	}
+#endif
+}
diff --git a/lib/yang.h b/lib/yang.h
index 37369c0..65f6a73 100644
--- a/lib/yang.h
+++ b/lib/yang.h
@@ -112,10 +112,16 @@ extern struct yang_modules yang_modules;
  * module_name
  *    Name of the YANG module.
  *
+ * features
+ *    NULL-terminated array of feature names to enable.
+ *    If NULL, all features are disabled.
+ *    To enable all features, use ["*", NULL].
+ *
  * Returns:
  *    Pointer to newly created YANG module.
  */
-extern struct yang_module *yang_module_load(const char *module_name);
+extern struct yang_module *yang_module_load(const char *module_name,
+					    const char **features);
 
 /*
  * Load all FRR native YANG models.
@@ -317,30 +323,16 @@ extern unsigned int yang_snode_num_keys(const struct lysc_node *snode);
  *    libyang data node to be processed.
  *
  * xpath
- *    Pointer to previously allocated buffer.
+ *    Pointer to previously allocated buffer or NULL.
  *
  * xpath_len
- *    Size of the xpath buffer.
- */
-extern void yang_dnode_get_path(const struct lyd_node *dnode, char *xpath,
-				size_t xpath_len);
-
-/*
- * Return the schema name of the given libyang data node.
+ *    Size of the xpath buffer if xpath non-NULL.
  *
- * dnode
- *    libyang data node.
- *
- * xpath_fmt
- *    Optional XPath expression (absolute or relative) to specify a different
- *    data node to operate on in the same data tree.
- *
- * Returns:
- *    Schema name of the libyang data node.
+ * If xpath is NULL, the returned string (if non-NULL) needs to be free()d by
+ * the caller.
  */
-extern const char *yang_dnode_get_schema_name(const struct lyd_node *dnode,
-					      const char *xpath_fmt, ...)
-	PRINTFRR(2, 3);
+extern char *yang_dnode_get_path(const struct lyd_node *dnode, char *xpath,
+				size_t xpath_len);
 
 /*
  * Find a libyang data node by its YANG data path.
@@ -435,6 +427,21 @@ void yang_dnode_iterate(yang_dnode_iter_cb cb, void *arg,
 			...) PRINTFRR(4, 5);
 
 /*
+ * Count the number of data nodes that satisfy an XPath query.
+ *
+ * dnode
+ *    Base libyang data node to operate on.
+ *
+ * xpath_fmt
+ *    XPath expression (absolute or relative).
+ *
+ * ...
+ *    any parameters for xpath_fmt.
+ */
+uint32_t yang_dnode_count(const struct lyd_node *dnode, const char *xpath_fmt,
+			  ...) PRINTFRR(2, 3);
+
+/*
  * Check if the libyang data node contains a default value. Non-presence
  * containers are assumed to always contain a default value.
  *
@@ -601,6 +608,69 @@ extern struct ly_ctx *yang_ctx_new_setup(bool embedded_modules,
 extern void yang_debugging_set(bool enable);
 
 /*
+ * Parse a YANG notification.
+ *
+ * Args:
+ *	xpath: xpath of notification.
+ *	format: LYD_FORMAT of input data.
+ *	data: input data.
+ *	notif: pointer to the libyang data tree to store the parsed notification.
+ *	       If the notification is not on the top level of the yang model,
+ *	       the pointer to the notification node is still returned, but it's
+ *	       part of the full data tree with all its parents.
+ */
+extern LY_ERR yang_parse_notification(const char *xpath, LYD_FORMAT format,
+				      const char *data, struct lyd_node **notif);
+
+/*
+ * "Print" the yang tree in `root` into dynamic sized array.
+ *
+ * Args:
+ *	root: root of the subtree to "print" along with siblings.
+ *	format: LYD_FORMAT of output (see lyd_print_mem)
+ *	options: printing options (see lyd_print_mem)
+ *
+ * Return:
+ *	A darr dynamic array with the "printed" output or NULL on failure.
+ */
+extern uint8_t *yang_print_tree(const struct lyd_node *root, LYD_FORMAT format,
+				uint32_t options);
+
+
+/**
+ * yang_convert_lyd_format() - convert one libyang format to darr string.
+ * @data: data to convert.
+ * @data_len: length of the data.
+ * @in_format: format of the data.
+ * @out_format: format to return.
+ * @shrink: true to avoid pretty printing.
+ *
+ * Return:
+ *	A darr based string or NULL for error.
+ */
+extern char *yang_convert_lyd_format(const char *data, size_t msg_len,
+				     LYD_FORMAT in_format,
+				     LYD_FORMAT out_format, bool shrink);
+
+/*
+ * "Print" the yang tree in `root` into an existing dynamic sized array.
+ *
+ * This function does not initialize or free the dynamic array, the array can
+ * already existing data, the tree will be appended to this data.
+ *
+ * Args:
+ *	darr: existing `uint8_t *`, dynamic array.
+ *	root: root of the subtree to "print" along with siblings.
+ *	format: LYD_FORMAT of output (see lyd_print_mem)
+ *	options: printing options (see lyd_print_mem)
+ *
+ * Return:
+ *	LY_ERR from underlying calls.
+ */
+extern LY_ERR yang_print_tree_append(uint8_t **darr, const struct lyd_node *root,
+				     LYD_FORMAT format, uint32_t options);
+
+/*
  * Print libyang error messages into the provided buffer.
  *
  * ly_ctx
@@ -693,6 +763,44 @@ bool yang_is_last_list_dnode(const struct lyd_node *dnode);
 /* API to check if the given node is last node in the data tree level */
 bool yang_is_last_level_dnode(const struct lyd_node *dnode);
 
+/* Create a YANG predicate string based on the keys */
+extern int yang_get_key_preds(char *s, const struct lysc_node *snode,
+			      struct yang_list_keys *keys, ssize_t space);
+
+/* Get YANG keys from an existing dnode */
+extern int yang_get_node_keys(struct lyd_node *node, struct yang_list_keys *keys);
+
+/**
+ * yang_resolve_snodes() - Resolve an XPath to matching schema nodes.
+ * @ly_ctx: libyang context to operate on.
+ * @xpath: the path or XPath to resolve.
+ * @snodes: [OUT] pointer for resulting dynamic array (darr) of schema node
+ *          pointers.
+ * @simple: [OUT] indicates if @xpath was resolvable simply or not. Non-simple
+ *          means that the @xpath is not a simple path and utilizes XPath 1.0
+ *          functionality beyond simple key predicates.
+ *
+ * This function can be used to find the schema node (or nodes) that correspond
+ * to a given @xpath. If the @xpath includes non-key predicates (e.g., using
+ * functions) then @simple will be set to false, and @snodes may contain more
+ * than a single schema node.
+ *
+ * Return: a libyang error or LY_SUCCESS.
+ */
+extern LY_ERR yang_resolve_snode_xpath(struct ly_ctx *ly_ctx, const char *xpath,
+				       struct lysc_node ***snodes, bool *simple);
+
+/*
+ * Libyang future functions
+ */
+extern const char *yang_ly_strerrcode(LY_ERR err);
+extern const char *yang_ly_strvecode(LY_VECODE vecode);
+extern LY_ERR yang_lyd_new_list(struct lyd_node_inner *parent,
+				const struct lysc_node *snode,
+				const struct yang_list_keys *keys,
+				struct lyd_node **nodes);
+extern LY_ERR yang_lyd_trim_xpath(struct lyd_node **rootp, const char *xpath);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/yang_translator.c b/lib/yang_translator.c
index eae7577..005f642 100644
--- a/lib/yang_translator.c
+++ b/lib/yang_translator.c
@@ -146,7 +146,7 @@ struct yang_translator *yang_translator_load(const char *path)
 	 */
 	assert(dnode);
 
-	family = yang_dnode_get_string(dnode, "./family");
+	family = yang_dnode_get_string(dnode, "family");
 	translator = yang_translator_find(family);
 	if (translator != NULL) {
 		flog_warn(EC_LIB_YANG_TRANSLATOR_LOAD,
@@ -182,7 +182,7 @@ struct yang_translator *yang_translator_load(const char *path)
 		tmodule =
 			XCALLOC(MTYPE_YANG_TRANSLATOR_MODULE, sizeof(*tmodule));
 
-		module_name = yang_dnode_get_string(set->dnodes[i], "./name");
+		module_name = yang_dnode_get_string(set->dnodes[i], "name");
 		tmodule->module = ly_ctx_load_module(translator->ly_ctx,
 						     module_name, NULL, NULL);
 		if (!tmodule->module) {
@@ -233,7 +233,7 @@ struct yang_translator *yang_translator_load(const char *path)
 		const struct lysc_node *snode_custom, *snode_native;
 
 		xpath_custom =
-			yang_dnode_get_string(set->dnodes[i], "./custom");
+			yang_dnode_get_string(set->dnodes[i], "custom");
 
 		snode_custom =
 			yang_find_snode(translator->ly_ctx, xpath_custom, 0);
@@ -246,7 +246,7 @@ struct yang_translator *yang_translator_load(const char *path)
 		}
 
 		xpath_native =
-			yang_dnode_get_string(set->dnodes[i], "./native");
+			yang_dnode_get_string(set->dnodes[i], "native");
 		snode_native = yang_find_snode(ly_native_ctx, xpath_native, 0);
 		if (!snode_native) {
 			flog_warn(EC_LIB_YANG_TRANSLATOR_LOAD,
diff --git a/lib/yang_wrappers.c b/lib/yang_wrappers.c
index dc049a3..a013395 100644
--- a/lib/yang_wrappers.c
+++ b/lib/yang_wrappers.c
@@ -168,10 +168,9 @@ struct yang_data *yang_data_new_dec64(const char *xpath, double value)
 double yang_dnode_get_dec64(const struct lyd_node *dnode, const char *xpath_fmt,
 			    ...)
 {
-	const double denom[19] = {1e0,   1e-1,  1e-2,  1e-3,  1e-4,
-				  1e-5,  1e-6,  1e-7,  1e-8,  1e-9,
-				  1e-10, 1e-11, 1e-12, 1e-13, 1e-14,
-				  1e-15, 1e-16, 1e-17, 1e-18};
+	const double denom[19] = { 1e0,	 1e1,  1e2,  1e3,  1e4,	 1e5,  1e6,
+				   1e7,	 1e8,  1e9,  1e10, 1e11, 1e12, 1e13,
+				   1e14, 1e15, 1e16, 1e17, 1e18 };
 	const struct lysc_type_dec *dectype;
 	const struct lyd_value *dvalue;
 
@@ -179,7 +178,7 @@ double yang_dnode_get_dec64(const struct lyd_node *dnode, const char *xpath_fmt,
 	dectype = (const struct lysc_type_dec *)dvalue->realtype;
 	assert(dectype->basetype == LY_TYPE_DEC64);
 	assert(dectype->fraction_digits < sizeof(denom) / sizeof(*denom));
-	return (double)dvalue->dec64 * denom[dectype->fraction_digits];
+	return (double)dvalue->dec64 / denom[dectype->fraction_digits];
 }
 
 double yang_get_default_dec64(const char *xpath_fmt, ...)
@@ -1020,6 +1019,13 @@ void yang_str2mac(const char *value, struct ethaddr *mac)
 	(void)prefix_str2mac(value, mac);
 }
 
+void yang_dnode_get_mac(struct ethaddr *mac, const struct lyd_node *dnode,
+			const char *xpath_fmt, ...)
+{
+	const char *canon = YANG_DNODE_XPATH_GET_CANON(dnode, xpath_fmt);
+	(void)prefix_str2mac(canon, mac);
+}
+
 struct yang_data *yang_data_new_date_and_time(const char *xpath, time_t time)
 {
 	struct tm tm;
@@ -1046,6 +1052,17 @@ struct yang_data *yang_data_new_date_and_time(const char *xpath, time_t time)
 	return yang_data_new(xpath, timebuf);
 }
 
+float yang_dnode_get_bandwidth_ieee_float32(const struct lyd_node *dnode,
+					    const char *xpath_fmt, ...)
+{
+	const char *canon = YANG_DNODE_XPATH_GET_CANON(dnode, xpath_fmt);
+	float value;
+
+	assert(sscanf(canon, "%a", &value) == 1);
+
+	return value;
+}
+
 const char *yang_nexthop_type2str(uint32_t ntype)
 {
 	switch (ntype) {
diff --git a/lib/yang_wrappers.h b/lib/yang_wrappers.h
index 06e0587..59b5b13 100644
--- a/lib/yang_wrappers.h
+++ b/lib/yang_wrappers.h
@@ -195,11 +195,18 @@ extern void yang_get_default_ip(struct ipaddr *var, const char *xpath_fmt, ...)
 extern struct yang_data *yang_data_new_mac(const char *xpath,
 					   const struct ethaddr *mac);
 extern void yang_str2mac(const char *value, struct ethaddr *mac);
+extern void yang_dnode_get_mac(struct ethaddr *mac, const struct lyd_node *dnode,
+			       const char *xpath_fmt, ...) PRINTFRR(3, 4);
 
 /*data-and-time */
 extern struct yang_data *yang_data_new_date_and_time(const char *xpath,
 						     time_t time);
 
+/* rt-types:bandwidth-ieee-float32 */
+extern float yang_dnode_get_bandwidth_ieee_float32(const struct lyd_node *dnode,
+						   const char *xpath_fmt, ...)
+	PRINTFRR(2, 3);
+
 /* nexthop enum2str */
 extern const char *yang_nexthop_type2str(uint32_t ntype);
 
diff --git a/lib/zclient.c b/lib/zclient.c
index f8f9cf7..51ebb56 100644
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -41,8 +41,20 @@ static void zclient_event(enum zclient_event, struct zclient *);
 static void zebra_interface_if_set_value(struct stream *s,
 					 struct interface *ifp);
 
-struct zclient_options zclient_options_default = {.receive_notify = false,
-						  .synchronous = false};
+const struct zclient_options zclient_options_default = {
+	.synchronous = false,
+	.auxiliary = false,
+};
+
+const struct zclient_options zclient_options_sync = {
+	.synchronous = true,
+	.auxiliary = true,
+};
+
+const struct zclient_options zclient_options_auxiliary = {
+	.synchronous = false,
+	.auxiliary = true,
+};
 
 struct sockaddr_storage zclient_addr;
 socklen_t zclient_addr_len;
@@ -52,7 +64,7 @@ static int zclient_debug;
 
 /* Allocate zclient structure. */
 struct zclient *zclient_new(struct event_loop *master,
-			    struct zclient_options *opt,
+			    const struct zclient_options *opt,
 			    zclient_handler *const *handlers, size_t n_handlers)
 {
 	struct zclient *zclient;
@@ -69,8 +81,8 @@ struct zclient *zclient_new(struct event_loop *master,
 	zclient->handlers = handlers;
 	zclient->n_handlers = n_handlers;
 
-	zclient->receive_notify = opt->receive_notify;
 	zclient->synchronous = opt->synchronous;
+	zclient->auxiliary = opt->auxiliary;
 
 	return zclient;
 }
@@ -392,10 +404,6 @@ enum zclient_send_status zclient_send_hello(struct zclient *zclient)
 		stream_putc(s, zclient->redist_default);
 		stream_putw(s, zclient->instance);
 		stream_putl(s, zclient->session_id);
-		if (zclient->receive_notify)
-			stream_putc(s, 1);
-		else
-			stream_putc(s, 0);
 		if (zclient->synchronous)
 			stream_putc(s, 1);
 		else
@@ -891,7 +899,7 @@ static int zapi_nexthop_cmp_no_labels(const struct zapi_nexthop *next1,
 					 &next2->gate);
 		if (ret != 0)
 			return ret;
-		/* Intentional Fall-Through */
+		fallthrough;
 	case NEXTHOP_TYPE_IFINDEX:
 		if (next1->ifindex < next2->ifindex)
 			return -1;
@@ -1851,7 +1859,7 @@ int zapi_pbr_rule_encode(struct stream *s, struct pbr_rule *r)
 	zapi_pbr_rule_filter_encode(s, &(r->filter));
 	zapi_pbr_rule_action_encode(s, &(r->action));
 
-	stream_put(s, r->ifname, INTERFACE_NAMSIZ);
+	stream_put(s, r->ifname, IFNAMSIZ);
 
 	/* Put length at the first point of the stream. */
 	stream_putw_at(s, 0, stream_get_endp(s));
@@ -1875,7 +1883,7 @@ bool zapi_pbr_rule_decode(struct stream *s, struct pbr_rule *r)
 	if (!zapi_pbr_rule_action_decode(s, &(r->action)))
 		goto stream_failure;
 
-	STREAM_GET(r->ifname, s, INTERFACE_NAMSIZ);
+	STREAM_GET(r->ifname, s, IFNAMSIZ);
 	return true;
 
 stream_failure:
@@ -2034,7 +2042,7 @@ bool zapi_rule_notify_decode(struct stream *s, uint32_t *seqno,
 	STREAM_GETL(s, seq);
 	STREAM_GETL(s, prio);
 	STREAM_GETL(s, uni);
-	STREAM_GET(ifname, s, INTERFACE_NAMSIZ);
+	STREAM_GET(ifname, s, IFNAMSIZ);
 
 	if (zclient_debug)
 		zlog_debug("%s: %u %u %u %s", __func__, seq, prio, uni, ifname);
@@ -2269,8 +2277,8 @@ const char *zapi_nexthop2str(const struct zapi_nexthop *znh, char *buf,
 /*
  * Decode the nexthop-tracking update message
  */
-bool zapi_nexthop_update_decode(struct stream *s, struct prefix *match,
-				struct zapi_route *nhr)
+static bool zapi_nexthop_update_decode(struct stream *s, struct prefix *match,
+				       struct zapi_route *nhr)
 {
 	uint32_t i;
 
@@ -2526,12 +2534,12 @@ static int zclient_vrf_delete(ZAPI_CALLBACK_ARGS)
 static int zclient_interface_add(ZAPI_CALLBACK_ARGS)
 {
 	struct interface *ifp;
-	char ifname_tmp[INTERFACE_NAMSIZ + 1] = {};
+	char ifname_tmp[IFNAMSIZ + 1] = {};
 	struct stream *s = zclient->ibuf;
 	struct vrf *vrf;
 
 	/* Read interface name. */
-	STREAM_GET(ifname_tmp, s, INTERFACE_NAMSIZ);
+	STREAM_GET(ifname_tmp, s, IFNAMSIZ);
 
 	/* Lookup/create interface by name. */
 	vrf = vrf_lookup_by_id(vrf_id);
@@ -2562,10 +2570,10 @@ stream_failure:
 struct interface *zebra_interface_state_read(struct stream *s, vrf_id_t vrf_id)
 {
 	struct interface *ifp;
-	char ifname_tmp[INTERFACE_NAMSIZ + 1] = {};
+	char ifname_tmp[IFNAMSIZ + 1] = {};
 
 	/* Read interface name. */
-	STREAM_GET(ifname_tmp, s, INTERFACE_NAMSIZ);
+	STREAM_GET(ifname_tmp, s, IFNAMSIZ);
 
 	/* Lookup this by interface index. */
 	ifp = if_lookup_by_name(ifname_tmp, vrf_id);
@@ -3051,36 +3059,6 @@ stream_failure:
 	return NULL;
 }
 
-struct interface *zebra_interface_vrf_update_read(struct stream *s,
-						  vrf_id_t vrf_id,
-						  vrf_id_t *new_vrf_id)
-{
-	char ifname[INTERFACE_NAMSIZ + 1] = {};
-	struct interface *ifp;
-	vrf_id_t new_id;
-
-	/* Read interface name. */
-	STREAM_GET(ifname, s, INTERFACE_NAMSIZ);
-
-	/* Lookup interface. */
-	ifp = if_lookup_by_name(ifname, vrf_id);
-	if (ifp == NULL) {
-		flog_err(EC_LIB_ZAPI_ENCODE,
-			 "INTERFACE_VRF_UPDATE: Cannot find IF %s in VRF %d",
-			 ifname, vrf_id);
-		return NULL;
-	}
-
-	/* Fetch new VRF Id. */
-	STREAM_GETL(s, new_id);
-
-	*new_vrf_id = new_id;
-	return ifp;
-
-stream_failure:
-	return NULL;
-}
-
 /* filter unwanted messages until the expected one arrives */
 static int zclient_read_sync_response(struct zclient *zclient,
 				      uint16_t expected_cmd)
@@ -3946,7 +3924,7 @@ enum zclient_send_status zebra_send_pw(struct zclient *zclient, int command,
 	stream_reset(s);
 
 	zclient_create_header(s, command, VRF_DEFAULT);
-	stream_write(s, pw->ifname, INTERFACE_NAMSIZ);
+	stream_write(s, pw->ifname, IFNAMSIZ);
 	stream_putl(s, pw->ifindex);
 
 	/* Put type */
@@ -3993,7 +3971,7 @@ int zebra_read_pw_status_update(ZAPI_CALLBACK_ARGS, struct zapi_pw_status *pw)
 	s = zclient->ibuf;
 
 	/* Get data. */
-	stream_get(pw->ifname, s, INTERFACE_NAMSIZ);
+	stream_get(pw->ifname, s, IFNAMSIZ);
 	STREAM_GETL(s, pw->ifindex);
 	STREAM_GETL(s, pw->status);
 
@@ -4298,6 +4276,28 @@ stream_failure:
 	return -1;
 }
 
+static int zclient_nexthop_update(ZAPI_CALLBACK_ARGS)
+{
+	struct vrf *vrf = vrf_lookup_by_id(vrf_id);
+	struct prefix match;
+	struct zapi_route route;
+
+	if (!vrf) {
+		zlog_warn("nexthop update for unknown VRF ID %u", vrf_id);
+		return 0;
+	}
+
+	if (!zapi_nexthop_update_decode(zclient->ibuf, &match, &route)) {
+		zlog_err("failed to decode nexthop update");
+		return -1;
+	}
+
+	if (zclient->nexthop_update)
+		zclient->nexthop_update(vrf, &match, &route);
+
+	return 0;
+}
+
 static zclient_handler *const lib_handlers[] = {
 	/* fundamentals */
 	[ZEBRA_CAPABILITIES] = zclient_capability_decode,
@@ -4311,6 +4311,9 @@ static zclient_handler *const lib_handlers[] = {
 	[ZEBRA_INTERFACE_UP] = zclient_interface_up,
 	[ZEBRA_INTERFACE_DOWN] = zclient_interface_down,
 
+	/* NHT pre-decode */
+	[ZEBRA_NEXTHOP_UPDATE] = zclient_nexthop_update,
+
 	/* BFD */
 	[ZEBRA_BFD_DEST_REPLAY] = zclient_bfd_session_replay,
 	[ZEBRA_INTERFACE_BFD_DEST_UPDATE] = zclient_bfd_session_update,
@@ -4419,7 +4422,8 @@ static void zclient_read(struct event *thread)
 		zlog_debug("zclient %p command %s VRF %u", zclient,
 			   zserv_command_string(command), vrf_id);
 
-	if (command < array_size(lib_handlers) && lib_handlers[command])
+	if (!zclient->auxiliary && command < array_size(lib_handlers) &&
+	    lib_handlers[command])
 		lib_handlers[command](command, zclient, length, vrf_id);
 	if (command < zclient->n_handlers && zclient->handlers[command])
 		zclient->handlers[command](command, zclient, length, vrf_id);
@@ -4516,6 +4520,24 @@ static void zclient_event(enum zclient_event event, struct zclient *zclient)
 	}
 }
 
+enum zclient_send_status zclient_interface_set_arp(struct zclient *client,
+						   struct interface *ifp,
+						   bool arp_enable)
+{
+	struct stream *s;
+
+	s = client->obuf;
+	stream_reset(s);
+
+	zclient_create_header(s, ZEBRA_INTERFACE_SET_ARP, ifp->vrf->vrf_id);
+
+	stream_putl(s, ifp->ifindex);
+	stream_putc(s, arp_enable);
+
+	stream_putw_at(s, 0, stream_get_endp(s));
+	return zclient_send_message(client);
+}
+
 enum zclient_send_status zclient_interface_set_master(struct zclient *client,
 						      struct interface *master,
 						      struct interface *slave)
@@ -4705,7 +4727,7 @@ static int zclient_neigh_ip_read_entry(struct stream *s, struct ipaddr *add)
 
 int zclient_neigh_ip_encode(struct stream *s, uint16_t cmd, union sockunion *in,
 			    union sockunion *out, struct interface *ifp,
-			    int ndm_state)
+			    int ndm_state, int ip_len)
 {
 	int ret = 0;
 
@@ -4718,6 +4740,7 @@ int zclient_neigh_ip_encode(struct stream *s, uint16_t cmd, union sockunion *in,
 			     sockunion_get_addrlen(out));
 	} else
 		stream_putc(s, AF_UNSPEC);
+	stream_putl(s, ip_len);
 	stream_putl(s, ifp->ifindex);
 	if (out)
 		stream_putl(s, ndm_state);
@@ -4735,6 +4758,7 @@ int zclient_neigh_ip_decode(struct stream *s, struct zapi_neigh_ip *api)
 		return -1;
 	zclient_neigh_ip_read_entry(s, &api->ip_out);
 
+	STREAM_GETL(s, api->ip_len);
 	STREAM_GETL(s, api->index);
 	STREAM_GETL(s, api->ndm_state);
 	return 0;
@@ -4881,3 +4905,23 @@ enum zclient_send_status zclient_opaque_drop_notify(struct zclient *zclient,
 
 	return zclient_send_message(zclient);
 }
+
+void zclient_register_neigh(struct zclient *zclient, vrf_id_t vrf_id, afi_t afi,
+			    bool reg)
+{
+	struct stream *s;
+
+	if (!zclient || zclient->sock < 0)
+		return;
+
+	s = zclient->obuf;
+	stream_reset(s);
+
+	zclient_create_header(s,
+			      reg ? ZEBRA_NEIGH_REGISTER
+				  : ZEBRA_NEIGH_UNREGISTER,
+			      vrf_id);
+	stream_putw(s, afi);
+	stream_putw_at(s, 0, stream_get_endp(s));
+	zclient_send_message(zclient);
+}
diff --git a/lib/zclient.h b/lib/zclient.h
index f18fc05..1bf9106 100644
--- a/lib/zclient.h
+++ b/lib/zclient.h
@@ -98,6 +98,7 @@ typedef enum {
 	ZEBRA_INTERFACE_UP,
 	ZEBRA_INTERFACE_DOWN,
 	ZEBRA_INTERFACE_SET_MASTER,
+	ZEBRA_INTERFACE_SET_ARP,
 	ZEBRA_INTERFACE_SET_PROTODOWN,
 	ZEBRA_ROUTE_ADD,
 	ZEBRA_ROUTE_DELETE,
@@ -216,11 +217,11 @@ typedef enum {
 	ZEBRA_NEIGH_DISCOVER,
 	ZEBRA_ROUTE_NOTIFY_REQUEST,
 	ZEBRA_CLIENT_CLOSE_NOTIFY,
-	ZEBRA_NHRP_NEIGH_ADDED,
-	ZEBRA_NHRP_NEIGH_REMOVED,
-	ZEBRA_NHRP_NEIGH_GET,
-	ZEBRA_NHRP_NEIGH_REGISTER,
-	ZEBRA_NHRP_NEIGH_UNREGISTER,
+	ZEBRA_NEIGH_ADDED,
+	ZEBRA_NEIGH_REMOVED,
+	ZEBRA_NEIGH_GET,
+	ZEBRA_NEIGH_REGISTER,
+	ZEBRA_NEIGH_UNREGISTER,
 	ZEBRA_NEIGH_IP_ADD,
 	ZEBRA_NEIGH_IP_DEL,
 	ZEBRA_CONFIGURE_ARP,
@@ -293,6 +294,8 @@ struct zapi_cap {
 typedef int (zclient_handler)(ZAPI_CALLBACK_ARGS);
 /* clang-format on */
 
+struct zapi_route;
+
 /* Structure for the zebra client. */
 struct zclient {
 	/* The thread master we schedule ourselves on */
@@ -301,12 +304,14 @@ struct zclient {
 	/* Privileges to change socket values */
 	struct zebra_privs_t *privs;
 
-	/* Do we care about failure events for route install? */
-	bool receive_notify;
-
 	/* Is this a synchronous client? */
 	bool synchronous;
 
+	/* Auxiliary clients don't execute standard library handlers
+	 * (which otherwise would duplicate VRF/interface add/delete/etc.
+	 */
+	bool auxiliary;
+
 	/* BFD enabled with bfd_protocol_integration_init() */
 	bool bfd_integration;
 
@@ -348,6 +353,19 @@ struct zclient {
 	void (*zebra_connected)(struct zclient *);
 	void (*zebra_capabilities)(struct zclient_capabilities *cap);
 
+	/*
+	 * match -> is the prefix that the calling daemon asked to be matched
+	 * against.
+	 * nhr->prefix -> is the actual prefix that was matched against in the
+	 * rib itself.
+	 *
+	 * This distinction is made because a LPM can be made if there is a
+	 * covering route.  This way the upper level protocol can make a
+	 * decision point about whether or not it wants to use the match or not.
+	 */
+	void (*nexthop_update)(struct vrf *vrf, struct prefix *match,
+			       struct zapi_route *nhr);
+
 	int (*handle_error)(enum zebra_error_types error);
 
 	/*
@@ -629,7 +647,7 @@ struct zapi_sr_policy {
 };
 
 struct zapi_pw {
-	char ifname[INTERFACE_NAMSIZ];
+	char ifname[IFNAMSIZ];
 	ifindex_t ifindex;
 	int type;
 	int af;
@@ -642,7 +660,7 @@ struct zapi_pw {
 };
 
 struct zapi_pw_status {
-	char ifname[INTERFACE_NAMSIZ];
+	char ifname[IFNAMSIZ];
 	ifindex_t ifindex;
 	uint32_t status;
 };
@@ -819,11 +837,18 @@ extern char *zclient_evpn_dump_macip_flags(uint8_t flags, char *buf,
 enum zebra_neigh_state { ZEBRA_NEIGH_INACTIVE = 0, ZEBRA_NEIGH_ACTIVE = 1 };
 
 struct zclient_options {
-	bool receive_notify;
 	bool synchronous;
+
+	/* auxiliary = don't call common lib/ handlers that manage bits.
+	 * Those should only run once, on the "main" zclient, which this is
+	 * not.  (This is also set for synchronous clients.)
+	 */
+	bool auxiliary;
 };
 
-extern struct zclient_options zclient_options_default;
+extern const struct zclient_options zclient_options_default;
+extern const struct zclient_options zclient_options_sync;
+extern const struct zclient_options zclient_options_auxiliary;
 
 /* link layer representation for GRE like interfaces
  * ip_in is the underlay IP, ip_out is the tunnel dest
@@ -843,6 +868,7 @@ extern struct zclient_options zclient_options_default;
 
 struct zapi_neigh_ip {
 	int cmd;
+	int ip_len;
 	struct ipaddr ip_in;
 	struct ipaddr ip_out;
 	ifindex_t index;
@@ -851,7 +877,7 @@ struct zapi_neigh_ip {
 int zclient_neigh_ip_decode(struct stream *s, struct zapi_neigh_ip *api);
 int zclient_neigh_ip_encode(struct stream *s, uint16_t cmd, union sockunion *in,
 			    union sockunion *out, struct interface *ifp,
-			    int ndm_state);
+			    int ndm_state, int ip_len);
 
 /*
  * We reserve the top 4 bits for l2-NHG, everything else
@@ -865,12 +891,12 @@ int zclient_neigh_ip_encode(struct stream *s, uint16_t cmd, union sockunion *in,
 	((uint32_t)250000000) /* Bottom 28 bits then rounded down */
 #define ZEBRA_NHG_PROTO_SPACING (ZEBRA_NHG_PROTO_UPPER / ZEBRA_ROUTE_MAX)
 #define ZEBRA_NHG_PROTO_LOWER                                                  \
-	(ZEBRA_NHG_PROTO_SPACING * (ZEBRA_ROUTE_CONNECT + 1))
+	(ZEBRA_NHG_PROTO_SPACING * (ZEBRA_ROUTE_LOCAL + 1))
 
 extern uint32_t zclient_get_nhg_start(uint32_t proto);
 
 extern struct zclient *zclient_new(struct event_loop *m,
-				   struct zclient_options *opt,
+				   const struct zclient_options *opt,
 				   zclient_handler *const *handlers,
 				   size_t n_handlers);
 
@@ -1011,6 +1037,9 @@ extern int zclient_read_header(struct stream *s, int sock, uint16_t *size,
  */
 extern bool zapi_parse_header(struct stream *zmsg, struct zmsghdr *hdr);
 
+extern enum zclient_send_status zclient_interface_set_arp(struct zclient *client,
+							  struct interface *ifp,
+							  bool arp_enable);
 extern enum zclient_send_status
 zclient_interface_set_master(struct zclient *client, struct interface *master,
 			     struct interface *slave);
@@ -1019,9 +1048,6 @@ extern struct connected *zebra_interface_address_read(int, struct stream *,
 						      vrf_id_t);
 extern struct nbr_connected *
 zebra_interface_nbr_address_read(int, struct stream *, vrf_id_t);
-extern struct interface *zebra_interface_vrf_update_read(struct stream *s,
-							 vrf_id_t vrf_id,
-							 vrf_id_t *new_vrf_id);
 extern int zebra_router_id_update_read(struct stream *s, struct prefix *rid);
 
 extern struct interface *zebra_interface_link_params_read(struct stream *s,
@@ -1123,18 +1149,6 @@ int zapi_nexthop_from_nexthop(struct zapi_nexthop *znh,
 			      const struct nexthop *nh);
 int zapi_backup_nexthop_from_nexthop(struct zapi_nexthop *znh,
 				     const struct nexthop *nh);
-/*
- * match -> is the prefix that the calling daemon asked to be matched
- * against.
- * nhr->prefix -> is the actual prefix that was matched against in the
- * rib itself.
- *
- * This distinction is made because a LPM can be made if there is a
- * covering route.  This way the upper level protocol can make a decision
- * point about whether or not it wants to use the match or not.
- */
-extern bool zapi_nexthop_update_decode(struct stream *s, struct prefix *match,
-				       struct zapi_route *nhr);
 const char *zapi_nexthop2str(const struct zapi_nexthop *znh, char *buf,
 			     int bufsize);
 
@@ -1157,6 +1171,15 @@ static inline void zapi_route_set_blackhole(struct zapi_route *api,
 	SET_FLAG(api->message, ZAPI_MESSAGE_NEXTHOP);
 };
 
+static inline void zapi_route_set_nhg_id(struct zapi_route *api,
+					 uint32_t *nhg_id)
+{
+	api->nexthop_num = 0;
+	api->nhgid = *nhg_id;
+	if (api->nhgid)
+		SET_FLAG(api->message, ZAPI_MESSAGE_NHG);
+};
+
 extern enum zclient_send_status
 zclient_send_mlag_register(struct zclient *client, uint32_t bit_map);
 extern enum zclient_send_status
@@ -1304,6 +1327,9 @@ enum zapi_opaque_registry {
  */
 extern enum zclient_send_status zclient_send_hello(struct zclient *client);
 
+extern void zclient_register_neigh(struct zclient *zclient, vrf_id_t vrf_id,
+				   afi_t afi, bool reg);
+
 extern enum zclient_send_status
 zclient_send_neigh_discovery_req(struct zclient *zclient,
 				 const struct interface *ifp,
diff --git a/lib/zebra.h b/lib/zebra.h
index ecc87f5..15a54f6 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -17,17 +17,9 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <string.h>
-#include <pwd.h>
-#include <grp.h>
 #ifdef HAVE_STROPTS_H
 #include <stropts.h>
 #endif /* HAVE_STROPTS_H */
-#include <sys/select.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #ifdef HAVE_SYS_SYSCTL_H
@@ -37,22 +29,15 @@
 #include <sys/sysctl.h>
 #endif
 #endif /* HAVE_SYS_SYSCTL_H */
-#include <sys/ioctl.h>
 #ifdef HAVE_SYS_CONF_H
 #include <sys/conf.h>
 #endif /* HAVE_SYS_CONF_H */
 #ifdef HAVE_SYS_KSYM_H
 #include <sys/ksym.h>
 #endif /* HAVE_SYS_KSYM_H */
-#include <syslog.h>
 #include <sys/time.h>
 #include <time.h>
-#include <sys/uio.h>
-#include <sys/utsname.h>
-#include <sys/resource.h>
-#include <limits.h>
 #include <inttypes.h>
-#include <stdbool.h>
 #ifdef HAVE_SYS_ENDIAN_H
 #include <sys/endian.h>
 #endif
@@ -63,11 +48,6 @@
 /* misc include group */
 #include <stdarg.h>
 
-#ifdef HAVE_LCAPS
-#include <sys/capability.h>
-#include <sys/prctl.h>
-#endif /* HAVE_LCAPS */
-
 /* network include group */
 
 #include <sys/socket.h>
@@ -76,10 +56,6 @@
 #include <sys/sockio.h>
 #endif /* HAVE_SYS_SOCKIO_H */
 
-#ifdef __APPLE__
-#define __APPLE_USE_RFC_3542
-#endif
-
 #ifndef HAVE_LIBCRYPT
 #ifdef HAVE_LIBCRYPTO
 #include <openssl/des.h>
@@ -87,15 +63,9 @@
 #endif
 #endif
 
-#ifdef CRYPTO_OPENSSL
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#endif
-
 #include "openbsd-tree.h"
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 
@@ -113,14 +83,9 @@
 #include <net/if_var.h>
 #endif /* HAVE_NET_IF_VAR_H */
 
-#include <net/route.h>
-
-#ifdef HAVE_NETLINK
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
-#include <linux/filter.h>
-#else
+#ifndef HAVE_NETLINK
 #define RT_TABLE_MAIN		0
+#define RT_TABLE_LOCAL		RT_TABLE_MAIN
 #endif /* HAVE_NETLINK */
 
 #include <netdb.h>
@@ -146,37 +111,14 @@
 #include <netinet6/in.h>
 #endif /* HAVE_NETINET6_IN_H */
 
-
 #ifdef HAVE_NETINET6_IP6_H
 #include <netinet6/ip6.h>
 #endif /* HAVE_NETINET6_IP6_H */
 
-#include <netinet/icmp6.h>
-
 #ifdef HAVE_NETINET6_ND6_H
 #include <netinet6/nd6.h>
 #endif /* HAVE_NETINET6_ND6_H */
 
-/* Some systems do not define UINT32_MAX, etc.. from inttypes.h
- * e.g. this makes life easier for FBSD 4.11 users.
- */
-#ifndef INT16_MAX
-#define INT16_MAX	(32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX	(2147483647)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX	(65535U)
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX	(4294967295U)
-#endif
-
-#ifdef HAVE_GLIBC_BACKTRACE
-#include <execinfo.h>
-#endif /* HAVE_GLIBC_BACKTRACE */
-
 /* Local includes: */
 #if !defined(__GNUC__)
 #define __attribute__(x)
@@ -210,26 +152,6 @@ size_t strlcpy(char *__restrict dest,
 void explicit_bzero(void *buf, size_t len);
 #endif
 
-#if !defined(HAVE_STRUCT_MMSGHDR_MSG_HDR) || !defined(HAVE_SENDMMSG)
-/* avoid conflicts in case we have partial support */
-#define mmsghdr frr_mmsghdr
-#define sendmmsg frr_sendmmsg
-
-struct mmsghdr {
-	struct msghdr msg_hdr;
-	unsigned int msg_len;
-};
-
-/* just go 1 at a time here, the loop this is used in will handle the rest */
-static inline int sendmmsg(int fd, struct mmsghdr *mmh, unsigned int len,
-			   int flags)
-{
-	int rv = sendmsg(fd, &mmh->msg_hdr, 0);
-
-	return rv > 0 ? 1 : rv;
-}
-#endif
-
 /*
  * RFC 3542 defines several macros for using struct cmsghdr.
  * Here, we define those that are not present
@@ -283,10 +205,9 @@ struct in_pktinfo {
  * OpenBSD: network byte order, apart from older versions which are as per
  *          *BSD
  */
-#if defined(__NetBSD__)                                                        \
-	|| (defined(__FreeBSD__) && (__FreeBSD_version < 1100030))             \
-	|| (defined(__OpenBSD__) && (OpenBSD < 200311))                        \
-	|| (defined(__APPLE__))
+#if defined(__NetBSD__) ||                                                     \
+	(defined(__FreeBSD__) && (__FreeBSD_version < 1100030)) ||             \
+	(defined(__OpenBSD__) && (OpenBSD < 200311))
 #define HAVE_IP_HDRINCL_BSD_ORDER
 #endif
 
@@ -300,15 +221,6 @@ struct in_pktinfo {
 #define IN6_ARE_ADDR_EQUAL IN6_IS_ADDR_EQUAL
 #endif /* IN6_ARE_ADDR_EQUAL */
 
-/* default zebra TCP port for zclient */
-#define ZEBRA_PORT			2600
-
-/*
- * The compiler.h header is used for anyone using the CPP_NOTICE
- * since this is universally needed, let's add it to zebra.h
- */
-#include "compiler.h"
-
 /* Zebra route's types are defined in route_types.h */
 #include "lib/route_types.h"
 
@@ -358,27 +270,6 @@ typedef enum {
 	for (afi = AFI_IP; afi < AFI_MAX; afi++)                               \
 		for (safi = SAFI_UNICAST; safi <= SAFI_MPLS_VPN; safi++)
 
-/* Default Administrative Distance of each protocol. */
-#define ZEBRA_KERNEL_DISTANCE_DEFAULT       0
-#define ZEBRA_CONNECT_DISTANCE_DEFAULT      0
-#define ZEBRA_STATIC_DISTANCE_DEFAULT       1
-#define ZEBRA_RIP_DISTANCE_DEFAULT        120
-#define ZEBRA_RIPNG_DISTANCE_DEFAULT      120
-#define ZEBRA_OSPF_DISTANCE_DEFAULT       110
-#define ZEBRA_OSPF6_DISTANCE_DEFAULT      110
-#define ZEBRA_ISIS_DISTANCE_DEFAULT       115
-#define ZEBRA_IBGP_DISTANCE_DEFAULT       200
-#define ZEBRA_EBGP_DISTANCE_DEFAULT        20
-#define ZEBRA_TABLE_DISTANCE_DEFAULT       15
-#define ZEBRA_EIGRP_DISTANCE_DEFAULT       90
-#define ZEBRA_NHRP_DISTANCE_DEFAULT        10
-#define ZEBRA_LDP_DISTANCE_DEFAULT        150
-#define ZEBRA_BABEL_DISTANCE_DEFAULT      100
-#define ZEBRA_SHARP_DISTANCE_DEFAULT      150
-#define ZEBRA_PBR_DISTANCE_DEFAULT        200
-#define ZEBRA_OPENFABRIC_DISTANCE_DEFAULT 115
-#define ZEBRA_MAX_DISTANCE_DEFAULT        255
-
 /* Flag manipulation macros. */
 #define CHECK_FLAG(V,F)      ((V) & (F))
 #define SET_FLAG(V,F)        (V) |= (F)
diff --git a/lib/zlog.c b/lib/zlog.c
index 309a955..8734fd5 100644
--- a/lib/zlog.c
+++ b/lib/zlog.c
@@ -4,6 +4,12 @@
  */
 
 #include "zebra.h"
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#ifdef HAVE_GLIBC_BACKTRACE
+#include <execinfo.h>
+#endif /* HAVE_GLIBC_BACKTRACE */
 
 #include <unistd.h>
 #include <sys/time.h>
@@ -32,9 +38,6 @@
 #ifdef __DragonFly__
 #include <sys/lwp.h>
 #endif
-#ifdef __APPLE__
-#include <mach/mach_traps.h>
-#endif
 
 #ifdef HAVE_LIBUNWIND
 #define UNW_LOCAL_ONLY
@@ -81,7 +84,7 @@ static struct zlog_targets_head zlog_targets;
 /* Global setting for buffered vs immediate output. The default is
  * per-pthread buffering.
  */
-static bool default_immediate;
+static bool zlog_default_immediate;
 
 /* cf. zlog.h for additional comments on this struct.
  *
@@ -442,7 +445,7 @@ static void vzlog_tls(struct zlog_tls *zlog_tls, const struct xref_logmsg *xref,
 	struct zlog_msg *msg;
 	char *buf;
 	bool ignoremsg = true;
-	bool immediate = default_immediate;
+	bool immediate = zlog_default_immediate;
 
 	/* avoid further processing cost if no target wants this message */
 	rcu_read_lock();
@@ -963,7 +966,12 @@ struct zlog_target *zlog_target_replace(struct zlog_target *oldzt,
  */
 void zlog_set_immediate(bool set_p)
 {
-	default_immediate = set_p;
+	zlog_default_immediate = set_p;
+}
+
+bool zlog_get_immediate_mode(void)
+{
+	return zlog_default_immediate;
 }
 
 /* common init */
diff --git a/lib/zlog.h b/lib/zlog.h
index a207b29..27401d5 100644
--- a/lib/zlog.h
+++ b/lib/zlog.h
@@ -276,6 +276,7 @@ extern void zlog_tls_buffer_fini(void);
 
 /* Enable or disable 'immediate' output - default is to buffer messages. */
 extern void zlog_set_immediate(bool set_p);
+bool zlog_get_immediate_mode(void);
 
 extern const char *zlog_priority_str(int priority);
 
diff --git a/lib/zlog_5424.c b/lib/zlog_5424.c
index 9bc1c81..4c60d4b 100644
--- a/lib/zlog_5424.c
+++ b/lib/zlog_5424.c
@@ -13,6 +13,9 @@
  */
 
 #include "zebra.h"
+#include <fcntl.h>
+
+#include "frrsendmmsg.h"
 
 #include "zlog_5424.h"
 
@@ -913,7 +916,7 @@ static int zlog_5424_open(struct zlog_cfg_5424 *zcf, int sock_type)
 		}
 
 		flags = O_NONBLOCK;
-		/* fallthru */
+		fallthrough;
 
 	case ZLOG_5424_DST_FILE:
 		if (!zcf->filename)
diff --git a/lib/zlog_live.c b/lib/zlog_live.c
index 4d3c350..1b7696c 100644
--- a/lib/zlog_live.c
+++ b/lib/zlog_live.c
@@ -5,6 +5,8 @@
 
 #include "zebra.h"
 
+#include "frrsendmmsg.h"
+
 #include "zlog_live.h"
 
 #include "memory.h"
diff --git a/lib/zlog_targets.c b/lib/zlog_targets.c
index b0f7571..bbd228f 100644
--- a/lib/zlog_targets.c
+++ b/lib/zlog_targets.c
@@ -5,6 +5,7 @@
 
 #include "zebra.h"
 
+#include <fcntl.h>
 #include <sys/un.h>
 #include <syslog.h>