diff --git a/debian/rules b/debian/rules
index c85a658726..f4540dacbe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ VYOS_MIBS_DIR := usr/share/snmp/mibs
 VYOS_LOCALUI_DIR := srv/localui
 
 VYCONF := usr/libexec/vyos/vyconf
+VYCONF_BIN := $(VYCONF)/bin
 VYCONF_CONF := $(VYCONF)/config
 VYCONF_SESSION := $(VYCONF)/session
 VYCONF_DATA := usr/share/vyos/vyconf
@@ -184,11 +185,13 @@ override_dh_auto_install:
 	mkdir -p $(DIR_LIBVYOSCONFIG)/$(VYCONF_SESSION)
 	mkdir -p $(DIR_LIBVYOSCONFIG)/$(VYCONF_DATA)
 	mkdir -p $(DIR_LIBVYOSCONFIG)/$(VYCONF_DEF)
+	mkdir -p $(DIR_LIBVYOSCONFIG)/$(VYCONF_BIN)
 
 	cp $(OCAML_DIR)/share/vyconf/vyconf.proto $(DIR_LIBVYOSCONFIG)/$(VYCONF_DATA)
 	cp $(OCAML_DIR)/share/vyconf/vyconfd.conf $(DIR_LIBVYOSCONFIG)/$(VYCONF_DEF)
 	cp $(OCAML_DIR)/bin/vyconfd $(DIR_LIBVYOSCONFIG)/$(VYCONF)
 	cp $(OCAML_DIR)/bin/vyconf_cli $(DIR_LIBVYOSCONFIG)/$(VYCONF)
+	cp $(OCAML_DIR)/bin/vyconf_cli_compat $(DIR_LIBVYOSCONFIG)/$(VYCONF_BIN)
 	cp libvyosconfig/_build/libvyosconfig.so $(DIR_LIBVYOSCONFIG)/$(VYOS_LIB_DIR)/libvyosconfig.so.0
 
 override_dh_installsystemd:
diff --git a/python/vyos/proto/vyconf_pb2.py b/python/vyos/proto/vyconf_pb2.py
index 61047a0684..d11be8eb3c 100644
--- a/python/vyos/proto/vyconf_pb2.py
+++ b/python/vyos/proto/vyconf_pb2.py
@@ -13,87 +13,97 @@
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cvyconf.proto\"\xb2\x18\n\x07Request\x12!\n\x06prompt\x18\x01 \x01(\x0b\x32\x0f.Request.PromptH\x00\x12.\n\rsetup_session\x18\x02 \x01(\x0b\x32\x15.Request.SetupSessionH\x00\x12\x1b\n\x03set\x18\x03 \x01(\x0b\x32\x0c.Request.SetH\x00\x12!\n\x06\x64\x65lete\x18\x04 \x01(\x0b\x32\x0f.Request.DeleteH\x00\x12!\n\x06rename\x18\x05 \x01(\x0b\x32\x0f.Request.RenameH\x00\x12\x1d\n\x04\x63opy\x18\x06 \x01(\x0b\x32\r.Request.CopyH\x00\x12#\n\x07\x63omment\x18\x07 \x01(\x0b\x32\x10.Request.CommentH\x00\x12!\n\x06\x63ommit\x18\x08 \x01(\x0b\x32\x0f.Request.CommitH\x00\x12%\n\x08rollback\x18\t \x01(\x0b\x32\x11.Request.RollbackH\x00\x12\x1f\n\x05merge\x18\n \x01(\x0b\x32\x0e.Request.MergeH\x00\x12\x1d\n\x04save\x18\x0b \x01(\x0b\x32\r.Request.SaveH\x00\x12*\n\x0bshow_config\x18\x0c \x01(\x0b\x32\x13.Request.ShowConfigH\x00\x12!\n\x06\x65xists\x18\r \x01(\x0b\x32\x0f.Request.ExistsH\x00\x12&\n\tget_value\x18\x0e \x01(\x0b\x32\x11.Request.GetValueH\x00\x12(\n\nget_values\x18\x0f \x01(\x0b\x32\x12.Request.GetValuesH\x00\x12.\n\rlist_children\x18\x10 \x01(\x0b\x32\x15.Request.ListChildrenH\x00\x12)\n\x0brun_op_mode\x18\x11 \x01(\x0b\x32\x12.Request.RunOpModeH\x00\x12#\n\x07\x63onfirm\x18\x12 \x01(\x0b\x32\x10.Request.ConfirmH\x00\x12\x43\n\x18\x65nter_configuration_mode\x18\x13 \x01(\x0b\x32\x1f.Request.EnterConfigurationModeH\x00\x12\x41\n\x17\x65xit_configuration_mode\x18\x14 \x01(\x0b\x32\x1e.Request.ExitConfigurationModeH\x00\x12%\n\x08validate\x18\x15 \x01(\x0b\x32\x11.Request.ValidateH\x00\x12%\n\x08teardown\x18\x16 \x01(\x0b\x32\x11.Request.TeardownH\x00\x12\x30\n\x0ereload_reftree\x18\x17 \x01(\x0b\x32\x16.Request.ReloadReftreeH\x00\x12\x1d\n\x04load\x18\x18 \x01(\x0b\x32\r.Request.LoadH\x00\x12#\n\x07\x64iscard\x18\x19 \x01(\x0b\x32\x10.Request.DiscardH\x00\x12\x32\n\x0fsession_changed\x18\x1a \x01(\x0b\x32\x17.Request.SessionChangedH\x00\x12/\n\x0esession_of_pid\x18\x1b \x01(\x0b\x32\x15.Request.SessionOfPidH\x00\x12\x30\n\x0esession_exists\x18\x1c \x01(\x0b\x32\x16.Request.SessionExistsH\x00\x12(\n\nget_config\x18\x1d \x01(\x0b\x32\x12.Request.GetConfigH\x00\x12\"\n\x07\x61ux_set\x18\x1e \x01(\x0b\x32\x0f.Request.AuxSetH\x00\x12(\n\naux_delete\x18\x1f \x01(\x0b\x32\x12.Request.AuxDeleteH\x00\x12.\n\rshow_sessions\x18  \x01(\x0b\x32\x15.Request.ShowSessionsH\x00\x1a\x08\n\x06Prompt\x1a\x83\x01\n\x0cSetupSession\x12\x12\n\nclient_pid\x18\x01 \x02(\x05\x12\x1a\n\x12\x63lient_application\x18\x02 \x01(\t\x12\x14\n\x0con_behalf_of\x18\x03 \x01(\x05\x12\x13\n\x0b\x63lient_user\x18\x04 \x01(\t\x12\x18\n\x10\x63lient_sudo_user\x18\x05 \x01(\t\x1a\"\n\x0cSessionOfPid\x12\x12\n\nclient_pid\x18\x01 \x02(\x05\x1a\x1e\n\rSessionExists\x12\r\n\x05\x64ummy\x18\x01 \x01(\x05\x1a\x1a\n\tGetConfig\x12\r\n\x05\x64ummy\x18\x01 \x01(\x05\x1a \n\x08Teardown\x12\x14\n\x0con_behalf_of\x18\x01 \x01(\x05\x1a\x46\n\x08Validate\x12\x0c\n\x04Path\x18\x01 \x03(\t\x12,\n\routput_format\x18\x02 \x01(\x0e\x32\x15.Request.OutputFormat\x1a\x13\n\x03Set\x12\x0c\n\x04path\x18\x01 \x03(\t\x1a\x16\n\x06\x44\x65lete\x12\x0c\n\x04path\x18\x01 \x03(\t\x1a>\n\x06\x41uxSet\x12\x0c\n\x04path\x18\x01 \x03(\t\x12\x13\n\x0bscript_name\x18\x02 \x02(\t\x12\x11\n\ttag_value\x18\x03 \x01(\t\x1a\x41\n\tAuxDelete\x12\x0c\n\x04path\x18\x01 \x03(\t\x12\x13\n\x0bscript_name\x18\x02 \x02(\t\x12\x11\n\ttag_value\x18\x03 \x01(\t\x1a\x18\n\x07\x44iscard\x12\r\n\x05\x64ummy\x18\x01 \x01(\x05\x1a\x1f\n\x0eSessionChanged\x12\r\n\x05\x64ummy\x18\x01 \x01(\x05\x1a\x41\n\x06Rename\x12\x12\n\nedit_level\x18\x01 \x03(\t\x12\x0e\n\x06source\x18\x02 \x02(\t\x12\x13\n\x0b\x64\x65stination\x18\x03 \x02(\t\x1a?\n\x04\x43opy\x12\x12\n\nedit_level\x18\x01 \x03(\t\x12\x0e\n\x06source\x18\x02 \x02(\t\x12\x13\n\x0b\x64\x65stination\x18\x03 \x02(\t\x1a(\n\x07\x43omment\x12\x0c\n\x04path\x18\x01 \x03(\t\x12\x0f\n\x07\x63omment\x18\x02 \x02(\t\x1aT\n\x06\x43ommit\x12\x0f\n\x07\x63onfirm\x18\x01 \x01(\x08\x12\x17\n\x0f\x63onfirm_timeout\x18\x02 \x01(\x05\x12\x0f\n\x07\x63omment\x18\x03 \x01(\t\x12\x0f\n\x07\x64ry_run\x18\x04 \x01(\x08\x1a\x1c\n\x08Rollback\x12\x10\n\x08revision\x18\x01 \x02(\x05\x1aO\n\x04Load\x12\x10\n\x08location\x18\x01 \x02(\t\x12\x0e\n\x06\x63\x61\x63hed\x18\x02 \x02(\x08\x12%\n\x06\x66ormat\x18\x03 \x01(\x0e\x32\x15.Request.ConfigFormat\x1aU\n\x05Merge\x12\x10\n\x08location\x18\x01 \x02(\t\x12\x13\n\x0b\x64\x65structive\x18\x02 \x02(\x08\x12%\n\x06\x66ormat\x18\x03 \x01(\x0e\x32\x15.Request.ConfigFormat\x1a?\n\x04Save\x12\x10\n\x08location\x18\x01 \x02(\t\x12%\n\x06\x66ormat\x18\x02 \x01(\x0e\x32\x15.Request.ConfigFormat\x1a\x41\n\nShowConfig\x12\x0c\n\x04path\x18\x01 \x03(\t\x12%\n\x06\x66ormat\x18\x02 \x01(\x0e\x32\x15.Request.ConfigFormat\x1a\x16\n\x06\x45xists\x12\x0c\n\x04path\x18\x01 \x03(\t\x1a\x46\n\x08GetValue\x12\x0c\n\x04path\x18\x01 \x03(\t\x12,\n\routput_format\x18\x02 \x01(\x0e\x32\x15.Request.OutputFormat\x1aG\n\tGetValues\x12\x0c\n\x04path\x18\x01 \x03(\t\x12,\n\routput_format\x18\x02 \x01(\x0e\x32\x15.Request.OutputFormat\x1aJ\n\x0cListChildren\x12\x0c\n\x04path\x18\x01 \x03(\t\x12,\n\routput_format\x18\x02 \x01(\x0e\x32\x15.Request.OutputFormat\x1aG\n\tRunOpMode\x12\x0c\n\x04path\x18\x01 \x03(\t\x12,\n\routput_format\x18\x02 \x01(\x0e\x32\x15.Request.OutputFormat\x1a\t\n\x07\x43onfirm\x1aG\n\x16\x45nterConfigurationMode\x12\x11\n\texclusive\x18\x01 \x02(\x08\x12\x1a\n\x12override_exclusive\x18\x02 \x02(\x08\x1a\x17\n\x15\x45xitConfigurationMode\x1a%\n\rReloadReftree\x12\x14\n\x0con_behalf_of\x18\x01 \x01(\x05\x1a;\n\x0cShowSessions\x12\x14\n\x0c\x65xclude_self\x18\x01 \x02(\x08\x12\x15\n\rexclude_other\x18\x02 \x02(\x08\"#\n\x0c\x43onfigFormat\x12\t\n\x05\x43URLY\x10\x00\x12\x08\n\x04JSON\x10\x01\")\n\x0cOutputFormat\x12\x0c\n\x08OutPlain\x10\x00\x12\x0b\n\x07OutJSON\x10\x01\x42\x05\n\x03msg\";\n\x0fRequestEnvelope\x12\r\n\x05token\x18\x01 \x01(\t\x12\x19\n\x07request\x18\x02 \x02(\x0b\x32\x08.Request\"S\n\x08Response\x12\x17\n\x06status\x18\x01 \x02(\x0e\x32\x07.Errnum\x12\x0e\n\x06output\x18\x02 \x01(\t\x12\r\n\x05\x65rror\x18\x03 \x01(\t\x12\x0f\n\x07warning\x18\x04 \x01(\t*\xd2\x01\n\x06\x45rrnum\x12\x0b\n\x07SUCCESS\x10\x00\x12\x08\n\x04\x46\x41IL\x10\x01\x12\x10\n\x0cINVALID_PATH\x10\x02\x12\x11\n\rINVALID_VALUE\x10\x03\x12\x16\n\x12\x43OMMIT_IN_PROGRESS\x10\x04\x12\x18\n\x14\x43ONFIGURATION_LOCKED\x10\x05\x12\x12\n\x0eINTERNAL_ERROR\x10\x06\x12\x15\n\x11PERMISSION_DENIED\x10\x07\x12\x17\n\x13PATH_ALREADY_EXISTS\x10\x08\x12\x16\n\x12UNCOMMITED_CHANGES\x10\t')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cvyconf.proto\"\xd1\x1b\n\x07Request\x12!\n\x06prompt\x18\x01 \x01(\x0b\x32\x0f.Request.PromptH\x00\x12.\n\rsetup_session\x18\x02 \x01(\x0b\x32\x15.Request.SetupSessionH\x00\x12\x1b\n\x03set\x18\x03 \x01(\x0b\x32\x0c.Request.SetH\x00\x12!\n\x06\x64\x65lete\x18\x04 \x01(\x0b\x32\x0f.Request.DeleteH\x00\x12!\n\x06rename\x18\x05 \x01(\x0b\x32\x0f.Request.RenameH\x00\x12\x1d\n\x04\x63opy\x18\x06 \x01(\x0b\x32\r.Request.CopyH\x00\x12#\n\x07\x63omment\x18\x07 \x01(\x0b\x32\x10.Request.CommentH\x00\x12!\n\x06\x63ommit\x18\x08 \x01(\x0b\x32\x0f.Request.CommitH\x00\x12%\n\x08rollback\x18\t \x01(\x0b\x32\x11.Request.RollbackH\x00\x12\x1f\n\x05merge\x18\n \x01(\x0b\x32\x0e.Request.MergeH\x00\x12\x1d\n\x04save\x18\x0b \x01(\x0b\x32\r.Request.SaveH\x00\x12*\n\x0bshow_config\x18\x0c \x01(\x0b\x32\x13.Request.ShowConfigH\x00\x12!\n\x06\x65xists\x18\r \x01(\x0b\x32\x0f.Request.ExistsH\x00\x12&\n\tget_value\x18\x0e \x01(\x0b\x32\x11.Request.GetValueH\x00\x12(\n\nget_values\x18\x0f \x01(\x0b\x32\x12.Request.GetValuesH\x00\x12.\n\rlist_children\x18\x10 \x01(\x0b\x32\x15.Request.ListChildrenH\x00\x12)\n\x0brun_op_mode\x18\x11 \x01(\x0b\x32\x12.Request.RunOpModeH\x00\x12#\n\x07\x63onfirm\x18\x12 \x01(\x0b\x32\x10.Request.ConfirmH\x00\x12\x43\n\x18\x65nter_configuration_mode\x18\x13 \x01(\x0b\x32\x1f.Request.EnterConfigurationModeH\x00\x12\x41\n\x17\x65xit_configuration_mode\x18\x14 \x01(\x0b\x32\x1e.Request.ExitConfigurationModeH\x00\x12%\n\x08validate\x18\x15 \x01(\x0b\x32\x11.Request.ValidateH\x00\x12%\n\x08teardown\x18\x16 \x01(\x0b\x32\x11.Request.TeardownH\x00\x12\x30\n\x0ereload_reftree\x18\x17 \x01(\x0b\x32\x16.Request.ReloadReftreeH\x00\x12\x1d\n\x04load\x18\x18 \x01(\x0b\x32\r.Request.LoadH\x00\x12#\n\x07\x64iscard\x18\x19 \x01(\x0b\x32\x10.Request.DiscardH\x00\x12\x32\n\x0fsession_changed\x18\x1a \x01(\x0b\x32\x17.Request.SessionChangedH\x00\x12/\n\x0esession_of_pid\x18\x1b \x01(\x0b\x32\x15.Request.SessionOfPidH\x00\x12\x30\n\x0esession_exists\x18\x1c \x01(\x0b\x32\x16.Request.SessionExistsH\x00\x12(\n\nget_config\x18\x1d \x01(\x0b\x32\x12.Request.GetConfigH\x00\x12\"\n\x07\x61ux_set\x18\x1e \x01(\x0b\x32\x0f.Request.AuxSetH\x00\x12(\n\naux_delete\x18\x1f \x01(\x0b\x32\x12.Request.AuxDeleteH\x00\x12.\n\rshow_sessions\x18  \x01(\x0b\x32\x15.Request.ShowSessionsH\x00\x12/\n\x0eset_edit_level\x18! \x01(\x0b\x32\x15.Request.SetEditLevelH\x00\x12\x34\n\x11set_edit_level_up\x18\" \x01(\x0b\x32\x17.Request.SetEditLevelUpH\x00\x12\x33\n\x10reset_edit_level\x18# \x01(\x0b\x32\x17.Request.ResetEditLevelH\x00\x12/\n\x0eget_edit_level\x18$ \x01(\x0b\x32\x15.Request.GetEditLevelH\x00\x12\x31\n\x0f\x65\x64it_level_root\x18% \x01(\x0b\x32\x16.Request.EditLevelRootH\x00\x1a\x08\n\x06Prompt\x1a\x83\x01\n\x0cSetupSession\x12\x12\n\nclient_pid\x18\x01 \x02(\x05\x12\x1a\n\x12\x63lient_application\x18\x02 \x01(\t\x12\x14\n\x0con_behalf_of\x18\x03 \x01(\x05\x12\x13\n\x0b\x63lient_user\x18\x04 \x01(\t\x12\x18\n\x10\x63lient_sudo_user\x18\x05 \x01(\t\x1a\"\n\x0cSessionOfPid\x12\x12\n\nclient_pid\x18\x01 \x02(\x05\x1a\x1e\n\rSessionExists\x12\r\n\x05\x64ummy\x18\x01 \x01(\x05\x1a\x1a\n\tGetConfig\x12\r\n\x05\x64ummy\x18\x01 \x01(\x05\x1a \n\x08Teardown\x12\x14\n\x0con_behalf_of\x18\x01 \x01(\x05\x1a\x46\n\x08Validate\x12\x0c\n\x04Path\x18\x01 \x03(\t\x12,\n\routput_format\x18\x02 \x01(\x0e\x32\x15.Request.OutputFormat\x1a\x13\n\x03Set\x12\x0c\n\x04path\x18\x01 \x03(\t\x1a\x16\n\x06\x44\x65lete\x12\x0c\n\x04path\x18\x01 \x03(\t\x1a>\n\x06\x41uxSet\x12\x0c\n\x04path\x18\x01 \x03(\t\x12\x13\n\x0bscript_name\x18\x02 \x02(\t\x12\x11\n\ttag_value\x18\x03 \x01(\t\x1a\x41\n\tAuxDelete\x12\x0c\n\x04path\x18\x01 \x03(\t\x12\x13\n\x0bscript_name\x18\x02 \x02(\t\x12\x11\n\ttag_value\x18\x03 \x01(\t\x1a\x18\n\x07\x44iscard\x12\r\n\x05\x64ummy\x18\x01 \x01(\x05\x1a\x1f\n\x0eSessionChanged\x12\r\n\x05\x64ummy\x18\x01 \x01(\x05\x1a\x41\n\x06Rename\x12\x12\n\nedit_level\x18\x01 \x03(\t\x12\x0e\n\x06source\x18\x02 \x02(\t\x12\x13\n\x0b\x64\x65stination\x18\x03 \x02(\t\x1a?\n\x04\x43opy\x12\x12\n\nedit_level\x18\x01 \x03(\t\x12\x0e\n\x06source\x18\x02 \x02(\t\x12\x13\n\x0b\x64\x65stination\x18\x03 \x02(\t\x1a(\n\x07\x43omment\x12\x0c\n\x04path\x18\x01 \x03(\t\x12\x0f\n\x07\x63omment\x18\x02 \x02(\t\x1aT\n\x06\x43ommit\x12\x0f\n\x07\x63onfirm\x18\x01 \x01(\x08\x12\x17\n\x0f\x63onfirm_timeout\x18\x02 \x01(\x05\x12\x0f\n\x07\x63omment\x18\x03 \x01(\t\x12\x0f\n\x07\x64ry_run\x18\x04 \x01(\x08\x1a\x1c\n\x08Rollback\x12\x10\n\x08revision\x18\x01 \x02(\x05\x1aO\n\x04Load\x12\x10\n\x08location\x18\x01 \x02(\t\x12\x0e\n\x06\x63\x61\x63hed\x18\x02 \x02(\x08\x12%\n\x06\x66ormat\x18\x03 \x01(\x0e\x32\x15.Request.ConfigFormat\x1aU\n\x05Merge\x12\x10\n\x08location\x18\x01 \x02(\t\x12\x13\n\x0b\x64\x65structive\x18\x02 \x02(\x08\x12%\n\x06\x66ormat\x18\x03 \x01(\x0e\x32\x15.Request.ConfigFormat\x1a?\n\x04Save\x12\x10\n\x08location\x18\x01 \x02(\t\x12%\n\x06\x66ormat\x18\x02 \x01(\x0e\x32\x15.Request.ConfigFormat\x1a\x41\n\nShowConfig\x12\x0c\n\x04path\x18\x01 \x03(\t\x12%\n\x06\x66ormat\x18\x02 \x01(\x0e\x32\x15.Request.ConfigFormat\x1a\x16\n\x06\x45xists\x12\x0c\n\x04path\x18\x01 \x03(\t\x1a\x46\n\x08GetValue\x12\x0c\n\x04path\x18\x01 \x03(\t\x12,\n\routput_format\x18\x02 \x01(\x0e\x32\x15.Request.OutputFormat\x1aG\n\tGetValues\x12\x0c\n\x04path\x18\x01 \x03(\t\x12,\n\routput_format\x18\x02 \x01(\x0e\x32\x15.Request.OutputFormat\x1aJ\n\x0cListChildren\x12\x0c\n\x04path\x18\x01 \x03(\t\x12,\n\routput_format\x18\x02 \x01(\x0e\x32\x15.Request.OutputFormat\x1aG\n\tRunOpMode\x12\x0c\n\x04path\x18\x01 \x03(\t\x12,\n\routput_format\x18\x02 \x01(\x0e\x32\x15.Request.OutputFormat\x1a\t\n\x07\x43onfirm\x1aG\n\x16\x45nterConfigurationMode\x12\x11\n\texclusive\x18\x01 \x02(\x08\x12\x1a\n\x12override_exclusive\x18\x02 \x02(\x08\x1a\x17\n\x15\x45xitConfigurationMode\x1a%\n\rReloadReftree\x12\x14\n\x0con_behalf_of\x18\x01 \x01(\x05\x1a;\n\x0cShowSessions\x12\x14\n\x0c\x65xclude_self\x18\x01 \x02(\x08\x12\x15\n\rexclude_other\x18\x02 \x02(\x08\x1a\x1c\n\x0cSetEditLevel\x12\x0c\n\x04path\x18\x01 \x03(\t\x1a\x1f\n\x0eSetEditLevelUp\x12\r\n\x05\x64ummy\x18\x01 \x01(\x05\x1a\x1f\n\x0eResetEditLevel\x12\r\n\x05\x64ummy\x18\x01 \x01(\x05\x1a\x1d\n\x0cGetEditLevel\x12\r\n\x05\x64ummy\x18\x01 \x01(\x05\x1a\x1e\n\rEditLevelRoot\x12\r\n\x05\x64ummy\x18\x01 \x01(\x05\"#\n\x0c\x43onfigFormat\x12\t\n\x05\x43URLY\x10\x00\x12\x08\n\x04JSON\x10\x01\")\n\x0cOutputFormat\x12\x0c\n\x08OutPlain\x10\x00\x12\x0b\n\x07OutJSON\x10\x01\x42\x05\n\x03msg\";\n\x0fRequestEnvelope\x12\r\n\x05token\x18\x01 \x01(\t\x12\x19\n\x07request\x18\x02 \x02(\x0b\x32\x08.Request\"S\n\x08Response\x12\x17\n\x06status\x18\x01 \x02(\x0e\x32\x07.Errnum\x12\x0e\n\x06output\x18\x02 \x01(\t\x12\r\n\x05\x65rror\x18\x03 \x01(\t\x12\x0f\n\x07warning\x18\x04 \x01(\t*\xd2\x01\n\x06\x45rrnum\x12\x0b\n\x07SUCCESS\x10\x00\x12\x08\n\x04\x46\x41IL\x10\x01\x12\x10\n\x0cINVALID_PATH\x10\x02\x12\x11\n\rINVALID_VALUE\x10\x03\x12\x16\n\x12\x43OMMIT_IN_PROGRESS\x10\x04\x12\x18\n\x14\x43ONFIGURATION_LOCKED\x10\x05\x12\x12\n\x0eINTERNAL_ERROR\x10\x06\x12\x15\n\x11PERMISSION_DENIED\x10\x07\x12\x17\n\x13PATH_ALREADY_EXISTS\x10\x08\x12\x16\n\x12UNCOMMITED_CHANGES\x10\t')
 
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'vyconf_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
 
   DESCRIPTOR._options = None
-  _ERRNUM._serialized_start=3288
-  _ERRNUM._serialized_end=3498
+  _ERRNUM._serialized_start=3703
+  _ERRNUM._serialized_end=3913
   _REQUEST._serialized_start=17
-  _REQUEST._serialized_end=3139
-  _REQUEST_PROMPT._serialized_start=1356
-  _REQUEST_PROMPT._serialized_end=1364
-  _REQUEST_SETUPSESSION._serialized_start=1367
-  _REQUEST_SETUPSESSION._serialized_end=1498
-  _REQUEST_SESSIONOFPID._serialized_start=1500
-  _REQUEST_SESSIONOFPID._serialized_end=1534
-  _REQUEST_SESSIONEXISTS._serialized_start=1536
-  _REQUEST_SESSIONEXISTS._serialized_end=1566
-  _REQUEST_GETCONFIG._serialized_start=1568
-  _REQUEST_GETCONFIG._serialized_end=1594
-  _REQUEST_TEARDOWN._serialized_start=1596
-  _REQUEST_TEARDOWN._serialized_end=1628
-  _REQUEST_VALIDATE._serialized_start=1630
-  _REQUEST_VALIDATE._serialized_end=1700
-  _REQUEST_SET._serialized_start=1702
-  _REQUEST_SET._serialized_end=1721
-  _REQUEST_DELETE._serialized_start=1723
-  _REQUEST_DELETE._serialized_end=1745
-  _REQUEST_AUXSET._serialized_start=1747
-  _REQUEST_AUXSET._serialized_end=1809
-  _REQUEST_AUXDELETE._serialized_start=1811
-  _REQUEST_AUXDELETE._serialized_end=1876
-  _REQUEST_DISCARD._serialized_start=1878
-  _REQUEST_DISCARD._serialized_end=1902
-  _REQUEST_SESSIONCHANGED._serialized_start=1904
-  _REQUEST_SESSIONCHANGED._serialized_end=1935
-  _REQUEST_RENAME._serialized_start=1937
-  _REQUEST_RENAME._serialized_end=2002
-  _REQUEST_COPY._serialized_start=2004
-  _REQUEST_COPY._serialized_end=2067
-  _REQUEST_COMMENT._serialized_start=2069
-  _REQUEST_COMMENT._serialized_end=2109
-  _REQUEST_COMMIT._serialized_start=2111
-  _REQUEST_COMMIT._serialized_end=2195
-  _REQUEST_ROLLBACK._serialized_start=2197
-  _REQUEST_ROLLBACK._serialized_end=2225
-  _REQUEST_LOAD._serialized_start=2227
-  _REQUEST_LOAD._serialized_end=2306
-  _REQUEST_MERGE._serialized_start=2308
-  _REQUEST_MERGE._serialized_end=2393
-  _REQUEST_SAVE._serialized_start=2395
-  _REQUEST_SAVE._serialized_end=2458
-  _REQUEST_SHOWCONFIG._serialized_start=2460
-  _REQUEST_SHOWCONFIG._serialized_end=2525
-  _REQUEST_EXISTS._serialized_start=2527
-  _REQUEST_EXISTS._serialized_end=2549
-  _REQUEST_GETVALUE._serialized_start=2551
-  _REQUEST_GETVALUE._serialized_end=2621
-  _REQUEST_GETVALUES._serialized_start=2623
-  _REQUEST_GETVALUES._serialized_end=2694
-  _REQUEST_LISTCHILDREN._serialized_start=2696
-  _REQUEST_LISTCHILDREN._serialized_end=2770
-  _REQUEST_RUNOPMODE._serialized_start=2772
-  _REQUEST_RUNOPMODE._serialized_end=2843
-  _REQUEST_CONFIRM._serialized_start=2845
-  _REQUEST_CONFIRM._serialized_end=2854
-  _REQUEST_ENTERCONFIGURATIONMODE._serialized_start=2856
-  _REQUEST_ENTERCONFIGURATIONMODE._serialized_end=2927
-  _REQUEST_EXITCONFIGURATIONMODE._serialized_start=2929
-  _REQUEST_EXITCONFIGURATIONMODE._serialized_end=2952
-  _REQUEST_RELOADREFTREE._serialized_start=2954
-  _REQUEST_RELOADREFTREE._serialized_end=2991
-  _REQUEST_SHOWSESSIONS._serialized_start=2993
-  _REQUEST_SHOWSESSIONS._serialized_end=3052
-  _REQUEST_CONFIGFORMAT._serialized_start=3054
-  _REQUEST_CONFIGFORMAT._serialized_end=3089
-  _REQUEST_OUTPUTFORMAT._serialized_start=3091
-  _REQUEST_OUTPUTFORMAT._serialized_end=3132
-  _REQUESTENVELOPE._serialized_start=3141
-  _REQUESTENVELOPE._serialized_end=3200
-  _RESPONSE._serialized_start=3202
-  _RESPONSE._serialized_end=3285
+  _REQUEST._serialized_end=3554
+  _REQUEST_PROMPT._serialized_start=1612
+  _REQUEST_PROMPT._serialized_end=1620
+  _REQUEST_SETUPSESSION._serialized_start=1623
+  _REQUEST_SETUPSESSION._serialized_end=1754
+  _REQUEST_SESSIONOFPID._serialized_start=1756
+  _REQUEST_SESSIONOFPID._serialized_end=1790
+  _REQUEST_SESSIONEXISTS._serialized_start=1792
+  _REQUEST_SESSIONEXISTS._serialized_end=1822
+  _REQUEST_GETCONFIG._serialized_start=1824
+  _REQUEST_GETCONFIG._serialized_end=1850
+  _REQUEST_TEARDOWN._serialized_start=1852
+  _REQUEST_TEARDOWN._serialized_end=1884
+  _REQUEST_VALIDATE._serialized_start=1886
+  _REQUEST_VALIDATE._serialized_end=1956
+  _REQUEST_SET._serialized_start=1958
+  _REQUEST_SET._serialized_end=1977
+  _REQUEST_DELETE._serialized_start=1979
+  _REQUEST_DELETE._serialized_end=2001
+  _REQUEST_AUXSET._serialized_start=2003
+  _REQUEST_AUXSET._serialized_end=2065
+  _REQUEST_AUXDELETE._serialized_start=2067
+  _REQUEST_AUXDELETE._serialized_end=2132
+  _REQUEST_DISCARD._serialized_start=2134
+  _REQUEST_DISCARD._serialized_end=2158
+  _REQUEST_SESSIONCHANGED._serialized_start=2160
+  _REQUEST_SESSIONCHANGED._serialized_end=2191
+  _REQUEST_RENAME._serialized_start=2193
+  _REQUEST_RENAME._serialized_end=2258
+  _REQUEST_COPY._serialized_start=2260
+  _REQUEST_COPY._serialized_end=2323
+  _REQUEST_COMMENT._serialized_start=2325
+  _REQUEST_COMMENT._serialized_end=2365
+  _REQUEST_COMMIT._serialized_start=2367
+  _REQUEST_COMMIT._serialized_end=2451
+  _REQUEST_ROLLBACK._serialized_start=2453
+  _REQUEST_ROLLBACK._serialized_end=2481
+  _REQUEST_LOAD._serialized_start=2483
+  _REQUEST_LOAD._serialized_end=2562
+  _REQUEST_MERGE._serialized_start=2564
+  _REQUEST_MERGE._serialized_end=2649
+  _REQUEST_SAVE._serialized_start=2651
+  _REQUEST_SAVE._serialized_end=2714
+  _REQUEST_SHOWCONFIG._serialized_start=2716
+  _REQUEST_SHOWCONFIG._serialized_end=2781
+  _REQUEST_EXISTS._serialized_start=2783
+  _REQUEST_EXISTS._serialized_end=2805
+  _REQUEST_GETVALUE._serialized_start=2807
+  _REQUEST_GETVALUE._serialized_end=2877
+  _REQUEST_GETVALUES._serialized_start=2879
+  _REQUEST_GETVALUES._serialized_end=2950
+  _REQUEST_LISTCHILDREN._serialized_start=2952
+  _REQUEST_LISTCHILDREN._serialized_end=3026
+  _REQUEST_RUNOPMODE._serialized_start=3028
+  _REQUEST_RUNOPMODE._serialized_end=3099
+  _REQUEST_CONFIRM._serialized_start=3101
+  _REQUEST_CONFIRM._serialized_end=3110
+  _REQUEST_ENTERCONFIGURATIONMODE._serialized_start=3112
+  _REQUEST_ENTERCONFIGURATIONMODE._serialized_end=3183
+  _REQUEST_EXITCONFIGURATIONMODE._serialized_start=3185
+  _REQUEST_EXITCONFIGURATIONMODE._serialized_end=3208
+  _REQUEST_RELOADREFTREE._serialized_start=3210
+  _REQUEST_RELOADREFTREE._serialized_end=3247
+  _REQUEST_SHOWSESSIONS._serialized_start=3249
+  _REQUEST_SHOWSESSIONS._serialized_end=3308
+  _REQUEST_SETEDITLEVEL._serialized_start=3310
+  _REQUEST_SETEDITLEVEL._serialized_end=3338
+  _REQUEST_SETEDITLEVELUP._serialized_start=3340
+  _REQUEST_SETEDITLEVELUP._serialized_end=3371
+  _REQUEST_RESETEDITLEVEL._serialized_start=3373
+  _REQUEST_RESETEDITLEVEL._serialized_end=3404
+  _REQUEST_GETEDITLEVEL._serialized_start=3406
+  _REQUEST_GETEDITLEVEL._serialized_end=3435
+  _REQUEST_EDITLEVELROOT._serialized_start=3437
+  _REQUEST_EDITLEVELROOT._serialized_end=3467
+  _REQUEST_CONFIGFORMAT._serialized_start=3469
+  _REQUEST_CONFIGFORMAT._serialized_end=3504
+  _REQUEST_OUTPUTFORMAT._serialized_start=3506
+  _REQUEST_OUTPUTFORMAT._serialized_end=3547
+  _REQUESTENVELOPE._serialized_start=3556
+  _REQUESTENVELOPE._serialized_end=3615
+  _RESPONSE._serialized_start=3617
+  _RESPONSE._serialized_end=3700
 # @@protoc_insertion_point(module_scope)
diff --git a/python/vyos/proto/vyconf_proto.py b/python/vyos/proto/vyconf_proto.py
index 080d103f9a..02d375ab13 100644
--- a/python/vyos/proto/vyconf_proto.py
+++ b/python/vyos/proto/vyconf_proto.py
@@ -179,6 +179,26 @@ class ShowSessions:
     exclude_self: bool = False
     exclude_other: bool = False
 
+@dataclass
+class SetEditLevel:
+    path: list[str] = field(default_factory=list)
+
+@dataclass
+class SetEditLevelUp:
+    dummy: int = None
+
+@dataclass
+class ResetEditLevel:
+    dummy: int = None
+
+@dataclass
+class GetEditLevel:
+    dummy: int = None
+
+@dataclass
+class EditLevelRoot:
+    dummy: int = None
+
 @dataclass
 class Request:
     prompt: Prompt = None
@@ -213,6 +233,11 @@ class Request:
     aux_set: AuxSet = None
     aux_delete: AuxDelete = None
     show_sessions: ShowSessions = None
+    set_edit_level: SetEditLevel = None
+    set_edit_level_up: SetEditLevelUp = None
+    reset_edit_level: ResetEditLevel = None
+    get_edit_level: GetEditLevel = None
+    edit_level_root: EditLevelRoot = None
 
 @dataclass
 class RequestEnvelope:
@@ -417,3 +442,33 @@ def set_request_show_sessions(token: str = None, exclude_self: bool = False, exc
     req = Request(show_sessions=reqi)
     req_env = RequestEnvelope(token, req)
     return req_env
+
+def set_request_set_edit_level(token: str = None, path: list[str] = []):
+    reqi = SetEditLevel (path)
+    req = Request(set_edit_level=reqi)
+    req_env = RequestEnvelope(token, req)
+    return req_env
+
+def set_request_set_edit_level_up(token: str = None, dummy: int = None):
+    reqi = SetEditLevelUp (dummy)
+    req = Request(set_edit_level_up=reqi)
+    req_env = RequestEnvelope(token, req)
+    return req_env
+
+def set_request_reset_edit_level(token: str = None, dummy: int = None):
+    reqi = ResetEditLevel (dummy)
+    req = Request(reset_edit_level=reqi)
+    req_env = RequestEnvelope(token, req)
+    return req_env
+
+def set_request_get_edit_level(token: str = None, dummy: int = None):
+    reqi = GetEditLevel (dummy)
+    req = Request(get_edit_level=reqi)
+    req_env = RequestEnvelope(token, req)
+    return req_env
+
+def set_request_edit_level_root(token: str = None, dummy: int = None):
+    reqi = EditLevelRoot (dummy)
+    req = Request(edit_level_root=reqi)
+    req_env = RequestEnvelope(token, req)
+    return req_env