summary refs log tree commit diff
path: root/clients
diff options
context:
space:
mode:
Diffstat (limited to 'clients')
-rw-r--r--clients/cli/agent.c20
-rw-r--r--clients/cli/agent.h20
-rw-r--r--clients/cli/common.c150
-rw-r--r--clients/cli/common.h28
-rw-r--r--clients/cli/connections.c405
-rw-r--r--clients/cli/connections.h20
-rw-r--r--clients/cli/devices.c918
-rw-r--r--clients/cli/devices.h20
-rw-r--r--clients/cli/general.c176
-rw-r--r--clients/cli/general.h20
-rw-r--r--clients/cli/meson.build8
-rw-r--r--clients/cli/nmcli.c29
-rw-r--r--clients/cli/nmcli.h25
-rw-r--r--clients/cli/polkit-agent.c20
-rw-r--r--clients/cli/polkit-agent.h20
-rw-r--r--clients/cli/settings.c39
-rw-r--r--clients/cli/settings.h22
-rw-r--r--clients/cli/utils.c22
-rw-r--r--clients/cli/utils.h28
-rwxr-xr-xclients/cloud-setup/90-nm-cloud-setup.sh9
-rw-r--r--clients/cloud-setup/main.c646
-rw-r--r--clients/cloud-setup/meson.build49
-rw-r--r--clients/cloud-setup/nm-cloud-setup-utils.c835
-rw-r--r--clients/cloud-setup/nm-cloud-setup-utils.h127
-rw-r--r--clients/cloud-setup/nm-cloud-setup.service.in36
-rw-r--r--clients/cloud-setup/nm-cloud-setup.timer9
-rw-r--r--clients/cloud-setup/nm-http-client.c746
-rw-r--r--clients/cloud-setup/nm-http-client.h67
-rw-r--r--clients/cloud-setup/nmcs-provider-ec2.c555
-rw-r--r--clients/cloud-setup/nmcs-provider-ec2.h24
-rw-r--r--clients/cloud-setup/nmcs-provider.c245
-rw-r--r--clients/cloud-setup/nmcs-provider.h108
-rw-r--r--clients/common/meson.build47
-rw-r--r--clients/common/nm-client-utils.c117
-rw-r--r--clients/common/nm-client-utils.h22
-rw-r--r--clients/common/nm-meta-setting-access.c20
-rw-r--r--clients/common/nm-meta-setting-access.h20
-rw-r--r--clients/common/nm-meta-setting-desc.c4485
-rw-r--r--clients/common/nm-meta-setting-desc.h29
-rw-r--r--clients/common/nm-polkit-listener.c16
-rw-r--r--clients/common/nm-polkit-listener.h16
-rw-r--r--clients/common/nm-secret-agent-simple.c20
-rw-r--r--clients/common/nm-secret-agent-simple.h16
-rw-r--r--clients/common/nm-vpn-helpers.c31
-rw-r--r--clients/common/nm-vpn-helpers.h16
-rw-r--r--clients/common/qrcodegen.c1009
-rw-r--r--clients/common/qrcodegen.h311
-rw-r--r--clients/common/settings-docs.h11
-rw-r--r--clients/common/settings-docs.h.in11
-rw-r--r--clients/common/tests/meson.build50
-rw-r--r--clients/common/tests/test-clients-common.c17
-rw-r--r--clients/common/tests/test-libnm-core-aux.c18
-rw-r--r--clients/meson.build18
-rw-r--r--clients/nm-online.c16
-rw-r--r--clients/tests/test-client.check-on-disk/test_002.expected114
-rw-r--r--clients/tests/test-client.check-on-disk/test_003.expected2750
-rw-r--r--clients/tests/test-client.check-on-disk/test_004.expected8872
-rwxr-xr-xclients/tests/test-client.py388
-rw-r--r--clients/tui/meson.build17
-rw-r--r--clients/tui/newt/meson.build11
-rw-r--r--clients/tui/newt/nmt-newt-button-box.c16
-rw-r--r--clients/tui/newt/nmt-newt-button-box.h16
-rw-r--r--clients/tui/newt/nmt-newt-button.c16
-rw-r--r--clients/tui/newt/nmt-newt-button.h16
-rw-r--r--clients/tui/newt/nmt-newt-checkbox.c16
-rw-r--r--clients/tui/newt/nmt-newt-checkbox.h16
-rw-r--r--clients/tui/newt/nmt-newt-component.c16
-rw-r--r--clients/tui/newt/nmt-newt-component.h16
-rw-r--r--clients/tui/newt/nmt-newt-container.c16
-rw-r--r--clients/tui/newt/nmt-newt-container.h16
-rw-r--r--clients/tui/newt/nmt-newt-entry-numeric.c16
-rw-r--r--clients/tui/newt/nmt-newt-entry-numeric.h16
-rw-r--r--clients/tui/newt/nmt-newt-entry.c16
-rw-r--r--clients/tui/newt/nmt-newt-entry.h16
-rw-r--r--clients/tui/newt/nmt-newt-form.c16
-rw-r--r--clients/tui/newt/nmt-newt-form.h16
-rw-r--r--clients/tui/newt/nmt-newt-grid.c16
-rw-r--r--clients/tui/newt/nmt-newt-grid.h16
-rw-r--r--clients/tui/newt/nmt-newt-hacks.c16
-rw-r--r--clients/tui/newt/nmt-newt-hacks.h16
-rw-r--r--clients/tui/newt/nmt-newt-label.c16
-rw-r--r--clients/tui/newt/nmt-newt-label.h16
-rw-r--r--clients/tui/newt/nmt-newt-listbox.c16
-rw-r--r--clients/tui/newt/nmt-newt-listbox.h16
-rw-r--r--clients/tui/newt/nmt-newt-popup.c16
-rw-r--r--clients/tui/newt/nmt-newt-popup.h16
-rw-r--r--clients/tui/newt/nmt-newt-section.c16
-rw-r--r--clients/tui/newt/nmt-newt-section.h16
-rw-r--r--clients/tui/newt/nmt-newt-separator.c16
-rw-r--r--clients/tui/newt/nmt-newt-separator.h16
-rw-r--r--clients/tui/newt/nmt-newt-stack.c16
-rw-r--r--clients/tui/newt/nmt-newt-stack.h16
-rw-r--r--clients/tui/newt/nmt-newt-textbox.c16
-rw-r--r--clients/tui/newt/nmt-newt-textbox.h16
-rw-r--r--clients/tui/newt/nmt-newt-toggle-button.c16
-rw-r--r--clients/tui/newt/nmt-newt-toggle-button.h16
-rw-r--r--clients/tui/newt/nmt-newt-types.h16
-rw-r--r--clients/tui/newt/nmt-newt-utils.c16
-rw-r--r--clients/tui/newt/nmt-newt-utils.h16
-rw-r--r--clients/tui/newt/nmt-newt-widget.c16
-rw-r--r--clients/tui/newt/nmt-newt-widget.h16
-rw-r--r--clients/tui/newt/nmt-newt.h16
-rw-r--r--clients/tui/nm-editor-bindings.c19
-rw-r--r--clients/tui/nm-editor-bindings.h16
-rw-r--r--clients/tui/nm-editor-utils.c16
-rw-r--r--clients/tui/nm-editor-utils.h16
-rw-r--r--clients/tui/nmt-address-list.c16
-rw-r--r--clients/tui/nmt-address-list.h16
-rw-r--r--clients/tui/nmt-connect-connection-list.c16
-rw-r--r--clients/tui/nmt-connect-connection-list.h16
-rw-r--r--clients/tui/nmt-device-entry.c16
-rw-r--r--clients/tui/nmt-device-entry.h16
-rw-r--r--clients/tui/nmt-edit-connection-list.c16
-rw-r--r--clients/tui/nmt-edit-connection-list.h16
-rw-r--r--clients/tui/nmt-editor-grid.c16
-rw-r--r--clients/tui/nmt-editor-grid.h16
-rw-r--r--clients/tui/nmt-editor-page-device.c16
-rw-r--r--clients/tui/nmt-editor-page-device.h16
-rw-r--r--clients/tui/nmt-editor-page.c16
-rw-r--r--clients/tui/nmt-editor-page.h16
-rw-r--r--clients/tui/nmt-editor-section.c16
-rw-r--r--clients/tui/nmt-editor-section.h16
-rw-r--r--clients/tui/nmt-editor.c16
-rw-r--r--clients/tui/nmt-editor.h16
-rw-r--r--clients/tui/nmt-ip-entry.c16
-rw-r--r--clients/tui/nmt-ip-entry.h16
-rw-r--r--clients/tui/nmt-mac-entry.c16
-rw-r--r--clients/tui/nmt-mac-entry.h16
-rw-r--r--clients/tui/nmt-mtu-entry.c16
-rw-r--r--clients/tui/nmt-mtu-entry.h16
-rw-r--r--clients/tui/nmt-page-bond.c16
-rw-r--r--clients/tui/nmt-page-bond.h16
-rw-r--r--clients/tui/nmt-page-bridge-port.c16
-rw-r--r--clients/tui/nmt-page-bridge-port.h16
-rw-r--r--clients/tui/nmt-page-bridge.c16
-rw-r--r--clients/tui/nmt-page-bridge.h16
-rw-r--r--clients/tui/nmt-page-dsl.c16
-rw-r--r--clients/tui/nmt-page-dsl.h16
-rw-r--r--clients/tui/nmt-page-ethernet.c16
-rw-r--r--clients/tui/nmt-page-ethernet.h16
-rw-r--r--clients/tui/nmt-page-infiniband.c16
-rw-r--r--clients/tui/nmt-page-infiniband.h16
-rw-r--r--clients/tui/nmt-page-ip-tunnel.c16
-rw-r--r--clients/tui/nmt-page-ip-tunnel.h16
-rw-r--r--clients/tui/nmt-page-ip4.c16
-rw-r--r--clients/tui/nmt-page-ip4.h16
-rw-r--r--clients/tui/nmt-page-ip6.c16
-rw-r--r--clients/tui/nmt-page-ip6.h16
-rw-r--r--clients/tui/nmt-page-ppp.c16
-rw-r--r--clients/tui/nmt-page-ppp.h16
-rw-r--r--clients/tui/nmt-page-team-port.c16
-rw-r--r--clients/tui/nmt-page-team-port.h16
-rw-r--r--clients/tui/nmt-page-team.c16
-rw-r--r--clients/tui/nmt-page-team.h16
-rw-r--r--clients/tui/nmt-page-vlan.c16
-rw-r--r--clients/tui/nmt-page-vlan.h16
-rw-r--r--clients/tui/nmt-page-wifi.c16
-rw-r--r--clients/tui/nmt-page-wifi.h16
-rw-r--r--clients/tui/nmt-password-dialog.c16
-rw-r--r--clients/tui/nmt-password-dialog.h16
-rw-r--r--clients/tui/nmt-password-fields.c16
-rw-r--r--clients/tui/nmt-password-fields.h16
-rw-r--r--clients/tui/nmt-route-editor.c16
-rw-r--r--clients/tui/nmt-route-editor.h16
-rw-r--r--clients/tui/nmt-route-entry.c16
-rw-r--r--clients/tui/nmt-route-entry.h16
-rw-r--r--clients/tui/nmt-route-table.c16
-rw-r--r--clients/tui/nmt-route-table.h16
-rw-r--r--clients/tui/nmt-slave-list.c16
-rw-r--r--clients/tui/nmt-slave-list.h16
-rw-r--r--clients/tui/nmt-utils.c16
-rw-r--r--clients/tui/nmt-utils.h16
-rw-r--r--clients/tui/nmt-widget-list.c16
-rw-r--r--clients/tui/nmt-widget-list.h16
-rw-r--r--clients/tui/nmtui-connect.c16
-rw-r--r--clients/tui/nmtui-connect.h16
-rw-r--r--clients/tui/nmtui-edit.c16
-rw-r--r--clients/tui/nmtui-edit.h16
-rw-r--r--clients/tui/nmtui-hostname.c16
-rw-r--r--clients/tui/nmtui-hostname.h16
-rw-r--r--clients/tui/nmtui.c16
-rw-r--r--clients/tui/nmtui.h16
182 files changed, 16856 insertions, 9013 deletions
diff --git a/clients/cli/agent.c b/clients/cli/agent.c
index 6c116153..f4057df9 100644
--- a/clients/cli/agent.c
+++ b/clients/cli/agent.c
@@ -1,22 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- *  nmcli - command-line tool for controlling NetworkManager
- *  Functions for running NM secret agent.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2014 Red Hat, Inc.
+ * Copyright (C) 2014 Red Hat, Inc.
  */
 
 #include "nm-default.h"
diff --git a/clients/cli/agent.h b/clients/cli/agent.h
index 70ea0d9b..aad56bba 100644
--- a/clients/cli/agent.h
+++ b/clients/cli/agent.h
@@ -1,22 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- *  nmcli - command-line tool for controlling NetworkManager
- *  Functions for running NM secret agent.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2014 Red Hat, Inc.
+ * Copyright (C) 2014 Red Hat, Inc.
  */
 
 #ifndef __NMC_AGENT_H__
diff --git a/clients/cli/common.c b/clients/cli/common.c
index 2fc8aaf6..04ccf8dc 100644
--- a/clients/cli/common.c
+++ b/clients/cli/common.c
@@ -1,22 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- *  nmcli - command-line tool for controlling NetworkManager
- *  Common functions and data shared between files.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2012 - 2018 Red Hat, Inc.
+ * Copyright (C) 2012 - 2018 Red Hat, Inc.
  */
 
 #include "nm-default.h"
@@ -1201,14 +1185,13 @@ nmc_parse_lldp_capabilities (guint value)
 static void
 command_done (GObject *object, GAsyncResult *res, gpointer user_data)
 {
-	GSimpleAsyncResult *simple = (GSimpleAsyncResult *)res;
+	GTask *task = G_TASK (res);
 	NmCli *nmc = user_data;
-	GError *error = NULL;
+	gs_free_error GError *error = NULL;
 
-	if (g_simple_async_result_propagate_error (simple, &error)) {
+	if (!g_task_propagate_boolean (task, &error)) {
 		nmc->return_value = error->code;
 		g_string_assign (nmc->return_text, error->message);
-		g_error_free (error);
 	}
 
 	if (!nmc->should_wait)
@@ -1216,40 +1199,42 @@ command_done (GObject *object, GAsyncResult *res, gpointer user_data)
 }
 
 typedef struct {
-	NmCli *nmc;
 	const NMCCommand *cmd;
 	int argc;
 	char **argv;
-	GSimpleAsyncResult *simple;
+	GTask *task;
 } CmdCall;
 
 static void
-call_cmd (NmCli *nmc, GSimpleAsyncResult *simple, const NMCCommand *cmd, int argc, char **argv);
+call_cmd (NmCli *nmc, GTask *task, const NMCCommand *cmd, int argc, char **argv);
 
 static void
 got_client (GObject *source_object, GAsyncResult *res, gpointer user_data)
 {
-	GError *error = NULL;
+	gs_unref_object GTask *task = NULL;
+	gs_free_error GError *error = NULL;
 	CmdCall *call = user_data;
-	NmCli *nmc = call->nmc;
+	NmCli *nmc;
+
+	task = g_steal_pointer (&call->task);
+	nmc = g_task_get_task_data (task);
 
 	nmc->should_wait--;
 	nmc->client = nm_client_new_finish (res, &error);
 
 	if (!nmc->client) {
-		g_simple_async_result_set_error (call->simple, NMCLI_ERROR, NMC_RESULT_ERROR_UNKNOWN,
-		                                 _("Error: Could not create NMClient object: %s."), error->message);
-		g_error_free (error);
-		g_simple_async_result_complete (call->simple);
+		g_task_return_new_error (task, NMCLI_ERROR, NMC_RESULT_ERROR_UNKNOWN,
+		                         _("Error: Could not create NMClient object: %s."),
+		                         error->message);
 	} else {
-		call_cmd (nmc, call->simple, call->cmd, call->argc, call->argv);
+		call_cmd (nmc, g_steal_pointer (&task), call->cmd, call->argc, call->argv);
 	}
 
 	g_slice_free (CmdCall, call);
 }
 
 static void
-call_cmd (NmCli *nmc, GSimpleAsyncResult *simple, const NMCCommand *cmd, int argc, char **argv)
+call_cmd (NmCli *nmc, GTask *task, const NMCCommand *cmd, int argc, char **argv)
 {
 	CmdCall *call;
 
@@ -1257,20 +1242,23 @@ call_cmd (NmCli *nmc, GSimpleAsyncResult *simple, const NMCCommand *cmd, int arg
 
 		/* Check whether NetworkManager is running */
 		if (cmd->needs_nm_running && !nm_client_get_nm_running (nmc->client)) {
-			g_simple_async_result_set_error (simple, NMCLI_ERROR, NMC_RESULT_ERROR_NM_NOT_RUNNING,
-			                                 _("Error: NetworkManager is not running."));
-		} else
+			g_task_return_new_error (task, NMCLI_ERROR, NMC_RESULT_ERROR_NM_NOT_RUNNING,
+			                         _("Error: NetworkManager is not running."));
+		} else {
 			nmc->return_value = cmd->func (nmc, argc, argv);
-		g_simple_async_result_complete_in_idle (simple);
-		g_object_unref (simple);
+			g_task_return_boolean (task, TRUE);
+		}
+
+		g_object_unref (task);
 	} else {
+		nm_assert (nmc->client == NULL);
+
 		nmc->should_wait++;
 		call = g_slice_new0 (CmdCall);
-		call->nmc = nmc;
 		call->cmd = cmd;
 		call->argc = argc;
 		call->argv = argv;
-		call->simple = simple;
+		call->task = task;
 		nm_client_new_async (NULL, got_client, call);
 	}
 }
@@ -1306,16 +1294,13 @@ void
 nmc_do_cmd (NmCli *nmc, const NMCCommand cmds[], const char *cmd, int argc, char **argv)
 {
 	const NMCCommand *c;
-	GSimpleAsyncResult *simple;
+	gs_unref_object GTask *task = NULL;
 
-	simple = g_simple_async_result_new (NULL,
-	                                    command_done,
-	                                    nmc,
-	                                    nmc_do_cmd);
+	task = nm_g_task_new (NULL, NULL, nmc_do_cmd, command_done, nmc);
+	g_task_set_task_data (task, nmc, NULL);
 
 	if (argc == 0 && nmc->complete) {
-		g_simple_async_result_complete_in_idle (simple);
-		g_object_unref (simple);
+		g_task_return_boolean (task, TRUE);
 		return;
 	}
 
@@ -1325,8 +1310,7 @@ nmc_do_cmd (NmCli *nmc, const NMCCommand cmds[], const char *cmd, int argc, char
 				g_print ("%s\n", c->cmd);
 		}
 		nmc_complete_help (cmd);
-		g_simple_async_result_complete_in_idle (simple);
-		g_object_unref (simple);
+		g_task_return_boolean (task, TRUE);
 		return;
 	}
 
@@ -1341,32 +1325,26 @@ nmc_do_cmd (NmCli *nmc, const NMCCommand cmds[], const char *cmd, int argc, char
 			nmc_complete_help (*(argv+1));
 		if (!nmc->complete && c->usage && nmc_arg_is_help (*(argv+1))) {
 			c->usage ();
-			g_simple_async_result_complete_in_idle (simple);
-			g_object_unref (simple);
+			g_task_return_boolean (task, TRUE);
 		} else {
-			call_cmd (nmc, simple, c, argc, argv);
+			call_cmd (nmc, g_steal_pointer (&task), c, argc, argv);
 		}
 	} else if (cmd) {
 		/* Not a known command. */
 		if (nmc_arg_is_help (cmd) && c->usage) {
 			c->usage ();
-			g_simple_async_result_complete_in_idle (simple);
-			g_object_unref (simple);
+			g_task_return_boolean (task, TRUE);
 		} else {
-			g_simple_async_result_set_error (simple, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
-			                                 _("Error: argument '%s' not understood. Try passing --help instead."), cmd);
-			g_simple_async_result_complete_in_idle (simple);
-			g_object_unref (simple);
+			g_task_return_new_error (task, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
+			                         _("Error: argument '%s' not understood. Try passing --help instead."), cmd);
 		}
 	} else if (c->func) {
 		/* No command, run the default handler. */
-		call_cmd (nmc, simple, c, argc, argv);
+		call_cmd (nmc, g_steal_pointer (&task), c, argc, argv);
 	} else {
 		/* No command and no default handler. */
-		g_simple_async_result_set_error (simple, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
-		                                 _("Error: missing argument. Try passing --help."));
-		g_simple_async_result_complete_in_idle (simple);
-		g_object_unref (simple);
+		g_task_return_new_error (task, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
+		                         _("Error: missing argument. Try passing --help."));
 	}
 }
 
@@ -1434,10 +1412,56 @@ nmc_error_get_simple_message (GError *error)
 	/* Return a clear message instead of the obscure D-Bus policy error */
 	if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_ACCESS_DENIED))
 		return _("access denied");
+	if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN))
+		return _("NetworkManager is not running");
 	else
 		return error->message;
 }
 
+GVariant *
+nmc_dbus_call_sync (NmCli *nmc,
+                    const char *object_path,
+                    const char *interface_name,
+                    const char *method_name,
+                    GVariant *parameters,
+                    const GVariantType *reply_type,
+                    GError **error)
+{
+	gs_unref_object GDBusConnection *connection = NULL;
+	gs_free_error GError *local = NULL;
+	GVariant *result;
+
+	if (nmc->timeout == -1)
+		nmc->timeout = 90;
+
+	connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &local);
+	if (!connection) {
+		g_set_error (error,
+		             NMCLI_ERROR,
+		             NMC_RESULT_ERROR_UNKNOWN,
+		             _("Error: error connecting to system bus: %s"),
+		             local->message);
+		return NULL;
+	}
+
+	result = g_dbus_connection_call_sync (connection,
+	                                      "org.freedesktop.NetworkManager",
+	                                      object_path,
+	                                      interface_name,
+	                                      method_name,
+	                                      parameters,
+	                                      reply_type,
+	                                      G_DBUS_CALL_FLAGS_NONE,
+	                                      nmc->timeout * 1000,
+	                                      NULL,
+	                                      error);
+
+	if (error && *error)
+		g_dbus_error_strip_remote_error (*error);
+
+	return result;
+}
+
 /*****************************************************************************/
 
 NM_UTILS_LOOKUP_STR_DEFINE (nm_connectivity_to_string, NMConnectivityState,
diff --git a/clients/cli/common.h b/clients/cli/common.h
index 688f2819..f8fad8c6 100644
--- a/clients/cli/common.h
+++ b/clients/cli/common.h
@@ -1,22 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- *  nmcli - command-line tool for controlling NetworkManager
- *  Common functions and data shared between files.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2012 - 2014 Red Hat, Inc.
+ * Copyright (C) 2012 - 2014 Red Hat, Inc.
  */
 
 #ifndef NMC_COMMON_H
@@ -102,4 +86,12 @@ extern const NmcMetaGenericInfo *const metagen_dhcp_config[];
 
 const char *nm_connectivity_to_string (NMConnectivityState connectivity);
 
+GVariant *nmc_dbus_call_sync (NmCli *nmc,
+                              const char *object_path,
+                              const char *interface_name,
+                              const char *method_name,
+                              GVariant *parameters,
+                              const GVariantType *reply_type,
+                              GError **error);
+
 #endif /* NMC_COMMON_H */
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index e365980e..a77c2482 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -1,20 +1,6 @@
-/* nmcli - command-line tool to control NetworkManager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2010 - 2018 Red Hat, Inc.
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2010 - 2018 Red Hat, Inc.
  */
 
 #include "nm-default.h"
@@ -657,6 +643,7 @@ _metagen_con_active_general_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 	case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_UUID:
 		return nm_active_connection_get_uuid (ac);
 	case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEVICES:
+	case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_IP_IFACE:
 		{
 			GString *str = NULL;
 			const GPtrArray *devices;
@@ -665,10 +652,15 @@ _metagen_con_active_general_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 			devices = nm_active_connection_get_devices (ac);
 			if (devices) {
 				for (i = 0; i < devices->len; i++) {
-					NMDevice *device = devices->pdata[i];
+					NMDevice *device = g_ptr_array_index (devices, i);
 					const char *iface;
 
-					iface = nm_device_get_iface (device);
+					if (info->info_type == NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEVICES) {
+						iface = nm_device_get_iface (device);
+					} else {
+						iface = nm_device_get_ip_iface (device);
+					}
+
 					if (!iface)
 						continue;
 					if (!s) {
@@ -720,6 +712,7 @@ const NmcMetaGenericInfo *const metagen_con_active_general[_NMC_GENERIC_INFO_TYP
 	_METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_NAME,        "NAME"),
 	_METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_UUID,        "UUID"),
 	_METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEVICES,     "DEVICES"),
+	_METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_IP_IFACE,    "IP-IFACE"),
 	_METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_STATE,       "STATE"),
 	_METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEFAULT,     "DEFAULT"),
 	_METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEFAULT6,    "DEFAULT6"),
@@ -2933,7 +2926,8 @@ do_connection_up (NmCli *nmc, int argc, char **argv)
 			pwds = *argv;
 		}
 		else if (!nmc->complete) {
-			g_printerr (_("Unknown parameter: %s\n"), *argv);
+			g_string_printf (nmc->return_text, _("Error: invalid extra argument '%s'."), *argv);
+			return NMC_RESULT_ERROR_USER_INPUT;
 		}
 
 		next_arg (nmc, &argc, &argv, NULL);
@@ -3135,7 +3129,7 @@ do_connection_down (NmCli *nmc, int argc, char **argv)
 		}
 		if (arg_num == 0) {
 			g_string_printf (nmc->return_text, _("Error: No connection specified."));
-			NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT);
+			return NMC_RESULT_ERROR_USER_INPUT;
 		}
 	}
 
@@ -3153,7 +3147,7 @@ do_connection_down (NmCli *nmc, int argc, char **argv)
 			arg_ptr++;
 			if (!arg_num) {
 				g_string_printf (nmc->return_text, _("Error: %s argument is missing."), selector);
-				NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT);
+				return NMC_RESULT_ERROR_USER_INPUT;
 			}
 		}
 
@@ -3174,7 +3168,7 @@ do_connection_down (NmCli *nmc, int argc, char **argv)
 
 	if (!found_active_cons) {
 		g_string_printf (nmc->return_text, _("Error: no active connection provided."));
-		NMC_RETURN (nmc, NMC_RESULT_ERROR_NOT_FOUND);
+		return NMC_RESULT_ERROR_NOT_FOUND;
 	}
 	nm_assert (found_active_cons->len > 0);
 
@@ -3320,6 +3314,21 @@ get_valid_settings_array (const char *con_type)
 	return NULL;
 }
 
+static char *
+_construct_property_name (const char *setting_name,
+                          const char *property_name,
+                          NMMetaAccessorModifier modifier)
+{
+	return g_strdup_printf ("%s%s.%s\n",
+	                        (  modifier == NM_META_ACCESSOR_MODIFIER_ADD
+	                         ? "+"
+	                         : (  modifier == NM_META_ACCESSOR_MODIFIER_DEL
+	                            ? "-"
+	                            : "")),
+	                        setting_name,
+	                        property_name);
+}
+
 /* get_valid_properties_string:
  * @array: base properties for the current connection type
  * @array_slv: slave properties (or ipv4/ipv6 ones) for the current connection type
@@ -3337,7 +3346,7 @@ get_valid_settings_array (const char *con_type)
 static char *
 get_valid_properties_string (const NMMetaSettingValidPartItem *const*array,
                              const NMMetaSettingValidPartItem *const*array_slv,
-                             char modifier,
+                             NMMetaAccessorModifier modifier,
                              const char *prefix,
                              const char *postfix)
 {
@@ -3379,32 +3388,26 @@ get_valid_properties_string (const NMMetaSettingValidPartItem *const*array,
 
 			/* Search the array with the arguments of the current property */
 			for (j = 0; j < setting_info->properties_num; j++) {
-				char *new;
+				gs_free char *ss1 = NULL;
 				const char *arg_name;
 
 				arg_name = setting_info->properties[j]->property_name;
 
 				/* If required, expand the alias too */
-				if (!postfix && setting_info->alias) {
-					if (modifier)
-						g_string_append_c (str, modifier);
-					new = g_strdup_printf ("%s.%s\n",
-					                       setting_info->alias,
-					                       arg_name);
-					g_string_append (str, new);
-					g_free (new);
+				if (   !postfix
+				    && setting_info->alias) {
+					gs_free char *ss2 = NULL;
+
+					ss2 = _construct_property_name (setting_info->alias, arg_name, modifier);
+					g_string_append (str, ss2);
 				}
 
-				if (postfix && !g_str_has_prefix (arg_name, postfix))
+				if (   postfix
+				    && !g_str_has_prefix (arg_name, postfix))
 					continue;
 
-				if (modifier)
-					g_string_append_c (str, modifier);
-				new = g_strdup_printf ("%s.%s\n",
-				                       prop_name,
-				                       arg_name);
-				g_string_append (str, new);
-				g_free (new);
+				ss1 = _construct_property_name (prop_name, arg_name, modifier);
+				g_string_append (str, ss1);
 			}
 		}
 	}
@@ -3723,50 +3726,56 @@ static char *
 unique_master_iface_ifname (const GPtrArray *connections,
                             const char *try_name)
 {
-	NMConnection *connection;
 	char *new_name;
-	unsigned num = 1;
-	int i = 0;
-	const char *ifname = NULL;
+	guint num = 0;
+	guint i;
 
 	new_name = g_strdup (try_name);
-	while (i < connections->len) {
-		connection = NM_CONNECTION (connections->pdata[i]);
-		ifname = nm_connection_get_interface_name (connection);
-		if (g_strcmp0 (new_name, ifname) == 0) {
+
+again:
+	for (i = 0; i < connections->len; i++) {
+		NMConnection *connection = connections->pdata[i];
+
+		if (nm_streq0 (new_name, nm_connection_get_interface_name (connection))) {
+			num++;
 			g_free (new_name);
-			new_name = g_strdup_printf ("%s%d", try_name, num++);
-			i = 0;
-		} else
-			i++;
+			new_name = g_strdup_printf ("%s%u", try_name, num);
+			goto again;
+		}
 	}
 	return new_name;
 }
 
 static void
-set_default_interface_name (NmCli *nmc, NMSettingConnection *s_con)
+set_default_interface_name (NmCli *nmc,
+                            NMSettingConnection *s_con)
 {
-	const GPtrArray *connections;
-	char *ifname = NULL;
-	const char *con_type = nm_setting_connection_get_connection_type (s_con);
+	const char *default_name;
+	const char *con_type;
 
 	if (nm_setting_connection_get_interface_name (s_con))
 		return;
 
-	connections = nm_client_get_connections (nmc->client);
+	con_type = nm_setting_connection_get_connection_type (s_con);
 
 	/* Set a sensible bond/team/bridge interface name by default */
-	if (g_strcmp0 (con_type, NM_SETTING_BOND_SETTING_NAME) == 0)
-		ifname = unique_master_iface_ifname (connections, "nm-bond");
-	else if (g_strcmp0 (con_type, NM_SETTING_TEAM_SETTING_NAME) == 0)
-		ifname = unique_master_iface_ifname (connections, "nm-team");
-	else if (g_strcmp0 (con_type, NM_SETTING_BRIDGE_SETTING_NAME) == 0)
-		ifname = unique_master_iface_ifname (connections, "nm-bridge");
+	if (nm_streq0 (con_type, NM_SETTING_BOND_SETTING_NAME))
+		default_name = "nm-bond";
+	else if (nm_streq0 (con_type, NM_SETTING_TEAM_SETTING_NAME))
+		default_name = "nm-team";
+	else if (nm_streq0 (con_type, NM_SETTING_BRIDGE_SETTING_NAME))
+		default_name = "nm-bridge";
 	else
-		return;
+		default_name = NULL;
+
+	if (default_name) {
+		const GPtrArray *connections;
+		gs_free char *ifname = NULL;
 
-	g_object_set (s_con, NM_SETTING_CONNECTION_INTERFACE_NAME, ifname, NULL);
-	g_free (ifname);
+		connections = nm_client_get_connections (nmc->client);
+		ifname = unique_master_iface_ifname (connections, default_name);
+		g_object_set (s_con, NM_SETTING_CONNECTION_INTERFACE_NAME, ifname, NULL);
+	}
 }
 
 /*****************************************************************************/
@@ -4004,7 +4013,7 @@ set_property (NMClient *client,
               const char *setting_name,
               const char *property,
               const char *value,
-              char modifier,
+              NMMetaAccessorModifier modifier,
               GError **error)
 {
 	gs_free char *property_name = NULL;
@@ -4012,7 +4021,9 @@ set_property (NMClient *client,
 	NMSetting *setting;
 
 	nm_assert (setting_name && setting_name[0]);
-	nm_assert (NM_IN_SET (modifier, '\0', '+', '-'));
+	nm_assert (NM_IN_SET (modifier, NM_META_ACCESSOR_MODIFIER_SET,
+	                                NM_META_ACCESSOR_MODIFIER_ADD,
+	                                NM_META_ACCESSOR_MODIFIER_DEL));
 
 	setting = nm_connection_get_setting_by_name (connection, setting_name);
 	if (!setting) {
@@ -4032,14 +4043,15 @@ set_property (NMClient *client,
 	if (!nmc_setting_set_property (client,
 	                               setting,
 	                               property_name,
-	                               (  (modifier == '-' && !value)
-	                                ? '\0'
+	                               (  (   modifier == NM_META_ACCESSOR_MODIFIER_DEL
+	                                   && !value)
+	                                ? NM_META_ACCESSOR_MODIFIER_SET
 	                                : modifier),
 	                               value,
 	                               &local)) {
 		g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
 		             _("Error: failed to %s %s.%s: %s."),
-		             (  modifier != '-'
+		             (  modifier != NM_META_ACCESSOR_MODIFIER_DEL
 		              ? "modify"
 		              : "remove a value from"),
 		             setting_name,
@@ -4069,8 +4081,15 @@ set_option (NmCli *nmc, NMConnection *connection, const NMMetaAbstractInfo *abst
 	if (option && option->check_and_set) {
 		return option->check_and_set (nmc, connection, option, value, error);
 	} else if (value) {
-		return set_property (nmc->client, connection, setting_name, property_name,
-		                     value, inf_flags & NM_META_PROPERTY_INF_FLAG_MULTI ? '+' : '\0', error);
+		return set_property (nmc->client,
+		                     connection,
+		                     setting_name,
+		                     property_name,
+		                     value,
+		                       inf_flags & NM_META_PROPERTY_INF_FLAG_MULTI
+		                     ? NM_META_ACCESSOR_MODIFIER_ADD
+		                     : NM_META_ACCESSOR_MODIFIER_SET,
+		                     error);
 	} else if (inf_flags & NM_META_PROPERTY_INF_FLAG_REQD) {
 		g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
 	                     _("Error: '%s' is mandatory."), option_name);
@@ -4191,9 +4210,13 @@ set_connection_type (NmCli *nmc, NMConnection *con, const OptionInfo *option, co
 	}
 
 	if (slave_type) {
-		if (!set_property (nmc->client, con, NM_SETTING_CONNECTION_SETTING_NAME,
-		                   NM_SETTING_CONNECTION_SLAVE_TYPE, slave_type,
-		                   '\0', error)) {
+		if (!set_property (nmc->client,
+		                   con,
+		                   NM_SETTING_CONNECTION_SETTING_NAME,
+		                   NM_SETTING_CONNECTION_SLAVE_TYPE,
+		                   slave_type,
+		                   NM_META_ACCESSOR_MODIFIER_SET,
+		                   error)) {
 			return FALSE;
 		}
 		enable_options (NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_MASTER, master);
@@ -4208,7 +4231,13 @@ set_connection_type (NmCli *nmc, NMConnection *con, const OptionInfo *option, co
 		                 NM_SETTING_CONNECTION_INTERFACE_NAME);
 	}
 
-	if (!set_property (nmc->client, con, option->setting_info->general->setting_name, option->property, value, '\0', error))
+	if (!set_property (nmc->client,
+	                   con,
+	                   option->setting_info->general->setting_name,
+	                   option->property,
+	                   value,
+	                   NM_META_ACCESSOR_MODIFIER_SET,
+	                   error))
 		return FALSE;
 
 	if (!con_settings (con, &type_settings, &slv_settings, error))
@@ -4237,7 +4266,13 @@ set_connection_iface (NmCli *nmc, NMConnection *con, const OptionInfo *option, c
 		}
 	}
 
-	return set_property (nmc->client, con, option->setting_info->general->setting_name, option->property, value, '\0', error);
+	return set_property (nmc->client,
+	                     con,
+	                     option->setting_info->general->setting_name,
+	                     option->property,
+	                     value,
+	                     NM_META_ACCESSOR_MODIFIER_SET,
+	                     error);
 }
 
 static gboolean
@@ -4260,13 +4295,23 @@ set_connection_master (NmCli *nmc, NMConnection *con, const OptionInfo *option,
 	connections = nm_client_get_connections (nmc->client);
 	value = normalized_master_for_slave (connections, value, slave_type, &slave_type);
 
-	if (!set_property (nmc->client, con, NM_SETTING_CONNECTION_SETTING_NAME,
-	                   NM_SETTING_CONNECTION_SLAVE_TYPE, slave_type,
-	                   '\0', error)) {
+	if (!set_property (nmc->client,
+	                   con,
+	                   NM_SETTING_CONNECTION_SETTING_NAME,
+	                   NM_SETTING_CONNECTION_SLAVE_TYPE,
+	                   slave_type,
+	                   NM_META_ACCESSOR_MODIFIER_SET,
+	                   error)) {
 		return FALSE;
 	}
 
-	return set_property (nmc->client, con, option->setting_info->general->setting_name, option->property, value, '\0', error);
+	return set_property (nmc->client,
+	                     con,
+	                     option->setting_info->general->setting_name,
+	                     option->property,
+	                     value,
+	                     NM_META_ACCESSOR_MODIFIER_SET,
+	                     error);
 }
 
 static gboolean
@@ -4380,7 +4425,13 @@ set_bluetooth_type (NmCli *nmc, NMConnection *con, const OptionInfo *option, con
 		return FALSE;
 	}
 
-	return set_property (nmc->client, con, option->setting_info->general->setting_name, option->property, value, '\0', error);
+	return set_property (nmc->client,
+	                     con,
+	                     option->setting_info->general->setting_name,
+	                     option->property,
+	                     value,
+	                     NM_META_ACCESSOR_MODIFIER_SET,
+	                     error);
 }
 
 static gboolean
@@ -4399,8 +4450,13 @@ set_ip4_address (NmCli *nmc, NMConnection *con, const OptionInfo *option, const
 		              NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_MANUAL,
 		              NULL);
 	}
-	return set_property (nmc->client, con, option->setting_info->general->setting_name, option->property, value,
-	                     '+', error);
+	return set_property (nmc->client,
+	                     con,
+	                     option->setting_info->general->setting_name,
+	                     option->property,
+	                     value,
+	                     NM_META_ACCESSOR_MODIFIER_ADD,
+	                     error);
 }
 
 static gboolean
@@ -4419,8 +4475,13 @@ set_ip6_address (NmCli *nmc, NMConnection *con, const OptionInfo *option, const
 		              NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_MANUAL,
 		              NULL);
 	}
-	return set_property (nmc->client, con, option->setting_info->general->setting_name, option->property, value,
-	                     '+', error);
+	return set_property (nmc->client,
+	                     con,
+	                     option->setting_info->general->setting_name,
+	                     option->property,
+	                     value,
+	                     NM_META_ACCESSOR_MODIFIER_ADD,
+	                     error);
 }
 
 /*****************************************************************************/
@@ -4492,7 +4553,7 @@ option_relevant (NMConnection *connection, const NMMetaAbstractInfo *abstract_in
 
 static void
 complete_property_name (NmCli *nmc, NMConnection *connection,
-                        char modifier,
+                        NMMetaAccessorModifier modifier,
                         const char *prefix,
                         const char *postfix)
 {
@@ -4515,7 +4576,7 @@ complete_property_name (NmCli *nmc, NMConnection *connection,
 	if (word_list)
 		g_print ("%s", word_list);
 
-	if (modifier != '\0')
+	if (modifier != NM_META_ACCESSOR_MODIFIER_SET)
 		return;
 
 	for (s = 0; s < _NM_META_SETTING_TYPE_NUM; s++) {
@@ -4644,20 +4705,18 @@ nmc_read_connection_properties (NmCli *nmc,
                                 char ***argv,
                                 GError **error)
 {
-	const char *option;
-	const char *value = NULL;
-	GError *local = NULL;
-
 	/* First check if we have a slave-type, as this would mean we will not
 	 * have ip properties but possibly others, slave-type specific.
 	 */
 	/* Go through arguments and set properties */
 	do {
-		const NMMetaAbstractInfo *chosen = NULL;
-		gs_strfreev char **strv = NULL;
 		const NMMetaSettingValidPartItem *const*type_settings;
 		const NMMetaSettingValidPartItem *const*slv_settings;
-		char modifier = '\0';
+		NMMetaAccessorModifier modifier;
+		const char *option_orig;
+		const char *option;
+		const char *value = NULL;
+		const char *tmp;
 
 		if (!con_settings (connection, &type_settings, &slv_settings, error))
 			return FALSE;
@@ -4665,54 +4724,58 @@ nmc_read_connection_properties (NmCli *nmc,
 		ensure_settings (connection, slv_settings);
 		ensure_settings (connection, type_settings);
 
-		option = **argv;
-		if (!option) {
+		option_orig = **argv;
+		if (!option_orig) {
 			g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
 			                     _("Error: <setting>.<property> argument is missing."));
 			return FALSE;
 		}
 
-		if (option[0] == '+' || option[0] == '-')
-			modifier = *option;
+		switch (option_orig[0]) {
+		case '+': modifier = NM_META_ACCESSOR_MODIFIER_ADD; option = &option_orig[1]; break;
+		case '-': modifier = NM_META_ACCESSOR_MODIFIER_DEL; option = &option_orig[1]; break;
+		default:  modifier = NM_META_ACCESSOR_MODIFIER_SET; option = option_orig;     break;
+		}
+
+		if ((tmp = strchr (option, '.'))) {
+			gs_free char *option_sett = g_strndup (option, tmp - option);
+			const char *option_prop = &tmp[1];
+			const char *option_sett_expanded;
+			GError *local = NULL;
 
-		strv = g_strsplit (option, ".", 2);
-		if (g_strv_length (strv) == 2) {
 			/* This seems like a <setting>.<property> (such as "connection.id" or "bond.mode"),
 			 * optionally prefixed with "+| or "-". */
-			char *setting = strv[0];
-			const char *setting_name;
 
-			if (modifier)
-				setting++;
+			if (   *argc == 1
+			    && nmc->complete)
+				complete_property_name (nmc, connection, modifier, option_sett, option_prop);
 
-			if (*argc == 1 && nmc->complete)
-				complete_property_name (nmc, connection, modifier, setting, strv[1]);
-
-			setting_name = check_valid_name (setting, type_settings, slv_settings, &local);
-			if (!setting_name) {
+			option_sett_expanded = check_valid_name (option_sett, type_settings, slv_settings, &local);
+			if (!option_sett_expanded) {
 				g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
 				             _("Error: invalid or not allowed setting '%s': %s."),
-				             setting, local->message);
+				             option_sett, local->message);
 				g_clear_error (&local);
 				return FALSE;
 			}
 
 			(*argc)--;
 			(*argv)++;
-			if (!get_value (&value, argc, argv, option, error))
+			if (!get_value (&value, argc, argv, option_orig, error))
 				return FALSE;
 
 			if (!*argc && nmc->complete) {
-				complete_property (nmc, setting, strv[1], value ?: "", connection);
+				complete_property (nmc, option_sett, option_prop, value ?: "", connection);
 				return TRUE;
 			}
 
-			if (!set_property (nmc->client, connection, setting_name, strv[1], value, modifier, error))
+			if (!set_property (nmc->client, connection, option_sett_expanded, option_prop, value, modifier, error))
 				return FALSE;
 		} else {
-			NMMetaSettingType s;
+			const NMMetaAbstractInfo *chosen = NULL;
 			const char *chosen_setting_name = NULL;
 			const char *chosen_option = NULL;
+			NMMetaSettingType s;
 
 			/* Let's see if this is an property alias (such as "id", "mode", "type" or "con-name")*/
 			for (s = 0; s < _NM_META_SETTING_TYPE_NUM; s++) {
@@ -4768,8 +4831,6 @@ nmc_read_connection_properties (NmCli *nmc,
 			}
 
 			if (!chosen) {
-				if (modifier)
-					option++;
 				if (*argc == 1 && nmc->complete)
 					complete_property_name (nmc, connection, modifier, option, NULL);
 				g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
@@ -4782,7 +4843,7 @@ nmc_read_connection_properties (NmCli *nmc,
 
 			(*argc)--;
 			(*argv)++;
-			if (!get_value (&value, argc, argv, option, error))
+			if (!get_value (&value, argc, argv, option_orig, error))
 				return FALSE;
 
 			if (!*argc && nmc->complete)
@@ -5270,11 +5331,12 @@ read_properties:
 		const char *ifname = nm_setting_connection_get_interface_name (s_con);
 		const char *type = nm_setting_connection_get_connection_type (s_con);
 		const char *slave_type = nm_setting_connection_get_slave_type (s_con);
-		char *try_name, *default_name;
 
 		/* If only bother when there's a type, which is not guaranteed at this point.
 		 * Otherwise the validation will fail anyway. */
 		if (type) {
+			gs_free char *try_name = NULL;
+			gs_free char *default_name = NULL;
 			const GPtrArray *connections;
 
 			connections = nm_client_get_connections (nmc->client);
@@ -5282,9 +5344,7 @@ read_properties:
 			           ? g_strdup_printf ("%s-%s", get_name_alias_toplevel (type, slave_type), ifname)
 			           : g_strdup (get_name_alias_toplevel (type, slave_type));
 			default_name = nmc_unique_connection_name (connections, try_name);
-			g_free (try_name);
 			g_object_set (s_con, NM_SETTING_CONNECTION_ID, default_name, NULL);
-			g_free (default_name);
 		}
 	}
 
@@ -6980,8 +7040,8 @@ property_edit_submenu (NmCli *nmc,
 			                                       curr_setting,
 			                                       prop_name,
 			                                         (cmdsub == NMC_EDITOR_SUB_CMD_SET)
-			                                       ? '\0'
-			                                       : '+',
+			                                       ? NM_META_ACCESSOR_MODIFIER_SET
+			                                       : NM_META_ACCESSOR_MODIFIER_ADD,
 			                                       prop_val_user,
 			                                       &tmp_err);
 			if (!set_result) {
@@ -6997,7 +7057,12 @@ property_edit_submenu (NmCli *nmc,
 			                              _("Edit '%s' value: "),
 			                              prop_name);
 
-			if (!nmc_setting_set_property (nmc->client, curr_setting, prop_name, '\0', prop_val_user, &tmp_err)) {
+			if (!nmc_setting_set_property (nmc->client,
+			                               curr_setting,
+			                               prop_name,
+			                               NM_META_ACCESSOR_MODIFIER_SET,
+			                               prop_val_user,
+			                               &tmp_err)) {
 				g_print (_("Error: failed to set '%s' property: %s\n"), prop_name, tmp_err->message);
 				g_clear_error (&tmp_err);
 			}
@@ -7008,8 +7073,8 @@ property_edit_submenu (NmCli *nmc,
 			                               curr_setting,
 			                               prop_name,
 			                               (  cmd_property_arg
-			                                ? '-'
-			                                : '\0'),
+			                                ? NM_META_ACCESSOR_MODIFIER_DEL
+			                                : NM_META_ACCESSOR_MODIFIER_SET),
 			                               cmd_property_arg,
 			                               &tmp_err)) {
 				g_print (_("Error: %s\n"), tmp_err->message);
@@ -7363,7 +7428,12 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 					                              _("Enter '%s' value: "),
 					                              prop_name);
 
-					if (!nmc_setting_set_property (nmc->client, menu_ctx.curr_setting, prop_name, '+', prop_val_user, &tmp_err)) {
+					if (!nmc_setting_set_property (nmc->client,
+					                               menu_ctx.curr_setting,
+					                               prop_name,
+					                               NM_META_ACCESSOR_MODIFIER_ADD,
+					                               prop_val_user,
+					                               &tmp_err)) {
 						g_print (_("Error: failed to set '%s' property: %s\n"), prop_name, tmp_err->message);
 						g_clear_error (&tmp_err);
 					}
@@ -7427,7 +7497,9 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 				if (!nmc_setting_set_property (nmc->client,
 				                               ss,
 				                               prop_name,
-				                               cmd_arg_v ? '+' : '\0',
+				                                 cmd_arg_v
+				                               ? NM_META_ACCESSOR_MODIFIER_ADD
+				                               : NM_META_ACCESSOR_MODIFIER_SET,
 				                               cmd_arg_v,
 				                               &tmp_err)) {
 					g_print (_("Error: failed to set '%s' property: %s\n"),
@@ -7526,7 +7598,12 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 					if (!prop_name)
 						break;
 
-					if (!nmc_setting_set_property (nmc->client, menu_ctx.curr_setting, prop_name, '\0', NULL, &tmp_err)) {
+					if (!nmc_setting_set_property (nmc->client,
+					                               menu_ctx.curr_setting,
+					                               prop_name,
+					                               NM_META_ACCESSOR_MODIFIER_SET,
+					                               NULL,
+					                               &tmp_err)) {
 						g_print (_("Error: failed to remove value of '%s': %s\n"), prop_name,
 						         tmp_err->message);
 						g_clear_error (&tmp_err);
@@ -7572,11 +7649,16 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 					}
 				} else {
 					gs_free char *prop_name = NULL;
-					gs_free GError *tmp_err = NULL;
+					gs_free_error GError *tmp_err = NULL;
 
 					prop_name = is_property_valid (ss, cmd_arg_p, &tmp_err);
 					if (prop_name) {
-						if (!nmc_setting_set_property (nmc->client, ss, prop_name, '\0', NULL, &tmp_err)) {
+						if (!nmc_setting_set_property (nmc->client,
+						                               ss,
+						                               prop_name,
+						                               NM_META_ACCESSOR_MODIFIER_SET,
+						                               NULL,
+						                               &tmp_err)) {
 							g_print (_("Error: failed to remove value of '%s': %s\n"),
 							         prop_name,
 							         tmp_err->message);
@@ -7931,6 +8013,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 				ap_nsp = ap_nsp && ap_nsp[0] == '/' ? ap_nsp + 1 : ap_nsp;
 
 			if (is_connection_dirty (connection, rem_con)) {
+				/* TRANSLATORS: do not translate 'save', leave it as it is */
 				g_print (_("Error: connection is not saved. Type 'save' first.\n"));
 				break;
 			}
@@ -8220,7 +8303,7 @@ do_connection_edit (NmCli *nmc, int argc, char **argv)
 	else {
 		if (!nmc_parse_args (exp_args, TRUE, &argc, &argv, &error)) {
 			g_string_assign (nmc->return_text, error->message);
-			NMC_RETURN (nmc, error->code);
+			return error->code;
 		}
 	}
 
@@ -8250,7 +8333,7 @@ do_connection_edit (NmCli *nmc, int argc, char **argv)
 		} else {
 			g_string_printf (nmc->return_text,
 			                 _("Error: only one of 'id', 'filename', uuid, or 'path' can be provided."));
-			NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT);
+			return NMC_RESULT_ERROR_USER_INPUT;
 		}
 	}
 
@@ -8264,7 +8347,7 @@ do_connection_edit (NmCli *nmc, int argc, char **argv)
 
 		if (!found_con) {
 			g_string_printf (nmc->return_text, _("Error: Unknown connection '%s'."), con);
-			NMC_RETURN (nmc, NMC_RESULT_ERROR_NOT_FOUND);
+			return NMC_RESULT_ERROR_NOT_FOUND;
 		}
 
 		/* Duplicate the connection and use that so that we need not
@@ -8354,10 +8437,13 @@ do_connection_edit (NmCli *nmc, int argc, char **argv)
 	else
 		g_print (_("Adding a new '%s' connection"), connection_type);
 	g_print ("\n\n");
+	/* TRANSLATORS: do not translate 'help', leave it as it is */
 	g_print (_("Type 'help' or '?' for available commands."));
 	g_print ("\n");
+	/* TRANSLATORS: do not translate 'print', leave it as it is */
 	g_print (_("Type 'print' to show all the connection properties."));
 	g_print ("\n");
+	/* TRANSLATORS: do not translate 'describe', leave it as it is */
 	g_print (_("Type 'describe [<setting>.<prop>]' for detailed property description."));
 	g_print ("\n\n");
 
@@ -8418,7 +8504,7 @@ do_connection_modify (NmCli *nmc,
 	connection = get_connection (nmc, &argc, &argv, NULL, NULL, NULL, &error);
 	if (!connection) {
 		g_string_printf (nmc->return_text, _("Error: %s."), error->message);
-		NMC_RETURN (nmc, error->code);
+		return error->code;
 	}
 
 	rc = nm_client_get_connection_by_uuid (nmc->client,
@@ -8426,12 +8512,12 @@ do_connection_modify (NmCli *nmc,
 	if (!rc) {
 		g_string_printf (nmc->return_text, _("Error: Unknown connection '%s'."),
 		                 nm_connection_get_uuid (connection));
-		NMC_RETURN (nmc, NMC_RESULT_ERROR_NOT_FOUND);
+		return NMC_RESULT_ERROR_NOT_FOUND;
 	}
 
 	if (!nmc_read_connection_properties (nmc, NM_CONNECTION (rc), &argc, &argv, &error)) {
 		g_string_assign (nmc->return_text, error->message);
-		NMC_RETURN (nmc, error->code);
+		return error->code;
 	}
 
 	if (nmc->complete)
@@ -8509,7 +8595,7 @@ do_connection_clone (NmCli *nmc, int argc, char **argv)
 	connection = get_connection (nmc, argc_ptr, argv_ptr, NULL, NULL, NULL, &error);
 	if (!connection) {
 		g_string_printf (nmc->return_text, _("Error: %s."), error->message);
-		NMC_RETURN (nmc, error->code);
+		return error->code;
 	}
 
 	if (nmc->complete)
@@ -8522,12 +8608,12 @@ do_connection_clone (NmCli *nmc, int argc, char **argv)
 		                                         _("New connection name: "));
 	} else {
 		g_string_printf (nmc->return_text, _("Error: <new name> argument is missing."));
-		NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT);
+		return NMC_RESULT_ERROR_USER_INPUT;
 	}
 
 	if (next_arg (nmc->ask ? NULL : nmc, argc_ptr, argv_ptr, NULL) == 0) {
 		g_string_printf (nmc->return_text, _("Error: unknown extra argument: '%s'."), *argv);
-		NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT);
+		return NMC_RESULT_ERROR_USER_INPUT;
 	}
 
 	new_connection = nm_simple_connection_new_clone (connection);
@@ -8769,17 +8855,24 @@ do_connection_monitor (NmCli *nmc, int argc, char **argv)
 static NMCResultCode
 do_connection_reload (NmCli *nmc, int argc, char **argv)
 {
-	GError *error = NULL;
+	gs_unref_variant GVariant *result = NULL;
+	gs_free_error GError *error = NULL;
 
 	next_arg (nmc, &argc, &argv, NULL);
 	if (nmc->complete)
 		return nmc->return_value;
 
-	if (!nm_client_reload_connections (nmc->client, NULL, &error)) {
+	result = nmc_dbus_call_sync (nmc,
+	                             "/org/freedesktop/NetworkManager/Settings",
+	                             "org.freedesktop.NetworkManager.Settings",
+	                             "ReloadConnections",
+	                             g_variant_new ("()"),
+	                             G_VARIANT_TYPE("(b)"),
+	                             &error);
+	if (error) {
 		g_string_printf (nmc->return_text, _("Error: failed to reload connections: %s."),
 		                 nmc_error_get_simple_message (error));
 		nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
-		g_clear_error (&error);
 	}
 
 	return nmc->return_value;
@@ -8858,7 +8951,7 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
 			filename = nm_strstrip (filename_ask);
 		} else {
 			g_string_printf (nmc->return_text, _("Error: No arguments provided."));
-			NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT);
+			return NMC_RESULT_ERROR_USER_INPUT;
 		}
 	}
 
@@ -8874,7 +8967,7 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
 			argv++;
 			if (!argc) {
 				g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1));
-				NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT);
+				return NMC_RESULT_ERROR_USER_INPUT;
 			}
 
 			if (   argc == 1
@@ -8895,7 +8988,7 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
 			argv++;
 			if (!argc) {
 				g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1));
-				NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT);
+				return NMC_RESULT_ERROR_USER_INPUT;
 			}
 			if (argc == 1 && nmc->complete)
 				nmc->return_value = NMC_RESULT_COMPLETE_FILE;
@@ -8904,8 +8997,8 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
 			else
 				g_printerr (_("Warning: 'file' already specified, ignoring extra one.\n"));
 		} else {
-			g_string_printf (nmc->return_text, _("Unknown parameter: %s"), *argv);
-			NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT);
+			g_string_printf (nmc->return_text, _("Error: invalid extra argument '%s'."), *argv);
+			return NMC_RESULT_ERROR_USER_INPUT;
 		}
 
 		next_arg (nmc, &argc, &argv, NULL);
@@ -8916,11 +9009,11 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
 
 	if (!type) {
 		g_string_printf (nmc->return_text, _("Error: 'type' argument is required."));
-		NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT);
+		return NMC_RESULT_ERROR_USER_INPUT;
 	}
 	if (!filename) {
 		g_string_printf (nmc->return_text, _("Error: 'file' argument is required."));
-		NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT);
+		return NMC_RESULT_ERROR_USER_INPUT;
 	}
 
 	if (nm_streq (type, "wireguard"))
@@ -8929,7 +9022,7 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
 		service_type = nm_vpn_plugin_info_list_find_service_type (nm_vpn_get_plugin_infos (), type);
 		if (!service_type) {
 			g_string_printf (nmc->return_text, _("Error: failed to find VPN plugin for %s."), type);
-			NMC_RETURN (nmc, NMC_RESULT_ERROR_UNKNOWN);
+			return NMC_RESULT_ERROR_UNKNOWN;
 		}
 
 		/* Import VPN configuration */
@@ -8937,7 +9030,7 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
 		if (!plugin) {
 			g_string_printf (nmc->return_text, _("Error: failed to load VPN plugin: %s."),
 			                 error->message);
-			NMC_RETURN (nmc, NMC_RESULT_ERROR_UNKNOWN);
+			return NMC_RESULT_ERROR_UNKNOWN;
 		}
 
 		connection = nm_vpn_editor_plugin_import (plugin, filename, &error);
@@ -8946,7 +9039,7 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
 	if (!connection) {
 		g_string_printf (nmc->return_text, _("Error: failed to import '%s': %s."),
 		                 filename, error->message);
-		NMC_RETURN (nmc, NMC_RESULT_ERROR_UNKNOWN);
+		return NMC_RESULT_ERROR_UNKNOWN;
 	}
 
 	add_connection (nmc->client,
@@ -9169,7 +9262,7 @@ static const NMCCommand connection_cmds[] = {
 	{ "add",      do_connection_add,        usage_connection_add,      TRUE,   TRUE },
 	{ "edit",     do_connection_edit,       usage_connection_edit,     TRUE,   TRUE },
 	{ "delete",   do_connection_delete,     usage_connection_delete,   TRUE,   TRUE },
-	{ "reload",   do_connection_reload,     usage_connection_reload,   TRUE,   TRUE },
+	{ "reload",   do_connection_reload,     usage_connection_reload,   FALSE,  FALSE },
 	{ "load",     do_connection_load,       usage_connection_load,     TRUE,   TRUE },
 	{ "modify",   do_connection_modify,     usage_connection_modify,   TRUE,   TRUE },
 	{ "clone",    do_connection_clone,      usage_connection_clone,    TRUE,   TRUE },
diff --git a/clients/cli/connections.h b/clients/cli/connections.h
index 122a7e27..7fa9d448 100644
--- a/clients/cli/connections.h
+++ b/clients/cli/connections.h
@@ -1,20 +1,6 @@
-/* nmcli - command-line tool to control NetworkManager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2010 - 2018 Red Hat, Inc.
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2010 - 2018 Red Hat, Inc.
  */
 
 #ifndef NMC_CONNECTIONS_H
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index c00d3191..c99efd0d 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -1,20 +1,6 @@
-/* nmcli - command-line tool to control NetworkManager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2010 - 2018 Red Hat, Inc.
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2010 - 2018 Red Hat, Inc.
  */
 
 #include "nm-default.h"
@@ -169,6 +155,8 @@ _metagen_device_detail_general_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 		return nm_device_get_type_description (d);
 	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_NM_TYPE:
 		return G_OBJECT_TYPE_NAME (d);
+	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DBUS_PATH:
+		return nm_object_get_path (NM_OBJECT (d));
 	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_VENDOR:
 		return nm_device_get_vendor (d);
 	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_PRODUCT:
@@ -250,6 +238,7 @@ const NmcMetaGenericInfo *const metagen_device_detail_general[_NMC_GENERIC_INFO_
 	_METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DEVICE,            "DEVICE"),
 	_METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_TYPE,              "TYPE"),
 	_METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_NM_TYPE,           "NM-TYPE"),
+	_METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DBUS_PATH,         "DBUS-PATH"),
 	_METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_VENDOR,            "VENDOR"),
 	_METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_PRODUCT,           "PRODUCT"),
 	_METAGEN_DEVICE_DETAIL_GENERAL (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DRIVER,            "DRIVER"),
@@ -539,6 +528,9 @@ _metagen_device_detail_wifi_properties_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_AR
 	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_MESH:
 		return nmc_meta_generic_get_bool (NM_FLAGS_HAS (wcaps, NM_WIFI_DEVICE_CAP_MESH),
 		                                  get_type);
+	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_IBSS_RSN:
+		return nmc_meta_generic_get_bool (NM_FLAGS_HAS (wcaps, NM_WIFI_DEVICE_CAP_IBSS_RSN),
+		                                  get_type);
 	default:
 		break;
 	}
@@ -549,16 +541,55 @@ _metagen_device_detail_wifi_properties_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_AR
 const NmcMetaGenericInfo *const metagen_device_detail_wifi_properties[_NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_NUM + 1] = {
 #define _METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES(type, name) \
 	[type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_device_detail_wifi_properties_get_fcn)
-	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_WEP,   "WEP"),
-	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_WPA,   "WPA"),
-	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_WPA2,  "WPA2"),
-	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_TKIP,  "TKIP"),
-	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_CCMP,  "CCMP"),
-	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_AP,    "AP"),
-	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_ADHOC, "ADHOC"),
-	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_2GHZ,  "2GHZ"),
-	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_5GHZ,  "5GHZ"),
-	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_MESH,  "MESH"),
+	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_WEP,      "WEP"),
+	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_WPA,      "WPA"),
+	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_WPA2,     "WPA2"),
+	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_TKIP,     "TKIP"),
+	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_CCMP,     "CCMP"),
+	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_AP,       "AP"),
+	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_ADHOC,    "ADHOC"),
+	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_2GHZ,     "2GHZ"),
+	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_5GHZ,     "5GHZ"),
+	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_MESH,     "MESH"),
+	_METAGEN_DEVICE_DETAIL_WIFI_PROPERTIES (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_IBSS_RSN, "IBSS-RSN"),
+};
+
+
+/*****************************************************************************/
+
+static gconstpointer
+_metagen_device_detail_interface_flags_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS)
+{
+	NMDevice *d = target;
+	NMDeviceInterfaceFlags flags;
+
+	NMC_HANDLE_COLOR (NM_META_COLOR_NONE);
+
+	flags = nm_device_get_interface_flags (d);
+
+	switch (info->info_type) {
+	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_INTERFACE_FLAGS_UP:
+		return nmc_meta_generic_get_bool (NM_FLAGS_HAS (flags, NM_DEVICE_INTERFACE_FLAG_UP),
+		                                  get_type);
+	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_INTERFACE_FLAGS_LOWER_UP:
+		return nmc_meta_generic_get_bool (NM_FLAGS_HAS (flags, NM_DEVICE_INTERFACE_FLAG_LOWER_UP),
+		                                  get_type);
+	case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_INTERFACE_FLAGS_CARRIER:
+		return nmc_meta_generic_get_bool (NM_FLAGS_HAS (flags, NM_DEVICE_INTERFACE_FLAG_CARRIER),
+		                                  get_type);
+	default:
+		break;
+	}
+
+	g_return_val_if_reached (NULL);
+}
+
+const NmcMetaGenericInfo *const metagen_device_detail_interface_flags[_NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_INTERFACE_FLAGS_NUM + 1] = {
+#define _METAGEN_DEVICE_DETAIL_INTERFACE_FLAGS(type, name) \
+	[type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_device_detail_interface_flags_get_fcn)
+	_METAGEN_DEVICE_DETAIL_INTERFACE_FLAGS (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_INTERFACE_FLAGS_UP,       "UP"),
+	_METAGEN_DEVICE_DETAIL_INTERFACE_FLAGS (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_INTERFACE_FLAGS_LOWER_UP, "LOWER-UP"),
+	_METAGEN_DEVICE_DETAIL_INTERFACE_FLAGS (NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_INTERFACE_FLAGS_CARRIER,  "CARRIER"),
 };
 
 /*****************************************************************************/
@@ -593,7 +624,7 @@ const NmcMetaGenericInfo *const nmc_fields_dev_wifi_list[] = {
 	NMC_META_GENERIC ("DBUS-PATH"),   /* 16 */
 	NULL,
 };
-#define NMC_FIELDS_DEV_WIFI_LIST_COMMON        "IN-USE,SSID,MODE,CHAN,RATE,SIGNAL,BARS,SECURITY"
+#define NMC_FIELDS_DEV_WIFI_LIST_COMMON        "IN-USE,BSSID,SSID,MODE,CHAN,RATE,SIGNAL,BARS,SECURITY"
 #define NMC_FIELDS_DEV_WIFI_LIST_FOR_DEV_LIST  "NAME,"NMC_FIELDS_DEV_WIFI_LIST_COMMON
 
 const NmcMetaGenericInfo *const nmc_fields_dev_wimax_list[] = {
@@ -641,23 +672,24 @@ const NmcMetaGenericInfo *const nmc_fields_dev_show_bluetooth[] = {
 
 /* Available sections for 'device show' */
 const NmcMetaGenericInfo *const nmc_fields_dev_show_sections[] = {
-	NMC_META_GENERIC_WITH_NESTED ("GENERAL",           metagen_device_detail_general),        /* 0 */
-	NMC_META_GENERIC_WITH_NESTED ("CAPABILITIES",      metagen_device_detail_capabilities),   /* 1 */
-	NMC_META_GENERIC_WITH_NESTED ("WIFI-PROPERTIES",   metagen_device_detail_wifi_properties), /* 2 */
-	NMC_META_GENERIC_WITH_NESTED ("AP",                nmc_fields_dev_wifi_list + 1),         /* 3 */
-	NMC_META_GENERIC_WITH_NESTED ("WIRED-PROPERTIES",  metagen_device_detail_wired_properties), /* 4 */
-	NMC_META_GENERIC_WITH_NESTED ("WIMAX-PROPERTIES",  metagen_device_detail_wimax_properties), /* 5 */
-	NMC_META_GENERIC_WITH_NESTED ("NSP",               nmc_fields_dev_wimax_list + 1),        /* 6 */
-	NMC_META_GENERIC_WITH_NESTED ("IP4",               metagen_ip4_config),                   /* 7 */
-	NMC_META_GENERIC_WITH_NESTED ("DHCP4",             metagen_dhcp_config),                  /* 8 */
-	NMC_META_GENERIC_WITH_NESTED ("IP6",               metagen_ip6_config),                   /* 9 */
-	NMC_META_GENERIC_WITH_NESTED ("DHCP6",             metagen_dhcp_config),                  /* 10 */
-	NMC_META_GENERIC_WITH_NESTED ("BOND",              nmc_fields_dev_show_master_prop + 1),  /* 11 */
-	NMC_META_GENERIC_WITH_NESTED ("TEAM",              nmc_fields_dev_show_team_prop + 1),    /* 12 */
-	NMC_META_GENERIC_WITH_NESTED ("BRIDGE",            nmc_fields_dev_show_master_prop + 1),  /* 13 */
-	NMC_META_GENERIC_WITH_NESTED ("VLAN",              nmc_fields_dev_show_vlan_prop + 1),    /* 14 */
-	NMC_META_GENERIC_WITH_NESTED ("BLUETOOTH",         nmc_fields_dev_show_bluetooth + 1),    /* 15 */
-	NMC_META_GENERIC_WITH_NESTED ("CONNECTIONS",       metagen_device_detail_connections),    /* 16 */
+	NMC_META_GENERIC_WITH_NESTED ("GENERAL",           metagen_device_detail_general),          /* 0 */
+	NMC_META_GENERIC_WITH_NESTED ("CAPABILITIES",      metagen_device_detail_capabilities),     /* 1 */
+	NMC_META_GENERIC_WITH_NESTED ("INTERFACE-FLAGS",   metagen_device_detail_interface_flags),  /* 2 */
+	NMC_META_GENERIC_WITH_NESTED ("WIFI-PROPERTIES",   metagen_device_detail_wifi_properties),  /* 3 */
+	NMC_META_GENERIC_WITH_NESTED ("AP",                nmc_fields_dev_wifi_list + 1),           /* 4 */
+	NMC_META_GENERIC_WITH_NESTED ("WIRED-PROPERTIES",  metagen_device_detail_wired_properties), /* 5 */
+	NMC_META_GENERIC_WITH_NESTED ("WIMAX-PROPERTIES",  metagen_device_detail_wimax_properties), /* 6 */
+	NMC_META_GENERIC_WITH_NESTED ("NSP",               nmc_fields_dev_wimax_list + 1),          /* 7 */
+	NMC_META_GENERIC_WITH_NESTED ("IP4",               metagen_ip4_config),                     /* 8 */
+	NMC_META_GENERIC_WITH_NESTED ("DHCP4",             metagen_dhcp_config),                    /* 9 */
+	NMC_META_GENERIC_WITH_NESTED ("IP6",               metagen_ip6_config),                     /* 10 */
+	NMC_META_GENERIC_WITH_NESTED ("DHCP6",             metagen_dhcp_config),                    /* 11 */
+	NMC_META_GENERIC_WITH_NESTED ("BOND",              nmc_fields_dev_show_master_prop + 1),    /* 12 */
+	NMC_META_GENERIC_WITH_NESTED ("TEAM",              nmc_fields_dev_show_team_prop + 1),      /* 13 */
+	NMC_META_GENERIC_WITH_NESTED ("BRIDGE",            nmc_fields_dev_show_master_prop + 1),    /* 14 */
+	NMC_META_GENERIC_WITH_NESTED ("VLAN",              nmc_fields_dev_show_vlan_prop + 1),      /* 15 */
+	NMC_META_GENERIC_WITH_NESTED ("BLUETOOTH",         nmc_fields_dev_show_bluetooth + 1),      /* 16 */
+	NMC_META_GENERIC_WITH_NESTED ("CONNECTIONS",       metagen_device_detail_connections),      /* 17 */
 	NULL,
 };
 #define NMC_FIELDS_DEV_SHOW_SECTIONS_COMMON  "GENERAL.DEVICE,GENERAL.TYPE,GENERAL.HWADDR,GENERAL.MTU,GENERAL.STATE,"\
@@ -706,6 +738,7 @@ usage (void)
 	              "                         [bssid <BSSID>] [name <name>] [private yes|no] [hidden yes|no]\n\n"
 	              "  wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>] [band a|bg] [channel <channel>] [password <password>]\n\n"
 	              "  wifi rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n\n"
+	              "  wifi show-password [ifname <ifname>]\n\n"
 	              "  lldp [list [ifname <ifname>]]\n\n"
 	              ));
 }
@@ -756,7 +789,7 @@ usage_device_reapply (void)
 	              "ARGUMENTS := <ifname>\n"
 	              "\n"
 	              "Attempts to update device with changes to the currently active connection\n"
-                      "made since it was last applied.\n\n"));
+	              "made since it was last applied.\n\n"));
 }
 
 static void
@@ -1470,6 +1503,20 @@ show_device_info (NMDevice *device, NmCli *nmc)
 			continue;
 		}
 
+		if (nmc_fields_dev_show_sections[section_idx]->nested == metagen_device_detail_interface_flags) {
+			gs_free char *f = section_fld ? g_strdup_printf ("INTERFACE-FLAGS.%s", section_fld) : NULL;
+
+			nmc_print (&nmc->nmc_config,
+			           (gpointer[]) { device, NULL },
+			           NULL,
+			           NULL,
+			           NMC_META_GENERIC_GROUP ("INTERFACE-FLAGS", metagen_device_detail_interface_flags, N_("NAME")),
+			           f,
+			           NULL);
+			was_output = TRUE;
+			continue;
+		}
+
 		if (nmc_fields_dev_show_sections[section_idx]->nested == metagen_device_detail_wifi_properties) {
 			if (NM_IS_DEVICE_WIFI (device)) {
 				gs_free char *f = section_fld ? g_strdup_printf ("WIFI-PROPERTIES.%s", section_fld) : NULL;
@@ -1493,7 +1540,7 @@ show_device_info (NMDevice *device, NmCli *nmc)
 			GPtrArray *aps;
 
 			/* section AP */
-			if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[3]->name)) {
+			if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[4]->name)) {
 				NMC_OUTPUT_DATA_DEFINE_SCOPED (out);
 
 				if (state == NM_DEVICE_STATE_ACTIVATED) {
@@ -1551,42 +1598,42 @@ show_device_info (NMDevice *device, NmCli *nmc)
 		dhcp6 = nm_device_get_dhcp6_config (device);
 
 		/* IP4 */
-		if (cfg4 && !strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[7]->name))
+		if (cfg4 && !strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[8]->name))
 			was_output = print_ip_config (cfg4, AF_INET, &nmc->nmc_config, section_fld);
 
 		/* DHCP4 */
-		if (dhcp4 && !strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[8]->name))
+		if (dhcp4 && !strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[9]->name))
 			was_output = print_dhcp_config (dhcp4, AF_INET, &nmc->nmc_config, section_fld);
 
 		/* IP6 */
-		if (cfg6 && !strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[9]->name))
+		if (cfg6 && !strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[10]->name))
 			was_output = print_ip_config (cfg6, AF_INET6, &nmc->nmc_config, section_fld);
 
 		/* DHCP6 */
-		if (dhcp6 && !strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[10]->name))
+		if (dhcp6 && !strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[11]->name))
 			was_output = print_dhcp_config (dhcp6, AF_INET6, &nmc->nmc_config, section_fld);
 
 		/* Bond specific information */
 		if (NM_IS_DEVICE_BOND (device)) {
-			if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[11]->name))
-				was_output = print_bond_bridge_info (device, nmc, nmc_fields_dev_show_sections[11]->name, section_fld);
+			if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[12]->name))
+				was_output = print_bond_bridge_info (device, nmc, nmc_fields_dev_show_sections[12]->name, section_fld);
 		}
 
 		/* Team specific information */
 		if (NM_IS_DEVICE_TEAM (device)) {
-			if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[12]->name))
-				was_output = print_team_info (device, nmc, nmc_fields_dev_show_sections[12]->name, section_fld);
+			if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[13]->name))
+				was_output = print_team_info (device, nmc, nmc_fields_dev_show_sections[13]->name, section_fld);
 		}
 
 		/* Bridge specific information */
 		if (NM_IS_DEVICE_BRIDGE (device)) {
-			if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[13]->name))
-				was_output = print_bond_bridge_info (device, nmc, nmc_fields_dev_show_sections[13]->name, section_fld);
+			if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[14]->name))
+				was_output = print_bond_bridge_info (device, nmc, nmc_fields_dev_show_sections[14]->name, section_fld);
 		}
 
 		/* VLAN-specific information */
 		if ((NM_IS_DEVICE_VLAN (device))) {
-			if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[14]->name)) {
+			if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[15]->name)) {
 				char * vlan_id_str = g_strdup_printf ("%u", nm_device_vlan_get_vlan_id (NM_DEVICE_VLAN (device)));
 				NMDevice *parent = nm_device_vlan_get_parent (NM_DEVICE_VLAN (device));
 				NMC_OUTPUT_DATA_DEFINE_SCOPED (out);
@@ -1598,7 +1645,7 @@ show_device_info (NMDevice *device, NmCli *nmc)
 				g_ptr_array_add (out.output_data, arr);
 
 				arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_SECTION_PREFIX);
-				set_val_strc (arr, 0, nmc_fields_dev_show_sections[14]->name);  /* "VLAN" */
+				set_val_strc (arr, 0, nmc_fields_dev_show_sections[15]->name);  /* "VLAN" */
 				set_val_strc (arr, 1, parent ? nm_device_get_iface (parent) : NULL);
 				set_val_str  (arr, 2, vlan_id_str);
 				g_ptr_array_add (out.output_data, arr);
@@ -1611,7 +1658,7 @@ show_device_info (NMDevice *device, NmCli *nmc)
 		}
 
 		if (NM_IS_DEVICE_BT (device)) {
-			if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[15]->name)) {
+			if (!strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[16]->name)) {
 				NMC_OUTPUT_DATA_DEFINE_SCOPED (out);
 
 				tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_dev_show_bluetooth;
@@ -1621,7 +1668,7 @@ show_device_info (NMDevice *device, NmCli *nmc)
 				g_ptr_array_add (out.output_data, arr);
 
 				arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_SECTION_PREFIX);
-				set_val_strc (arr, 0, nmc_fields_dev_show_sections[15]->name);  /* "BLUETOOTH" */
+				set_val_strc (arr, 0, nmc_fields_dev_show_sections[16]->name);  /* "BLUETOOTH" */
 				set_val_str (arr, 1, bluetooth_caps_to_string (nm_device_bt_get_capabilities (NM_DEVICE_BT (device))));
 				g_ptr_array_add (out.output_data, arr);
 
@@ -1681,9 +1728,9 @@ do_devices_status (NmCli *nmc, int argc, char **argv)
 	if (nmc->complete)
 		return nmc->return_value;
 
-	while (argc > 0) {
-		g_printerr (_("Unknown parameter: %s\n"), *argv);
-		next_arg (nmc, &argc, &argv, NULL);
+	if (argc) {
+		g_string_printf (nmc->return_text, _("Error: invalid extra argument '%s'."), *argv);
+		return NMC_RESULT_ERROR_USER_INPUT;
 	}
 
 	if (!nmc->required_fields || strcasecmp (nmc->required_fields, "common") == 0)
@@ -1741,7 +1788,7 @@ do_device_show (NmCli *nmc, int argc, char **argv)
 		int i;
 
 		/* nmc_do_cmd() should not call this with argc=0. */
-		g_assert (!nmc->complete);
+		nm_assert (!nmc->complete);
 
 		/* Show details for all devices */
 		for (i = 0; devices[i]; i++) {
@@ -1780,33 +1827,56 @@ progress_cb (gpointer user_data)
 	return TRUE;
 }
 
-static void connected_state_cb (NMDevice *device, NMActiveConnection *active);
+typedef struct {
+	NmCli *nmc;
+	NMDevice *device;
+	NMActiveConnection *active;
+	char *specific_object;
+	bool hotspot:1;
+	bool create:1;
+} AddAndActivateInfo;
 
-static void
-device_state_cb (NMDevice *device, GParamSpec *pspec, gpointer user_data)
+static AddAndActivateInfo *
+add_and_activate_info_new (NmCli *nmc,
+                           NMDevice *device,
+                           gboolean hotspot,
+                           gboolean create,
+                           const char *specific_object)
 {
-	NMActiveConnection *active = (NMActiveConnection *) user_data;
+	AddAndActivateInfo *info;
 
-	connected_state_cb (device, active);
+	info = g_slice_new (AddAndActivateInfo);
+	*info = (AddAndActivateInfo) {
+		.nmc             = nmc,
+		.device          = g_object_ref (device),
+		.hotspot         = hotspot,
+		.create          = create,
+		.specific_object = g_strdup (specific_object),
+	};
+	return info;
 }
 
 static void
-active_state_cb (NMActiveConnection *active, GParamSpec *pspec, gpointer user_data)
+add_and_activate_info_free (AddAndActivateInfo *info)
 {
-	NMDevice *device = (NMDevice *) user_data;
-
-	connected_state_cb (device, active);
+	g_object_unref (info->device);
+	g_clear_object (&info->active);
+	g_free (info->specific_object);
+	nm_g_slice_free (info);
 }
 
+NM_AUTO_DEFINE_FCN0 (AddAndActivateInfo *, _nm_auto_free_add_and_activate_info, add_and_activate_info_free)
+#define nm_auto_free_add_and_activate_info nm_auto (_nm_auto_free_add_and_activate_info)
+
 static void
-connected_state_cb (NMDevice *device, NMActiveConnection *active)
+connected_state_cb (AddAndActivateInfo *info)
 {
 	NMDeviceState state;
 	NMDeviceStateReason reason;
 	NMActiveConnectionState ac_state;
 
-	state = nm_device_get_state (device);
-	ac_state = nm_active_connection_get_state (active);
+	state = nm_device_get_state (info->device);
+	ac_state = nm_active_connection_get_state (info->active);
 
 	if (ac_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING)
 		return;
@@ -1814,42 +1884,36 @@ connected_state_cb (NMDevice *device, NMActiveConnection *active)
 	if (state == NM_DEVICE_STATE_ACTIVATED) {
 		nmc_terminal_erase_line ();
 		g_print (_("Device '%s' successfully activated with '%s'.\n"),
-		         nm_device_get_iface (device),
-		         nm_active_connection_get_uuid (active));
+		         nm_device_get_iface (info->device),
+		         nm_active_connection_get_uuid (info->active));
+
+		if (info->hotspot)
+			g_print (_("Hint: \"nmcli dev wifi show-password\" shows the Wi-Fi name and password.\n"));
 	} else if (   state <= NM_DEVICE_STATE_DISCONNECTED
 	           || state >= NM_DEVICE_STATE_DEACTIVATING) {
-		reason = nm_device_get_state_reason (device);
+		reason = nm_device_get_state_reason (info->device);
 		g_print (_("Error: Connection activation failed: (%d) %s.\n"),
 		         reason, gettext (nmc_device_reason_to_string (reason)));
-	} else
+	} else {
 		return;
+	}
 
-	g_signal_handlers_disconnect_by_func (active, G_CALLBACK (active_state_cb), device);
-	g_signal_handlers_disconnect_by_func (device, G_CALLBACK (device_state_cb), active);
-
-	g_object_unref (active);
-	g_object_unref (device);
+	g_signal_handlers_disconnect_by_func (info->active, G_CALLBACK (connected_state_cb), info);
+	g_signal_handlers_disconnect_by_func (info->device, G_CALLBACK (connected_state_cb), info);
+	add_and_activate_info_free (info);
 
 	quit ();
 }
 
-typedef struct {
-	NmCli *nmc;
-	NMDevice *device;
-	gboolean hotspot;
-	gboolean create;
-} AddAndActivateInfo;
-
 static void
 add_and_activate_cb (GObject *client,
                      GAsyncResult *result,
                      gpointer user_data)
 {
-	AddAndActivateInfo *info = (AddAndActivateInfo *) user_data;
+	nm_auto_free_add_and_activate_info AddAndActivateInfo *info = user_data;
 	NmCli *nmc = info->nmc;
-	NMDevice *device = info->device;
-	NMActiveConnection *active;
-	GError *error = NULL;
+	gs_unref_object NMActiveConnection *active = NULL;
+	gs_free_error GError *error = NULL;
 
 	if (info->create)
 		active = nm_client_add_and_activate_connection_finish (NM_CLIENT (client), result, &error);
@@ -1857,37 +1921,35 @@ add_and_activate_cb (GObject *client,
 		active = nm_client_activate_connection_finish (NM_CLIENT (client), result, &error);
 
 	if (error) {
-		if (info->hotspot)
+		if (info->hotspot) {
 			g_string_printf (nmc->return_text, _("Error: Failed to setup a Wi-Fi hotspot: %s"),
 			                 error->message);
-		else if (info->create)
+		} else if (info->create) {
 			g_string_printf (nmc->return_text, _("Error: Failed to add/activate new connection: %s"),
 			                 error->message);
-		else
+		} else {
 			g_string_printf (nmc->return_text, _("Error: Failed to activate connection: %s"),
 			                 error->message);
-		g_error_free (error);
+		}
 		nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION;
 		quit ();
-	} else {
-		if (nmc->nowait_flag) {
-			g_object_unref (active);
-			quit ();
-		} else {
-			g_object_ref (device);
-			g_signal_connect (device, "notify::state", G_CALLBACK (device_state_cb), active);
-			g_signal_connect (active, "notify::state", G_CALLBACK (active_state_cb), device);
+		return;
+	}
 
-			connected_state_cb (device, active);
+	if (nmc->nowait_flag) {
+		quit ();
+		return;
+	}
 
-			g_timeout_add_seconds (nmc->timeout, timeout_cb, nmc);  /* Exit if timeout expires */
+	if (nmc->nmc_config.print_output == NMC_PRINT_PRETTY)
+		progress_id = g_timeout_add (120, progress_cb, info->device);
 
-			if (nmc->nmc_config.print_output == NMC_PRINT_PRETTY)
-				progress_id = g_timeout_add (120, progress_cb, device);
-		}
-	}
+	info->active = g_steal_pointer (&active);
+	g_signal_connect_swapped (info->device, "notify::state", G_CALLBACK (connected_state_cb), info);
+	g_signal_connect_swapped (info->active, "notify::state", G_CALLBACK (connected_state_cb), info);
+	connected_state_cb (g_steal_pointer (&info));
 
-	g_free (info);
+	g_timeout_add_seconds (nmc->timeout, timeout_cb, nmc);  /* Exit if timeout expires */
 }
 
 static void
@@ -1916,12 +1978,10 @@ create_connect_connection_for_device (AddAndActivateInfo *info)
 static void
 connect_device_cb (GObject *client, GAsyncResult *result, gpointer user_data)
 {
-	AddAndActivateInfo *info = (AddAndActivateInfo *) user_data;
+	nm_auto_free_add_and_activate_info AddAndActivateInfo *info = user_data;
 	NmCli *nmc = info->nmc;
-	NMActiveConnection *active;
+	gs_unref_object NMActiveConnection *active = NULL;
 	GError *error = NULL;
-	const GPtrArray *devices;
-	NMDevice *device;
 
 	active = nm_client_activate_connection_finish (NM_CLIENT (client), result, &error);
 
@@ -1929,7 +1989,7 @@ connect_device_cb (GObject *client, GAsyncResult *result, gpointer user_data)
 		/* If no connection existed for the device, create one and activate it */
 		if (g_error_matches (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_CONNECTION)) {
 			info->create = TRUE;
-			create_connect_connection_for_device (info);
+			create_connect_connection_for_device (g_steal_pointer (&info));
 			return;
 		}
 
@@ -1938,42 +1998,30 @@ connect_device_cb (GObject *client, GAsyncResult *result, gpointer user_data)
 		g_error_free (error);
 		nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION;
 		quit ();
-	} else {
-		g_assert (active);
-		devices = nm_active_connection_get_devices (active);
-		if (devices->len == 0) {
-			g_string_printf (nmc->return_text, _("Error: Device activation failed: device was disconnected"));
-			nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION;
-			g_object_unref (active);
-			quit ();
-			g_free (info);
-			return;
-		}
+		return;
+	}
 
-		device = g_ptr_array_index (devices, 0);
+	nm_assert (NM_IS_ACTIVE_CONNECTION (active));
 
-		if (nmc->nowait_flag) {
-			g_object_unref (active);
-			quit ();
-		} else {
-			if (nmc->secret_agent) {
-				NMRemoteConnection *connection = nm_active_connection_get_connection (active);
+	if (nmc->nowait_flag) {
+		quit ();
+		return;
+	}
 
-				nm_secret_agent_simple_enable (nmc->secret_agent,
-				                               nm_connection_get_path (NM_CONNECTION (connection)));
-			}
+	if (nmc->secret_agent) {
+		NMRemoteConnection *connection = nm_active_connection_get_connection (active);
 
-			g_object_ref (device);
-			g_signal_connect (device, "notify::state", G_CALLBACK (device_state_cb), active);
-			g_signal_connect (active, "notify::state", G_CALLBACK (active_state_cb), device);
+		nm_secret_agent_simple_enable (nmc->secret_agent,
+		                               nm_connection_get_path (NM_CONNECTION (connection)));
+	}
 
-			connected_state_cb (device, active);
+	info->active = g_steal_pointer (&active);
+	g_signal_connect_swapped (info->device, "notify::state", G_CALLBACK (connected_state_cb), info);
+	g_signal_connect_swapped (info->active, "notify::state", G_CALLBACK (connected_state_cb), info);
+	connected_state_cb (g_steal_pointer (&info));
 
-			/* Start timer not to loop forever if "notify::state" signal is not issued */
-			g_timeout_add_seconds (nmc->timeout, timeout_cb, nmc);
-		}
-	}
-	g_free (info);
+	/* Start timer not to loop forever if "notify::state" signal is not issued */
+	g_timeout_add_seconds (nmc->timeout, timeout_cb, nmc);
 }
 
 static NMCResultCode
@@ -2018,10 +2066,7 @@ do_device_connect (NmCli *nmc, int argc, char **argv)
 		                  nmc);
 	}
 
-	info = g_malloc0 (sizeof (AddAndActivateInfo));
-	info->nmc = nmc;
-	info->device = device;
-	info->hotspot = FALSE;
+	info = add_and_activate_info_new (nmc, device, FALSE, FALSE, NULL);
 
 	nm_client_activate_connection_async (nmc->client,
 	                                     NULL,  /* let NM find a connection automatically */
@@ -3004,7 +3049,7 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv)
 				nmc_complete_strings (rescan, "auto", "no", "yes");
 			break;
 		default:
-			g_assert_not_reached();
+			nm_assert_not_reached();
 			break;
 		}
 	}
@@ -3027,8 +3072,10 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv)
 	if (nmc->complete)
 		return nmc->return_value;
 
-	if (argc)
-		g_printerr (_("Unknown parameter: %s\n"), *argv);
+	if (argc) {
+		g_string_printf (nmc->return_text, _("Error: invalid extra argument '%s'."), *argv);
+		return NMC_RESULT_ERROR_USER_INPUT;
+	}
 
 	if (rescan == NULL || strcmp (rescan, "auto") == 0) {
 		rescan_cutoff = NM_MAX (nm_utils_get_timestamp_msec () - 30 * NM_UTILS_MSEC_PER_SECOND, 0);
@@ -3116,18 +3163,78 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv)
 	return nmc->return_value;
 }
 
+static void
+activate_update2_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
+{
+	NMRemoteConnection *remote_con = NM_REMOTE_CONNECTION (source_object);
+	AddAndActivateInfo *info = user_data;
+	NmCli *nmc = info->nmc;
+	gs_unref_variant GVariant *ret = NULL;
+	GError *error = NULL;
+
+	ret = nm_remote_connection_update2_finish (remote_con, res, &error);
+
+	if (!ret) {
+		g_string_printf (nmc->return_text, _("Error: %s."), error->message);
+		nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
+		g_error_free (error);
+		quit ();
+		add_and_activate_info_free (info);
+		return;
+	}
+
+	nm_client_activate_connection_async (nmc->client,
+	                                     NM_CONNECTION (remote_con),
+	                                     info->device,
+	                                     info->specific_object,
+	                                     NULL,
+	                                     add_and_activate_cb,
+	                                     info);
+}
+
+static void
+save_and_activate_connection (NmCli *nmc,
+                              NMDevice *device,
+                              NMConnection *connection,
+                              gboolean hotspot,
+                              const char *specific_object)
+{
+	AddAndActivateInfo *info;
+
+	info = add_and_activate_info_new (nmc, device, hotspot,
+	                                  !NM_IS_REMOTE_CONNECTION (connection),
+	                                  specific_object);
+
+	if (NM_IS_REMOTE_CONNECTION (connection)) {
+		nm_remote_connection_update2 (NM_REMOTE_CONNECTION (connection),
+		                              nm_connection_to_dbus (connection, NM_CONNECTION_SERIALIZE_ALL),
+		                              NM_SETTINGS_UPDATE2_FLAG_BLOCK_AUTOCONNECT,
+		                              NULL,
+		                              NULL,
+		                              activate_update2_cb,
+		                              info);
+	} else {
+		nm_client_add_and_activate_connection_async (nmc->client,
+		                                             connection,
+		                                             info->device,
+		                                             info->specific_object,
+		                                             NULL,
+		                                             add_and_activate_cb,
+		                                             info);
+	}
+}
+
 static NMCResultCode
-do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
+do_device_wifi_connect (NmCli *nmc, int argc, char **argv)
 {
 	NMDevice *device = NULL;
 	NMAccessPoint *ap = NULL;
 	NM80211ApFlags ap_flags;
 	NM80211ApSecurityFlags ap_wpa_flags;
 	NM80211ApSecurityFlags ap_rsn_flags;
-	NMConnection *connection = NULL;
+	gs_unref_object NMConnection *connection = NULL;
 	NMSettingConnection *s_con;
 	NMSettingWireless *s_wifi;
-	AddAndActivateInfo *info;
 	const char *param_user = NULL;
 	const char *ifname = NULL;
 	const char *bssid = NULL;
@@ -3144,7 +3251,6 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
 	char *passwd_ask = NULL;
 	const GPtrArray *avail_cons;
 	gboolean name_match = FALSE;
-	gboolean existing_con = FALSE;
 	int i;
 
 	/* Set default timeout waiting for operation completion. */
@@ -3165,7 +3271,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
 		next_arg (nmc, &argc, &argv, NULL);
 	} else {
 		/* nmc_do_cmd() should not call this with argc=0. */
-		g_assert (!nmc->complete);
+		nm_assert (!nmc->complete);
 
 		if (nmc->ask) {
 			ssid_ask = nmc_readline (&nmc->nmc_config, _("SSID or BSSID: "));
@@ -3291,7 +3397,9 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
 				goto finish;
 			}
 		} else if (!nmc->complete) {
-			g_printerr (_("Unknown parameter: %s\n"), *argv);
+			g_string_printf (nmc->return_text, _("Error: invalid extra argument '%s'."), *argv);
+			nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
+			goto finish;
 		}
 
 		next_arg (nmc, &argc, &argv, NULL);
@@ -3377,7 +3485,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
 
 	avail_cons = nm_device_get_available_connections (device);
 	for (i = 0; i < avail_cons->len; i++) {
-		NMRemoteConnection *avail_con = g_ptr_array_index (avail_cons, i);
+		NMConnection *avail_con = g_ptr_array_index (avail_cons, i);
 		const char *id = nm_connection_get_id (NM_CONNECTION (avail_con));
 
 		if (con_name) {
@@ -3391,22 +3499,21 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
 			/* ap has been checked against bssid1, bssid2 and the ssid
 			 * and now avail_con has been checked against ap.
 			 */
-			connection = NM_CONNECTION (avail_con);
-			existing_con = TRUE;
+			connection = g_object_ref (avail_con);
 			break;
 		}
 	}
 
-	if (name_match && !existing_con) {
+	if (name_match && !connection) {
 		g_string_printf (nmc->return_text, _("Error: Connection '%s' exists but properties don't match."), con_name);
 		nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND;
 		goto finish;
 	}
 
-	if (!existing_con) {
+	if (!connection) {
 		/* If there are some connection data from user, create a connection and
 		 * fill them into proper settings. */
-		if (con_name || private || bssid2_arr || password || hidden)
+		if (con_name || private || bssid2_arr || hidden)
 			connection = nm_simple_connection_new ();
 
 		if (con_name || private) {
@@ -3518,28 +3625,8 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
 	nmc->nowait_flag = (nmc->timeout == 0);
 	nmc->should_wait++;
 
-	info = g_malloc0 (sizeof (AddAndActivateInfo));
-	info->nmc = nmc;
-	info->device = device;
-	info->hotspot = FALSE;
-	info->create = !existing_con;
-	if (existing_con) {
-		nm_client_activate_connection_async (nmc->client,
-		                                     connection,
-		                                     device,
-		                                     nm_object_get_path (NM_OBJECT (ap)),
-		                                     NULL,
-		                                     add_and_activate_cb,
-		                                     info);
-	} else {
-		nm_client_add_and_activate_connection_async (nmc->client,
-		                                             connection,
-		                                             device,
-		                                             nm_object_get_path (NM_OBJECT (ap)),
-		                                             NULL,
-		                                             add_and_activate_cb,
-		                                             info);
-	}
+	save_and_activate_connection (nmc, device, connection, FALSE,
+	                              nm_object_get_path (NM_OBJECT (ap)));
 
 finish:
 	if (bssid1_arr)
@@ -3553,19 +3640,17 @@ finish:
 }
 
 static GBytes *
-generate_ssid_for_hotspot (const char *ssid)
+generate_ssid_for_hotspot (void)
 {
 	GBytes *ssid_bytes;
-	char *hotspot_ssid = NULL;
+	char *ssid = NULL;
 
-	if (!ssid) {
-		hotspot_ssid = g_strdup_printf ("Hotspot-%s", g_get_host_name ());
-		if (strlen (hotspot_ssid) > 32)
-			hotspot_ssid[32] = '\0';
-		ssid = hotspot_ssid;
-	}
+	ssid = g_strdup_printf ("Hotspot-%s", g_get_host_name ());
+	if (strlen (ssid) > 32)
+		ssid[32] = '\0';
 	ssid_bytes = g_bytes_new (ssid, strlen (ssid));
-	g_free (hotspot_ssid);
+	g_free (ssid);
+
 	return ssid_bytes;
 }
 
@@ -3679,30 +3764,125 @@ set_wireless_security_for_hotspot (NMSettingWirelessSecurity *s_wsec,
 	return TRUE;
 }
 
+static NMConnection *
+find_hotspot_conn (NMDevice *device,
+                   const GPtrArray *connections,
+                   const char *con_name,
+                   GBytes *ssid_bytes,
+                   const char *wifi_mode,
+                   const char *band,
+                   gint64 channel_int)
+{
+	NMConnection *connection;
+	NMSettingWireless *s_wifi;
+	int i;
+
+        for (i = 0; i < connections->len; i++) {
+                connection = NM_CONNECTION (connections->pdata[i]);
+
+		s_wifi = nm_connection_get_setting_wireless (connection);
+		if (!s_wifi)
+			continue;
+
+		if (   channel_int != -1
+		    && nm_setting_wireless_get_channel (s_wifi) != channel_int)
+			continue;
+
+		if (g_strcmp0 (nm_setting_wireless_get_mode (s_wifi), wifi_mode) != 0)
+			continue;
+
+		if (band && g_strcmp0 (nm_setting_wireless_get_band (s_wifi), band) != 0)
+			continue;
+
+		if (ssid_bytes && !g_bytes_equal (nm_setting_wireless_get_ssid (s_wifi), ssid_bytes))
+			continue;
+
+		if (!nm_device_connection_compatible (device, connection, NULL))
+			continue;
+
+		return g_object_ref (connection);
+	}
+
+	return NULL;
+}
+
+static NMConnection *
+create_hotspot_conn (const GPtrArray *connections,
+                     const char *con_name,
+                     GBytes *ssid_bytes,
+                     const char *wifi_mode,
+                     const char *band,
+                     gint64 channel_int)
+{
+	char *default_name = NULL;
+	NMConnection *connection;
+	NMSettingConnection *s_con;
+	NMSettingWireless *s_wifi;
+	NMSettingWirelessSecurity *s_wsec;
+	NMSettingIPConfig *s_ip4, *s_ip6;
+	NMSettingProxy *s_proxy;
+
+	connection = nm_simple_connection_new ();
+	s_con =  (NMSettingConnection *) nm_setting_connection_new ();
+	nm_connection_add_setting (connection, NM_SETTING (s_con));
+	if (!con_name)
+		con_name = default_name = nmc_unique_connection_name (connections, "Hotspot");
+	g_object_set (s_con,
+	              NM_SETTING_CONNECTION_ID, con_name,
+	              NM_SETTING_CONNECTION_AUTOCONNECT, FALSE,
+	              NULL);
+	g_free (default_name);
+
+	s_wifi = (NMSettingWireless *) nm_setting_wireless_new ();
+	nm_connection_add_setting (connection, NM_SETTING (s_wifi));
+
+	g_object_set (s_wifi, NM_SETTING_WIRELESS_MODE, wifi_mode,
+	                      NM_SETTING_WIRELESS_SSID, ssid_bytes,
+	                      NULL);
+
+	if (channel_int != -1) {
+		g_object_set (s_wifi,
+		              NM_SETTING_WIRELESS_CHANNEL, (guint32) channel_int,
+		              NM_SETTING_WIRELESS_BAND, band,
+		              NULL);
+	}
+
+	s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
+	nm_connection_add_setting (connection, NM_SETTING (s_wsec));
+
+	s_ip4 = (NMSettingIPConfig *) nm_setting_ip4_config_new ();
+	nm_connection_add_setting (connection, NM_SETTING (s_ip4));
+	g_object_set (s_ip4, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_SHARED, NULL);
+
+	s_ip6 = (NMSettingIPConfig *) nm_setting_ip6_config_new ();
+	nm_connection_add_setting (connection, NM_SETTING (s_ip6));
+	g_object_set (s_ip6, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_IGNORE, NULL);
+
+	s_proxy = (NMSettingProxy *) nm_setting_proxy_new ();
+	nm_connection_add_setting (connection, NM_SETTING (s_proxy));
+	g_object_set (s_proxy, NM_SETTING_PROXY_METHOD, (int) NM_SETTING_PROXY_METHOD_NONE, NULL);
+
+	return connection;
+}
+
 static NMCResultCode
 do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv)
 {
-	AddAndActivateInfo *info;
 	const char *ifname = NULL;
 	const char *con_name = NULL;
-	char *default_name = NULL;
-	const char *ssid = NULL;
+	gs_unref_bytes GBytes *ssid_bytes = NULL;
 	const char *wifi_mode;
 	const char *band = NULL;
 	const char *channel = NULL;
-	unsigned long channel_int;
+	gint64 channel_int = -1;
 	const char *password = NULL;
 	gboolean show_password = FALSE;
 	NMDevice *device = NULL;
 	gs_free NMDevice **devices = NULL;
 	NMDeviceWifiCapabilities caps;
-	NMConnection *connection = NULL;
-	NMSettingConnection *s_con;
-	NMSettingWireless *s_wifi;
+	gs_unref_object NMConnection *connection = NULL;
+	const GPtrArray *connections;
 	NMSettingWirelessSecurity *s_wsec;
-	NMSettingIPConfig *s_ip4, *s_ip6;
-	NMSettingProxy *s_proxy;
-	GBytes *ssid_bytes;
 	GError *error = NULL;
 
 	/* Set default timeout waiting for operation completion. */
@@ -3743,11 +3923,11 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv)
 				g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1));
 				return NMC_RESULT_ERROR_USER_INPUT;
 			}
-			ssid = *argv;
-			if (strlen (ssid) > 32) {
+			if (strlen (*argv) > 32) {
 				g_string_printf (nmc->return_text, _("Error: ssid is too long."));
 				return NMC_RESULT_ERROR_USER_INPUT;
 			}
+			ssid_bytes = g_bytes_new (*argv, strlen (*argv));
 		} else if (strcmp (*argv, "band") == 0) {
 			argc--;
 			argv++;
@@ -3784,7 +3964,7 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv)
 		} else if (nmc_arg_is_option (*argv, "show-password")) {
 			show_password = TRUE;
 		} else {
-			g_string_printf (nmc->return_text, _("Error: Unknown parameter %s."), *argv);
+			g_string_printf (nmc->return_text, _("Error: invalid extra argument '%s'."), *argv);
 			return NMC_RESULT_ERROR_USER_INPUT;
 		}
 
@@ -3803,21 +3983,24 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv)
 			channel = "7";
 	}
 	if (channel) {
+		unsigned long int value;
+
 		if (!band) {
 			g_string_printf (nmc->return_text, _("Error: channel requires band too."));
 			return NMC_RESULT_ERROR_USER_INPUT;
 		}
-		if (   !nmc_string_to_uint (channel, TRUE, 1, 5825, &channel_int)
-		    || !nm_utils_wifi_is_channel_valid (channel_int, band)) {
+		if (   !nmc_string_to_uint (channel, TRUE, 1, 5825, &value)
+		    || !nm_utils_wifi_is_channel_valid (value, band)) {
 			g_string_printf (nmc->return_text, _("Error: channel '%s' not valid for band '%s'."),
 			                 channel, band);
 			return NMC_RESULT_ERROR_USER_INPUT;
 		}
+
+		channel_int = value;
 	}
 
 	/* Find Wi-Fi device. When no ifname is provided, the first Wi-Fi is used. */
 	device = find_wifi_device_by_iface (devices, ifname, NULL);
-
 	if (!device) {
 		if (ifname)
 			g_string_printf (nmc->return_text, _("Error: Device '%s' is not a Wi-Fi device."), ifname);
@@ -3838,69 +4021,34 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv)
 		return NMC_RESULT_ERROR_UNKNOWN;
 	}
 
-	/* Create a connection with appropriate parameters */
-	connection = nm_simple_connection_new ();
-	s_con =  (NMSettingConnection *) nm_setting_connection_new ();
-	nm_connection_add_setting (connection, NM_SETTING (s_con));
-	if (!con_name)
-		con_name = default_name = nmc_unique_connection_name (nm_client_get_connections (nmc->client), "Hotspot");
-	g_object_set (s_con,
-                      NM_SETTING_CONNECTION_ID, con_name,
-	              NM_SETTING_CONNECTION_AUTOCONNECT, FALSE,
-	              NULL);
-	g_free (default_name);
-
-	s_wifi = (NMSettingWireless *) nm_setting_wireless_new ();
-	nm_connection_add_setting (connection, NM_SETTING (s_wifi));
-	ssid_bytes = generate_ssid_for_hotspot (ssid);
-	g_object_set (s_wifi, NM_SETTING_WIRELESS_MODE, wifi_mode,
-	                      NM_SETTING_WIRELESS_SSID, ssid_bytes,
-	                      NULL);
-	g_bytes_unref (ssid_bytes);
-	if (channel)
-		g_object_set (s_wifi,
-		              NM_SETTING_WIRELESS_CHANNEL, (guint32) channel_int,
-		              NM_SETTING_WIRELESS_BAND, band,
-		              NULL);
-
-	s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
-	nm_connection_add_setting (connection, NM_SETTING (s_wsec));
-	if (!set_wireless_security_for_hotspot (s_wsec, wifi_mode, caps, password, show_password, &error)) {
-		g_object_unref (connection);
-		g_string_printf (nmc->return_text, _("Error: Invalid 'password': %s."), error->message);
-		g_clear_error (&error);
-		return NMC_RESULT_ERROR_UNKNOWN;
+	connections = nm_client_get_connections (nmc->client);
+	connection = find_hotspot_conn (device, connections, con_name, ssid_bytes,
+	                                wifi_mode, band, channel_int);
+	if (!connection) {
+		/* Create a connection with appropriate parameters */
+		if (!ssid_bytes)
+			ssid_bytes = generate_ssid_for_hotspot ();
+		connection = create_hotspot_conn (connections, con_name, ssid_bytes,
+		                                  wifi_mode, band, channel_int);
 	}
 
-	s_ip4 = (NMSettingIPConfig *) nm_setting_ip4_config_new ();
-	nm_connection_add_setting (connection, NM_SETTING (s_ip4));
-	g_object_set (s_ip4, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_SHARED, NULL);
-
-	s_ip6 = (NMSettingIPConfig *) nm_setting_ip6_config_new ();
-	nm_connection_add_setting (connection, NM_SETTING (s_ip6));
-	g_object_set (s_ip6, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_IGNORE, NULL);
+	if (password || !NM_IS_REMOTE_CONNECTION (connection)) {
+		s_wsec = nm_connection_get_setting_wireless_security (connection);
+		g_return_val_if_fail (s_wsec, NMC_RESULT_ERROR_UNKNOWN);
 
-	s_proxy = (NMSettingProxy *) nm_setting_proxy_new ();
-	nm_connection_add_setting (connection, NM_SETTING (s_proxy));
-	g_object_set (s_proxy, NM_SETTING_PROXY_METHOD, (int) NM_SETTING_PROXY_METHOD_NONE, NULL);
+		if (!set_wireless_security_for_hotspot (s_wsec, wifi_mode, caps, password, show_password, &error)) {
+			g_object_unref (connection);
+			g_string_printf (nmc->return_text, _("Error: Invalid 'password': %s."), error->message);
+			g_clear_error (&error);
+			return NMC_RESULT_ERROR_UNKNOWN;
+		}
+	}
 
 	/* Activate the connection now */
 	nmc->nowait_flag = (nmc->timeout == 0);
 	nmc->should_wait++;
 
-	info = g_malloc0 (sizeof (AddAndActivateInfo));
-	info->nmc = nmc;
-	info->device = device;
-	info->hotspot = TRUE;
-	info->create = TRUE;
-
-	nm_client_add_and_activate_connection_async (nmc->client,
-	                                             connection,
-	                                             device,
-	                                             NULL,
-	                                             NULL,
-	                                             add_and_activate_cb,
-	                                             info);
+	save_and_activate_connection (nmc, device, connection, TRUE, NULL);
 
 	return nmc->return_value;
 }
@@ -3966,8 +4114,11 @@ do_device_wifi_rescan (NmCli *nmc, int argc, char **argv)
 				goto finish;
 			}
 			g_ptr_array_add (ssids, *argv);
-		} else if (!nmc->complete)
-			g_printerr (_("Unknown parameter: %s\n"), *argv);
+		} else if (!nmc->complete) {
+			g_string_printf (nmc->return_text, _("Error: invalid extra argument '%s'."), *argv);
+			nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
+			goto finish;
+		}
 
 		next_arg (nmc, &argc, &argv, NULL);
 	}
@@ -4012,12 +4163,221 @@ finish:
 	return nmc->return_value;
 }
 
+static void
+string_append_mecard (GString *string, const char *tag, const char *text)
+{
+	const char *p;
+	bool is_hex = TRUE;
+	int start;
+
+	if (!text)
+		return;
+
+	g_string_append (string, tag);
+	start = string->len;
+
+	for (p = text; *p; p++) {
+		if (!g_ascii_isxdigit (*p))
+			is_hex = FALSE;
+		if (strchr ("\\\":;,", *p))
+			g_string_append_c (string, '\\');
+		g_string_append_c (string, *p);
+	}
+
+	if (is_hex) {
+		g_string_insert_c (string, start, '\"');
+		g_string_append_c (string, '\"');
+	}
+	g_string_append_c (string, ';');
+}
+
+static void
+print_wifi_connection (const NmcConfig *nmc_config, NMConnection *connection)
+{
+	NMSettingWireless *s_wireless;
+	NMSettingWirelessSecurity *s_wsec;
+	const char *key_mgmt = NULL;
+	const char *psk = NULL;
+	const char *type = NULL;
+	GBytes *ssid_bytes;
+	char *ssid;
+	GString *string;
+
+	s_wireless = nm_connection_get_setting_wireless (connection);
+	g_return_if_fail (s_wireless);
+
+	ssid_bytes = nm_setting_wireless_get_ssid (s_wireless);
+	g_return_if_fail (ssid_bytes);
+	ssid = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid_bytes, NULL),
+	                              g_bytes_get_size (ssid_bytes));
+	g_return_if_fail (ssid);
+	g_print ("SSID: %s\n", ssid);
+
+	string = g_string_sized_new (64);
+	g_string_append (string, "WIFI:");
+
+	s_wsec = nm_connection_get_setting_wireless_security (connection);
+	if (s_wsec) {
+		key_mgmt = nm_setting_wireless_security_get_key_mgmt (s_wsec);
+		psk = nm_setting_wireless_security_get_psk (s_wsec);
+	}
+
+	if (key_mgmt == NULL) {
+		type = "nopass";
+		g_print ("%s: %s\n", _("Security"), _("None"));
+	} else if (   strcmp (key_mgmt, "none") == 0
+	           || strcmp (key_mgmt, "ieee8021x") == 0) {
+		type = "WEP";
+		g_print ("%s: WEP\n", _("Security"));
+	} else if (   strcmp (key_mgmt, "wpa-none") == 0
+	           || strcmp (key_mgmt, "wpa-psk") == 0
+	           || strcmp (key_mgmt, "sae") == 0) {
+		type = "WPA";
+		g_print ("%s: WPA\n", _("Security"));
+	}
+
+	if (psk)
+		g_print ("%s: %s\n", _("Password"), psk);
+
+	string_append_mecard(string, "T:", type);
+	string_append_mecard(string, "S:", ssid);
+	string_append_mecard(string, "P:", psk);
+
+	if (nm_setting_wireless_get_hidden (s_wireless))
+		g_string_append (string, "H:true;");
+
+	g_string_append_c (string, ';');
+	if (nmc_config->use_colors)
+		nmc_print_qrcode (string->str);
+	g_string_free (string, TRUE);
+
+	g_print ("\n");
+}
+
+static gboolean
+wifi_show_device (const NmcConfig *nmc_config, NMDevice *device, GError **error)
+{
+	NMActiveConnection *active_conn;
+	gs_unref_object NMConnection *connection = NULL;
+	gs_unref_variant GVariant *secrets = NULL;
+
+	if (!NM_IS_DEVICE_WIFI (device)) {
+		g_set_error (error, NMCLI_ERROR, 0,
+		             _("Error: Device '%s' is not a Wi-Fi device."),
+		             nm_device_get_iface (device));
+		return FALSE;
+	}
+
+	connection = nm_device_get_applied_connection (device, 0, NULL, NULL, error);
+	if (!connection)
+		return FALSE;
+
+	active_conn = nm_device_get_active_connection (device);
+	if (!active_conn) {
+		g_set_error (error, NMCLI_ERROR, 0,
+		             _("no active connection on device '%s'"),
+		             nm_device_get_iface (device));
+		return FALSE;
+	}
+
+	secrets = nm_remote_connection_get_secrets (nm_active_connection_get_connection (active_conn),
+	                                            NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
+	                                            NULL,
+	                                            NULL);
+	if (secrets && !nm_connection_update_secrets (connection,
+	                                              NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
+	                                              secrets,
+	                                              error)) {
+		return FALSE;
+	}
+
+	print_wifi_connection (nmc_config, connection);
+
+	return TRUE;
+}
+
+static NMCResultCode
+do_device_wifi_show_password (NmCli *nmc, int argc, char **argv)
+{
+	const char *ifname = NULL;
+	gs_free NMDevice **devices = NULL;
+	gs_free_error GError *error = NULL;
+	gboolean found = FALSE;
+	int i;
+
+	devices = nmc_get_devices_sorted (nmc->client);
+
+	next_arg (nmc, &argc, &argv, NULL);
+	while (argc > 0) {
+		if (argc == 1 && nmc->complete)
+			nmc_complete_strings (*argv, "ifname");
+
+		if (strcmp (*argv, "ifname") == 0) {
+			if (ifname) {
+				g_string_printf (nmc->return_text,
+				                 _("Error: '%s' cannot repeat."),
+				                 *(argv-1));
+				return NMC_RESULT_ERROR_USER_INPUT;
+			}
+			argc--;
+			argv++;
+			if (!argc) {
+				g_string_printf (nmc->return_text,
+				                 _("Error: %s argument is missing."),
+				                 *(argv-1));
+				return NMC_RESULT_ERROR_USER_INPUT;
+			}
+			ifname = *argv;
+			if (argc == 1 && nmc->complete)
+				complete_device (devices, ifname, TRUE);
+		} else if (!nmc->complete) {
+			g_string_printf (nmc->return_text,
+			                 _("Error: invalid extra argument '%s'."),
+			                 *argv);
+			return NMC_RESULT_ERROR_USER_INPUT;
+		}
+
+		next_arg (nmc, &argc, &argv, NULL);
+	}
+
+	if (nmc->complete)
+		return nmc->return_value;
+
+	for (i = 0; devices[i]; i++) {
+		if (ifname && g_strcmp0 (nm_device_get_iface (devices[i]), ifname) != 0)
+			continue;
+
+		if (wifi_show_device (&nmc->nmc_config, devices[i], &error)) {
+			found = TRUE;
+		} else {
+			if (ifname) {
+				g_string_printf (nmc->return_text,
+				                 _("%s"), error->message);
+				return NMC_RESULT_ERROR_UNKNOWN;
+			}
+			g_clear_error (&error);
+		}
+
+		if (ifname)
+			break;
+	}
+
+	if (!found) {
+		g_string_printf (nmc->return_text,
+		                 _("Error: No Wi-Fi device found."));
+		return NMC_RESULT_ERROR_UNKNOWN;
+	}
+
+	return nmc->return_value;
+}
+
 static NMCCommand device_wifi_cmds[] = {
-	{ "list",     do_device_wifi_list,            NULL,             TRUE,   TRUE },
-	{ "connect",  do_device_wifi_connect_network, NULL,             TRUE,   TRUE },
-	{ "hotspot",  do_device_wifi_hotspot,         NULL,             TRUE,   TRUE },
-	{ "rescan",   do_device_wifi_rescan,          NULL,             TRUE,   TRUE },
-	{ NULL,       do_device_wifi_list,            NULL,             TRUE,   TRUE },
+	{ "list",           do_device_wifi_list,           NULL,  TRUE,  TRUE },
+	{ "connect",        do_device_wifi_connect,        NULL,  TRUE,  TRUE },
+	{ "hotspot",        do_device_wifi_hotspot,        NULL,  TRUE,  TRUE },
+	{ "rescan",         do_device_wifi_rescan,         NULL,  TRUE,  TRUE },
+	{ "show-password",  do_device_wifi_show_password,  NULL,  TRUE,  TRUE },
+	{ NULL,             do_device_wifi_list,           NULL,  TRUE,  TRUE },
 };
 
 static NMCResultCode
diff --git a/clients/cli/devices.h b/clients/cli/devices.h
index 7a05b50b..055d56e7 100644
--- a/clients/cli/devices.h
+++ b/clients/cli/devices.h
@@ -1,20 +1,6 @@
-/* nmcli - command-line tool to control NetworkManager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2010 - 2018 Red Hat, Inc.
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2010 - 2018 Red Hat, Inc.
  */
 
 #ifndef NMC_DEVICES_H
diff --git a/clients/cli/general.c b/clients/cli/general.c
index e2ce639e..123cc5b4 100644
--- a/clients/cli/general.c
+++ b/clients/cli/general.c
@@ -1,20 +1,6 @@
-/* nmcli - command-line tool to control NetworkManager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2010 - 2018 Red Hat, Inc.
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2010 - 2018 Red Hat, Inc.
  */
 
 #include "nm-default.h"
@@ -367,6 +353,38 @@ usage_general_permissions (void)
 }
 
 static void
+usage_general_reload (void)
+{
+	g_printerr (_("Usage: nmcli general reload { ARGUMENTS | help }\n"
+	              "\n"
+	              "ARGUMENTS := [<flag>[,<flag>...]]\n"
+	              "\n"
+	              "Reload NetworkManager's configuration and perform certain updates, like\n"
+	              "flushing caches or rewriting external state to disk. This is similar to\n"
+	              "sending SIGHUP to NetworkManager but it allows for more fine-grained\n"
+	              "control over what to reload through the flags argument. It also allows\n"
+	              "non-root access via PolicyKit and contrary to signals it is synchronous.\n"
+	              "\n"
+	              "Available flags are:\n"
+	              "\n"
+	              "  'conf'        Reload the NetworkManager.conf configuration from\n"
+	              "                disk. Note that this does not include connections, which\n"
+	              "                can be reloaded through 'nmcli connection reload' instead.\n"
+	              "\n"
+	              "  'dns-rc'      Update DNS configuration, which usually involves writing\n"
+	              "                /etc/resolv.conf anew.\n"
+	              "\n"
+	              "  'dns-full'    Restart the DNS plugin. This is for example useful when\n"
+	              "                using dnsmasq plugin, which uses additional configuration\n"
+	              "                in /etc/NetworkManager/dnsmasq.d. If you edit those files,\n"
+	              "                you can restart the DNS plugin. This action shortly\n"
+	              "                interrupts name resolution.\n"
+	              "\n"
+	              "With no flags, everything that is supported is reloaded, which is\n"
+	              "identical to sending a SIGHUP.\n"));
+}
+
+static void
 usage_general_logging (void)
 {
 	g_printerr (_("Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -582,6 +600,9 @@ permission_changed (NMClient *client,
 	if (got_permissions (nmc)) {
 		/* Defer the printing, so that we have a chance to process the other
 		 * permission-changed signals. */
+		g_signal_handlers_disconnect_by_func (nmc->client,
+		                                      G_CALLBACK (permission_changed),
+		                                      nmc);
 		g_idle_remove_by_data (nmc);
 		g_idle_add (print_permissions, nmc);
 	}
@@ -598,7 +619,7 @@ show_nm_permissions (NmCli *nmc)
 
 	/* The client didn't get the permissions reply yet. Subscribe to changes. */
 	g_signal_connect (nmc->client, NM_CLIENT_PERMISSION_CHANGED,
-                          G_CALLBACK (permission_changed), nmc);
+	                  G_CALLBACK (permission_changed), nmc);
 
 	if (nmc->timeout == -1)
 		nmc->timeout = 10;
@@ -609,6 +630,70 @@ show_nm_permissions (NmCli *nmc)
 }
 
 static NMCResultCode
+do_general_reload (NmCli *nmc, int argc, char **argv)
+{
+	gs_unref_variant GVariant *result = NULL;
+	gs_free_error GError *error = NULL;
+	gs_free const char **values = NULL;
+	gs_free char *err_token = NULL;
+	gs_free char *joined = NULL;
+	int flags = 0;
+
+	next_arg (nmc, &argc, &argv, NULL);
+
+	if (nmc->complete) {
+		if (argc == 0)
+			return nmc->return_value;
+
+		if (argc == 1) {
+			values = nm_utils_enum_get_values (nm_manager_reload_flags_get_type (),
+			                                   NM_MANAGER_RELOAD_FLAG_CONF,
+			                                   NM_MANAGER_RELOAD_FLAG_ALL);
+			nmc_complete_strv (*argv, -1, values);
+		}
+		return nmc->return_value;
+	}
+
+	if (argc > 0) {
+		if (!nm_utils_enum_from_str (nm_manager_reload_flags_get_type (), *argv, &flags, &err_token)) {
+			values = nm_utils_enum_get_values (nm_manager_reload_flags_get_type (),
+			                                   NM_MANAGER_RELOAD_FLAG_CONF,
+			                                   NM_MANAGER_RELOAD_FLAG_ALL);
+			joined = g_strjoinv (",", (char **) values);
+			g_string_printf (nmc->return_text,
+			                 _("Error: invalid reload flag '%s'. Allowed flags are: %s"),
+			                 err_token,
+			                 joined);
+			return NMC_RESULT_ERROR_USER_INPUT;
+		}
+		argc--;
+		argv++;
+	}
+
+	if (argc > 0) {
+		g_string_printf (nmc->return_text, _("Error: extra argument '%s'"), *argv);
+		return NMC_RESULT_ERROR_USER_INPUT;
+	}
+
+	result = nmc_dbus_call_sync (nmc,
+	                             "/org/freedesktop/NetworkManager",
+	                             "org.freedesktop.NetworkManager",
+	                             "Reload",
+	                             g_variant_new ("(u)", flags),
+	                             G_VARIANT_TYPE("()"),
+	                             &error);
+
+	if (error) {
+		g_string_printf (nmc->return_text,
+		                 _("Error: failed to reload: %s"),
+		                 nmc_error_get_simple_message (error));
+		return NMC_RESULT_ERROR_UNKNOWN;
+	}
+
+	return nmc->return_value;
+}
+
+static NMCResultCode
 do_general_permissions (NmCli *nmc, int argc, char **argv)
 {
 	next_arg (nmc, &argc, &argv, NULL);
@@ -785,6 +870,7 @@ static const NMCCommand general_cmds[] = {
 	{ "hostname",     do_general_hostname,     usage_general_hostname,     TRUE,   TRUE },
 	{ "permissions",  do_general_permissions,  usage_general_permissions,  TRUE,   TRUE },
 	{ "logging",      do_general_logging,      usage_general_logging,      TRUE,   TRUE },
+	{ "reload",       do_general_reload,       usage_general_reload,       FALSE,  FALSE },
 	{ NULL,           do_general_status,       usage_general,              TRUE,   TRUE },
 };
 
@@ -1158,6 +1244,41 @@ device_overview (NmCli *nmc, NMDevice *device)
 		g_string_append_printf (outbuf, "%s, ", tmp);
 		g_free (tmp);
 	}
+
+	switch (nm_device_get_device_type (device)) {
+	case NM_DEVICE_TYPE_WIFI:
+	case NM_DEVICE_TYPE_OLPC_MESH:
+	case NM_DEVICE_TYPE_WIFI_P2P:
+		if (!nm_client_wireless_get_enabled (nmc->client)) {
+			tmp = nmc_colorize (&nmc->nmc_config, NM_META_COLOR_DEVICE_DISABLED, _("sw disabled"));
+			g_string_append_printf (outbuf, "%s, ", tmp);
+			g_free (tmp);
+		}
+		if (!nm_client_wireless_hardware_get_enabled (nmc->client)) {
+			tmp = nmc_colorize (&nmc->nmc_config, NM_META_COLOR_DEVICE_DISABLED, _("hw disabled"));
+			g_string_append_printf (outbuf, "%s, ", tmp);
+			g_free (tmp);
+		}
+		break;
+	case NM_DEVICE_TYPE_MODEM:
+		if (  nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device))
+		    & (NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS | NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO)) {
+			if (!nm_client_wwan_get_enabled (nmc->client)) {
+				tmp = nmc_colorize (&nmc->nmc_config, NM_META_COLOR_DEVICE_DISABLED, _("sw disabled"));
+				g_string_append_printf (outbuf, "%s, ", tmp);
+				g_free (tmp);
+			}
+			if (!nm_client_wwan_hardware_get_enabled (nmc->client)) {
+				tmp = nmc_colorize (&nmc->nmc_config, NM_META_COLOR_DEVICE_DISABLED, _("hw disabled"));
+				g_string_append_printf (outbuf, "%s, ", tmp);
+				g_free (tmp);
+			}
+		}
+		break;
+	default:
+		break;
+	}
+
 	if (nm_device_is_software (device))
 		g_string_append_printf (outbuf, "%s, ", _("sw"));
 	else
@@ -1296,11 +1417,20 @@ do_overview (NmCli *nmc, int argc, char **argv)
 
 		state = nm_device_get_state (devices[i]);
 		color = nmc_device_state_to_color (state);
-		tmp = nmc_colorize (&nmc->nmc_config, color, "%s: %s%s%s",
-		                    nm_device_get_iface (devices[i]),
-		                    gettext (nmc_device_state_to_string (state)),
-		                    ac ? " to " : "",
-		                    ac ? nm_active_connection_get_id (ac) : "");
+		if (ac) {
+			/* TRANSLATORS: prints header line for activated device in plain `nmcli` overview output as
+			 * "<interface-name>: <device-state> to <connection-id>" */
+			tmp = nmc_colorize (&nmc->nmc_config, color, C_("nmcli-overview", "%s: %s to %s"),
+			                    nm_device_get_iface (devices[i]),
+			                    gettext (nmc_device_state_to_string (state)),
+			                    nm_active_connection_get_id (ac));
+		} else {
+			/* TRANSLATORS: prints header line for not active device in plain `nmcli` overview output as
+			 * "<interface-name>: <device-state>" */
+			tmp = nmc_colorize (&nmc->nmc_config, color, C_("nmcli-overview", "%s: %s"),
+			                    nm_device_get_iface (devices[i]),
+			                    gettext (nmc_device_state_to_string (state)));
+		}
 		g_print ("%s\n", tmp);
 		g_free (tmp);
 
diff --git a/clients/cli/general.h b/clients/cli/general.h
index 05caffea..dd63e43f 100644
--- a/clients/cli/general.h
+++ b/clients/cli/general.h
@@ -1,20 +1,6 @@
-/* nmcli - command-line tool to control NetworkManager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2010 - 2014 Red Hat, Inc.
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2010 - 2014 Red Hat, Inc.
  */
 
 #ifndef NMC_GENERAL_H
diff --git a/clients/cli/meson.build b/clients/cli/meson.build
index 396466a2..56202063 100644
--- a/clients/cli/meson.build
+++ b/clients/cli/meson.build
@@ -19,17 +19,11 @@ sources = files(
 )
 
 deps = [
-  libnm_dep,
   libnmc_base_dep,
   libnmc_dep,
-  libnm_core_dep,
   readline_dep,
 ]
 
-cflags = clients_cflags + [
-  '-DG_LOG_DOMAIN="@0@"'.format(name),
-]
-
 if enable_polkit_agent
   sources += nm_polkit_listener
 
@@ -40,7 +34,7 @@ executable(
   name,
   sources,
   dependencies: deps,
-  c_args: cflags,
+  c_args: clients_c_flags + ['-DG_LOG_DOMAIN="@0@"'.format(name)],
   link_args: ldflags_linker_script_binary,
   link_depends: linker_script_binary,
   install: true,
diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c
index ad45f179..5fbd6d72 100644
--- a/clients/cli/nmcli.c
+++ b/clients/cli/nmcli.c
@@ -1,22 +1,7 @@
-/* nmcli - command-line tool to control NetworkManager
- *
+// SPDX-License-Identifier: GPL-2.0+
+/*
  * Jiri Klimes <jklimes@redhat.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2010 - 2018 Red Hat, Inc.
+ * Copyright (C) 2010 - 2018 Red Hat, Inc.
  */
 
 #include "nm-default.h"
@@ -65,6 +50,7 @@
 	[NM_META_COLOR_DEVICE_FIRMWARE_MISSING]  = "31", \
 	[NM_META_COLOR_DEVICE_PLUGIN_MISSING]    = "31", \
 	[NM_META_COLOR_DEVICE_UNAVAILABLE]       =  "2", \
+	[NM_META_COLOR_DEVICE_DISABLED]          = "31", \
 	[NM_META_COLOR_MANAGER_RUNNING]          = "32", \
 	[NM_META_COLOR_MANAGER_STARTING]         = "33", \
 	[NM_META_COLOR_MANAGER_STOPPED]          = "31", \
@@ -470,6 +456,12 @@ check_colors (NmcColorOption color_option,
 		return FALSE;
 	}
 
+	if (   color_option == NMC_USE_COLOR_AUTO
+	    && g_getenv ("NO_COLOR")) {
+		/* https://no-color.org/ */
+		return FALSE;
+	}
+
 	term = g_getenv ("TERM");
 
 	if (color_option == NMC_USE_COLOR_AUTO) {
@@ -571,6 +563,7 @@ parse_color_scheme (char *palette_buffer,
 		[NM_META_COLOR_DEVICE_FIRMWARE_MISSING]  = "device-firmware-missing",
 		[NM_META_COLOR_DEVICE_PLUGIN_MISSING]    = "device-plugin-missing",
 		[NM_META_COLOR_DEVICE_UNAVAILABLE]       = "device-unavailable",
+		[NM_META_COLOR_DEVICE_DISABLED]          = "device-disabled",
 		[NM_META_COLOR_DEVICE_UNKNOWN]           = "device-unknown",
 		[NM_META_COLOR_MANAGER_RUNNING]          = "manager-running",
 		[NM_META_COLOR_MANAGER_STARTING]         = "manager-starting",
diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h
index cd50333a..4615b046 100644
--- a/clients/cli/nmcli.h
+++ b/clients/cli/nmcli.h
@@ -1,20 +1,6 @@
-/* nmcli - command-line tool to control NetworkManager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2010 - 2018 Red Hat, Inc.
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2010 - 2018 Red Hat, Inc.
  */
 
 #ifndef NMC_NMCLI_H
@@ -149,11 +135,6 @@ typedef struct _NmCli {
 	char *palette_buffer;                             /* Buffer with sequences for terminal-colors.d(5)-based coloring. */
 } NmCli;
 
-#define NMC_RETURN(nmc, rvalue) \
-	G_STMT_START { \
-		return ((nmc)->return_value = (rvalue)); \
-	} G_STMT_END
-
 extern NmCli nm_cli;
 
 /* Error quark for GError domain */
diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c
index accb567f..69bfb68d 100644
--- a/clients/cli/polkit-agent.c
+++ b/clients/cli/polkit-agent.c
@@ -1,20 +1,6 @@
-/* nmcli - command-line tool to control NetworkManager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2014 Red Hat, Inc.
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2014 Red Hat, Inc.
  */
 
 #include "nm-default.h"
diff --git a/clients/cli/polkit-agent.h b/clients/cli/polkit-agent.h
index e2902dc0..722d6d33 100644
--- a/clients/cli/polkit-agent.h
+++ b/clients/cli/polkit-agent.h
@@ -1,20 +1,6 @@
-/* nmcli - command-line tool to control NetworkManager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2014 Red Hat, Inc.
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2014 Red Hat, Inc.
  */
 
 #ifndef __NMC_POLKIT_AGENT_H__
diff --git a/clients/cli/settings.c b/clients/cli/settings.c
index 2446cb08..698471d7 100644
--- a/clients/cli/settings.c
+++ b/clients/cli/settings.c
@@ -1,20 +1,6 @@
-/* nmcli - command-line tool to control NetworkManager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2010 - 2015 Red Hat, Inc.
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2010 - 2015 Red Hat, Inc.
  */
 
 #include "nm-default.h"
@@ -532,7 +518,7 @@ gboolean
 nmc_setting_set_property (NMClient *client,
                           NMSetting *setting,
                           const char *prop,
-                          char modifier,
+                          NMMetaAccessorModifier modifier,
                           const char *value,
                           GError **error)
 {
@@ -542,20 +528,14 @@ nmc_setting_set_property (NMClient *client,
 
 	g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
 	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-	g_return_val_if_fail (NM_IN_SET (modifier, '\0', '-', '+'), FALSE);
+	g_return_val_if_fail (NM_IN_SET (modifier, NM_META_ACCESSOR_MODIFIER_SET, NM_META_ACCESSOR_MODIFIER_DEL, NM_META_ACCESSOR_MODIFIER_ADD), FALSE);
 
 	if (!(property_info = nm_meta_property_info_find_by_setting (setting, prop)))
 		goto out_fail_read_only;
 	if (!property_info->property_type->set_fcn)
 		goto out_fail_read_only;
 
-	if (   NM_IN_SET (modifier, '+', '-')
-	    && !value) {
-		/* nothing to do. */
-		return TRUE;
-	}
-
-	if (   modifier == '-'
+	if (   modifier == NM_META_ACCESSOR_MODIFIER_DEL
 	    && !property_info->property_type->set_supports_remove) {
 		/* The property is a plain property. It does not support '-'.
 		 *
@@ -578,6 +558,13 @@ nmc_setting_set_property (NMClient *client,
 		}
 	}
 
+	if (   NM_IN_SET (modifier, NM_META_ACCESSOR_MODIFIER_ADD, NM_META_ACCESSOR_MODIFIER_DEL)
+	    && (   !value
+	        || !value[0])) {
+		/* nothing to do. */
+		return TRUE;
+	}
+
 	g_object_freeze_notify (G_OBJECT (setting));
 	success = property_info->property_type->set_fcn (property_info,
 	                                                 nmc_meta_environment,
diff --git a/clients/cli/settings.h b/clients/cli/settings.h
index 1ff93685..59ad5e87 100644
--- a/clients/cli/settings.h
+++ b/clients/cli/settings.h
@@ -1,20 +1,6 @@
-/* nmcli - command-line tool to control NetworkManager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2010 - 2014 Red Hat, Inc.
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2010 - 2014 Red Hat, Inc.
  */
 
 #ifndef NMC_SETTINGS_H
@@ -45,7 +31,7 @@ char       *nmc_setting_get_property_parsable (NMSetting *setting,
 gboolean    nmc_setting_set_property (NMClient *client,
                                       NMSetting *setting,
                                       const char *prop,
-                                      char modifier,
+                                      NMMetaAccessorModifier modifier,
                                       const char *val,
                                       GError **error);
 
diff --git a/clients/cli/utils.c b/clients/cli/utils.c
index a822dd89..2e3a38f7 100644
--- a/clients/cli/utils.c
+++ b/clients/cli/utils.c
@@ -1,21 +1,7 @@
-/* nmcli - command-line tool to control NetworkManager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2010 Lennart Poettering
- * Copyright 2010 - 2018 Red Hat, Inc.
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2010 Lennart Poettering
+ * Copyright (C) 2010 - 2018 Red Hat, Inc.
  */
 
 #include "nm-default.h"
diff --git a/clients/cli/utils.h b/clients/cli/utils.h
index 82b186b7..e699a641 100644
--- a/clients/cli/utils.h
+++ b/clients/cli/utils.h
@@ -1,20 +1,6 @@
-/* nmcli - command-line tool to control NetworkManager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2010 - 2018 Red Hat, Inc.
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2010 - 2018 Red Hat, Inc.
  */
 
 #ifndef NMC_UTILS_H
@@ -144,6 +130,7 @@ typedef enum {
 	NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_NAME = 0,
 	NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_UUID,
 	NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEVICES,
+	NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_IP_IFACE,
 	NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_STATE,
 	NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEFAULT,
 	NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEFAULT6,
@@ -177,6 +164,7 @@ typedef enum {
 	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DEVICE = 0,
 	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_TYPE,
 	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_NM_TYPE,
+	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DBUS_PATH,
 	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_VENDOR,
 	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_PRODUCT,
 	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DRIVER,
@@ -226,8 +214,14 @@ typedef enum {
 	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_2GHZ,
 	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_5GHZ,
 	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_MESH,
+	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_IBSS_RSN,
 	_NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_NUM,
 
+	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_INTERFACE_FLAGS_UP = 0,
+	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_INTERFACE_FLAGS_LOWER_UP,
+	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_INTERFACE_FLAGS_CARRIER,
+	_NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_INTERFACE_FLAGS_NUM,
+
 } NmcGenericInfoType;
 
 #define NMC_HANDLE_COLOR(color) \
diff --git a/clients/cloud-setup/90-nm-cloud-setup.sh b/clients/cloud-setup/90-nm-cloud-setup.sh
new file mode 100755
index 00000000..817e2555
--- /dev/null
+++ b/clients/cloud-setup/90-nm-cloud-setup.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+case "$2" in
+    up|dhcp4-change)
+        if systemctl -q is-enabled nm-cloud-setup.service ; then
+            exec systemctl --no-block restart nm-cloud-setup.service
+        fi
+        ;;
+esac
diff --git a/clients/cloud-setup/main.c b/clients/cloud-setup/main.c
new file mode 100644
index 00000000..8250945c
--- /dev/null
+++ b/clients/cloud-setup/main.c
@@ -0,0 +1,646 @@
+// SPDX-License-Identifier: LGPL-2.1+
+
+#include "nm-default.h"
+
+#include "nm-cloud-setup-utils.h"
+
+#include "nmcs-provider-ec2.h"
+#include "nm-libnm-core-intern/nm-libnm-core-utils.h"
+
+/*****************************************************************************/
+
+typedef struct {
+	GMainLoop *main_loop;
+	GCancellable *cancellable;
+	NMCSProvider *provider_result;
+	guint detect_count;
+} ProviderDetectData;
+
+static void
+_provider_detect_cb (GObject *source,
+                     GAsyncResult *result,
+                     gpointer user_data)
+{
+	gs_unref_object NMCSProvider *provider = NMCS_PROVIDER (source);
+	gs_free_error GError *error = NULL;
+	ProviderDetectData *dd;
+	gboolean success;
+
+	success = nmcs_provider_detect_finish (provider, result, &error);
+
+	nm_assert (success != (!!error));
+
+	if (nm_utils_error_is_cancelled (error, FALSE))
+		return;
+
+	dd = user_data;
+
+	nm_assert (dd->detect_count > 0);
+	dd->detect_count--;
+
+	if (error) {
+		_LOGI ("provider %s not detected: %s", nmcs_provider_get_name (provider), error->message);
+		if (dd->detect_count > 0) {
+			/* wait longer. */
+			return;
+		}
+
+		_LOGI ("no provider detected");
+		goto done;
+	}
+
+	_LOGI ("provider %s detected", nmcs_provider_get_name (provider));
+	dd->provider_result = g_steal_pointer (&provider);
+
+done:
+	g_cancellable_cancel (dd->cancellable);
+	g_main_loop_quit (dd->main_loop);
+}
+
+static void
+_provider_detect_sigterm_cb (GCancellable *source,
+                             gpointer user_data)
+{
+	ProviderDetectData *dd = user_data;
+
+	g_cancellable_cancel (dd->cancellable);
+	g_clear_object (&dd->provider_result);
+	dd->detect_count = 0;
+	g_main_loop_quit (dd->main_loop);
+}
+
+static NMCSProvider *
+_provider_detect (GCancellable *sigterm_cancellable)
+{
+	nm_auto_unref_gmainloop GMainLoop *main_loop = g_main_loop_new (NULL, FALSE);
+	gs_unref_object GCancellable *cancellable = g_cancellable_new ();
+	gs_unref_object NMHttpClient *http_client = NULL;
+	ProviderDetectData dd = {
+		.cancellable     = cancellable,
+		.main_loop       = main_loop,
+		.detect_count    = 0,
+		.provider_result = NULL,
+	};
+	const GType gtypes[] = {
+		NMCS_TYPE_PROVIDER_EC2,
+	};
+	int i;
+	gulong cancellable_signal_id;
+
+	cancellable_signal_id = g_cancellable_connect (sigterm_cancellable,
+	                                               G_CALLBACK (_provider_detect_sigterm_cb),
+	                                               &dd,
+	                                               NULL);
+	if (!cancellable_signal_id)
+		goto out;
+
+	http_client = nmcs_wait_for_objects_register (nm_http_client_new ());
+
+	for (i = 0; i < G_N_ELEMENTS (gtypes); i++) {
+		NMCSProvider *provider;
+
+		provider = g_object_new (gtypes[i],
+		                         NMCS_PROVIDER_HTTP_CLIENT, http_client,
+		                         NULL);
+		nmcs_wait_for_objects_register (provider);
+
+		_LOGD ("start detecting %s provider...", nmcs_provider_get_name (provider));
+		dd.detect_count++;
+		nmcs_provider_detect (provider,
+		                      cancellable,
+		                      _provider_detect_cb,
+		                      &dd);
+	}
+
+	if (dd.detect_count > 0)
+		g_main_loop_run (main_loop);
+
+out:
+	nm_clear_g_signal_handler (sigterm_cancellable, &cancellable_signal_id);
+	return dd.provider_result;
+}
+
+/*****************************************************************************/
+
+typedef struct {
+	GMainLoop *main_loop;
+	NMClient *nmc;
+} ClientCreateData;
+
+static void
+_nmc_create_cb (GObject *source_object,
+                GAsyncResult *result,
+                gpointer user_data)
+{
+	gs_unref_object NMClient *nmc = NULL;
+	ClientCreateData *data = user_data;
+	gs_free_error GError *error = NULL;
+
+	nmc = nm_client_new_finish (result, &error);
+	if (!nmc) {
+		if (!nm_utils_error_is_cancelled (error, FALSE))
+			_LOGI ("failure to talk to NetworkManager: %s", error->message);
+		goto out;
+	}
+
+	if (!nm_client_get_nm_running (nmc)) {
+		_LOGI ("NetworkManager is not running");
+		goto out;
+	}
+
+	_LOGD ("NetworkManager is running");
+	nmcs_wait_for_objects_register (nmc);
+	nmcs_wait_for_objects_register (nm_client_get_context_busy_watcher (nmc));
+
+	data->nmc = g_steal_pointer (&nmc);
+out:
+	g_main_loop_quit (data->main_loop);
+}
+
+static NMClient *
+_nmc_create (GCancellable *sigterm_cancellable)
+{
+	nm_auto_unref_gmainloop GMainLoop *main_loop = g_main_loop_new (NULL, FALSE);
+	ClientCreateData data = {
+		.main_loop = main_loop,
+	};
+
+	nm_client_new_async (sigterm_cancellable, _nmc_create_cb, &data);
+
+	g_main_loop_run (main_loop);
+
+	return data.nmc;
+}
+
+/*****************************************************************************/
+
+static char **
+_nmc_get_hwaddrs (NMClient *nmc)
+{
+	gs_unref_ptrarray GPtrArray *hwaddrs = NULL;
+	const GPtrArray *devices;
+	char **hwaddrs_v;
+	gs_free char *str = NULL;
+	guint i;
+
+	devices = nm_client_get_devices (nmc);
+
+	for (i = 0; i < devices->len; i++) {
+		NMDevice *device = devices->pdata[i];
+		const char *hwaddr;
+		char *s;
+
+		if (!NM_IS_DEVICE_ETHERNET (device))
+			continue;
+
+		if (nm_device_get_state (device) < NM_DEVICE_STATE_UNAVAILABLE)
+			continue;
+
+		hwaddr = nm_device_ethernet_get_permanent_hw_address (NM_DEVICE_ETHERNET (device));
+		if (!hwaddr)
+			continue;
+
+		s = nmcs_utils_hwaddr_normalize (hwaddr, -1);
+		if (!s)
+			continue;
+
+		if (!hwaddrs)
+			hwaddrs = g_ptr_array_new_with_free_func (g_free);
+		g_ptr_array_add (hwaddrs, s);
+	}
+
+	if (!hwaddrs) {
+		_LOGD ("found interfaces: none");
+		return NULL;
+	}
+
+	g_ptr_array_add (hwaddrs, NULL);
+	hwaddrs_v = (char **) g_ptr_array_free (g_steal_pointer (&hwaddrs), FALSE);
+
+	_LOGD ("found interfaces: %s", (str = g_strjoinv (", ", hwaddrs_v)));
+
+	return hwaddrs_v;
+}
+
+static NMDevice *
+_nmc_get_device_by_hwaddr (NMClient *nmc,
+                           const char *hwaddr)
+{
+	const GPtrArray *devices;
+	guint i;
+
+	devices = nm_client_get_devices (nmc);
+
+	for (i = 0; i < devices->len; i++) {
+		NMDevice *device = devices->pdata[i];
+		const char *hwaddr_dev;
+		gs_free char *s = NULL;
+
+		if (!NM_IS_DEVICE_ETHERNET (device))
+			continue;
+
+		hwaddr_dev = nm_device_ethernet_get_permanent_hw_address (NM_DEVICE_ETHERNET (device));
+		if (!hwaddr_dev)
+			continue;
+
+		s = nmcs_utils_hwaddr_normalize (hwaddr_dev, -1);
+		if (s && nm_streq (s, hwaddr))
+			return device;
+	}
+
+	return NULL;
+}
+
+/*****************************************************************************/
+
+typedef struct {
+	GMainLoop *main_loop;
+	GHashTable *config_dict;
+} GetConfigData;
+
+static void
+_get_config_cb (GObject *source,
+                GAsyncResult *result,
+                gpointer user_data)
+{
+	GetConfigData *data = user_data;
+	gs_unref_hashtable GHashTable *config_dict = NULL;
+	gs_free_error GError *error = NULL;
+
+	config_dict = nmcs_provider_get_config_finish (NMCS_PROVIDER (source), result, &error);
+
+	if (!config_dict) {
+		if (!nm_utils_error_is_cancelled (error, FALSE))
+			_LOGI ("failure to get meta data: %s", error->message);
+	} else
+		_LOGD ("meta data received");
+
+	data->config_dict = g_steal_pointer (&config_dict);
+	g_main_loop_quit (data->main_loop);
+}
+
+static GHashTable *
+_get_config (GCancellable *sigterm_cancellable,
+             NMCSProvider *provider,
+             NMClient *nmc)
+{
+	nm_auto_unref_gmainloop GMainLoop *main_loop = g_main_loop_new (NULL, FALSE);
+	GetConfigData data = {
+		.main_loop = main_loop,
+	};
+	gs_strfreev char **hwaddrs = NULL;
+
+	hwaddrs = _nmc_get_hwaddrs (nmc);
+
+	nmcs_provider_get_config (provider,
+	                          TRUE,
+	                          (const char *const*) hwaddrs,
+	                          sigterm_cancellable,
+	                          _get_config_cb,
+	                          &data);
+
+	g_main_loop_run (main_loop);
+
+	return data.config_dict;
+}
+
+/*****************************************************************************/
+
+static gboolean
+_nmc_skip_connection (NMConnection *connection)
+{
+	NMSettingUser *s_user;
+	const char *v;
+
+	s_user = NM_SETTING_USER (nm_connection_get_setting (connection, NM_TYPE_SETTING_USER));
+	if (!s_user)
+		return FALSE;
+
+#define USER_TAG_SKIP "org.freedesktop.nm-cloud-setup.skip"
+
+	nm_assert (nm_setting_user_check_key (USER_TAG_SKIP, NULL));
+
+	v = nm_setting_user_get_data (s_user, USER_TAG_SKIP);
+	return _nm_utils_ascii_str_to_bool (v, FALSE);
+}
+
+static gboolean
+_nmc_mangle_connection (NMDevice *device,
+                        NMConnection *connection,
+                        gboolean is_single_nic,
+                        const NMCSProviderGetConfigIfaceData *config_data,
+                        gboolean *out_changed)
+{
+	NMSettingIPConfig *s_ip;
+	gboolean addrs_changed;
+	gboolean routes_changed;
+	gboolean rules_changed;
+	gsize i;
+	in_addr_t gateway;
+	gint64 rt_metric;
+	guint32 rt_table;
+	gs_unref_ptrarray GPtrArray *addrs_new = NULL;
+	gs_unref_ptrarray GPtrArray *rules_new = NULL;
+	nm_auto_unref_ip_route NMIPRoute *route_new = NULL;
+
+	if (!nm_streq0 (nm_connection_get_connection_type (connection), NM_SETTING_WIRED_SETTING_NAME))
+		return FALSE;
+
+	s_ip = nm_connection_get_setting_ip4_config (connection);
+	if (!s_ip)
+		return FALSE;
+
+	addrs_new = g_ptr_array_new_full (config_data->ipv4s_len, (GDestroyNotify) nm_ip_address_unref);
+	for (i = 0; i < config_data->ipv4s_len; i++) {
+		NMIPAddress *entry;
+
+		entry = nm_ip_address_new_binary (AF_INET,
+		                                  &config_data->ipv4s_arr[i],
+		                                  config_data->cidr_prefix,
+		                                  NULL);
+		if (entry)
+			g_ptr_array_add (addrs_new, entry);
+	}
+
+	gateway = nm_utils_ip4_address_clear_host_address (config_data->cidr_addr, config_data->cidr_prefix);
+	((guint8 *) &gateway)[3] += 1;
+
+	rt_metric = 10;
+	rt_table = 30400 + config_data->iface_idx;
+
+	route_new = nm_ip_route_new_binary (AF_INET,
+	                                    &nm_ip_addr_zero,
+	                                    0,
+	                                    &gateway,
+	                                    rt_metric,
+	                                    NULL);
+	nm_ip_route_set_attribute (route_new,
+	                           NM_IP_ROUTE_ATTRIBUTE_TABLE,
+	                           g_variant_new_uint32 (rt_table));
+
+	rules_new = g_ptr_array_new_full (config_data->ipv4s_len, (GDestroyNotify) nm_ip_routing_rule_unref);
+	for (i = 0; i < config_data->ipv4s_len; i++) {
+		NMIPRoutingRule *entry;
+		char sbuf[NM_UTILS_INET_ADDRSTRLEN];
+
+		entry = nm_ip_routing_rule_new (AF_INET);
+		nm_ip_routing_rule_set_priority (entry, rt_table);
+		nm_ip_routing_rule_set_from (entry,
+		                             nm_utils_inet4_ntop (config_data->ipv4s_arr[i], sbuf),
+		                             32);
+		nm_ip_routing_rule_set_table (entry, rt_table);
+
+		nm_assert (nm_ip_routing_rule_validate  (entry, NULL));
+
+		g_ptr_array_add (rules_new, entry);
+	}
+
+	addrs_changed = nmcs_setting_ip_replace_ipv4_addresses (s_ip,
+	                                                        (NMIPAddress **) addrs_new->pdata,
+	                                                        addrs_new->len);
+
+	routes_changed = nmcs_setting_ip_replace_ipv4_routes (s_ip,
+	                                                      &route_new,
+	                                                      1);
+
+	rules_changed = nmcs_setting_ip_replace_ipv4_rules (s_ip,
+	                                                    (NMIPRoutingRule **) rules_new->pdata,
+	                                                    rules_new->len);
+
+	NM_SET_OUT (out_changed,    addrs_changed
+	                         || routes_changed
+	                         || rules_changed);
+	return TRUE;
+}
+
+/*****************************************************************************/
+
+static guint
+_config_data_get_num_valid (GHashTable *config_dict)
+{
+	const NMCSProviderGetConfigIfaceData *config_data;
+	GHashTableIter h_iter;
+	guint n = 0;
+
+	g_hash_table_iter_init (&h_iter, config_dict);
+	while (g_hash_table_iter_next (&h_iter, NULL, (gpointer *) &config_data)) {
+		if (nmcs_provider_get_config_iface_data_is_valid (config_data))
+			n++;
+	}
+
+	return n;
+}
+
+static gboolean
+_config_one (GCancellable *sigterm_cancellable,
+             NMClient *nmc,
+             gboolean is_single_nic,
+             const char *hwaddr,
+             const NMCSProviderGetConfigIfaceData *config_data)
+{
+	gs_unref_object NMDevice *device = NULL;
+	gs_unref_object NMConnection *applied_connection = NULL;
+	guint64 applied_version_id;
+	gs_free_error GError *error = NULL;
+	gboolean changed;
+	gboolean version_id_changed;
+	guint try_count;
+	gboolean any_changes = FALSE;
+
+	g_main_context_iteration (NULL, FALSE);
+
+	if (g_cancellable_is_cancelled (sigterm_cancellable))
+		return FALSE;
+
+	device = nm_g_object_ref (_nmc_get_device_by_hwaddr (nmc, hwaddr));
+	if (!device) {
+		_LOGD ("config device %s: skip because device not found", hwaddr);
+		return FALSE;
+	}
+
+	if (!nmcs_provider_get_config_iface_data_is_valid (config_data)) {
+		_LOGD ("config device %s: skip because meta data not successfully fetched", hwaddr);
+		return FALSE;
+	}
+
+	_LOGD ("config device %s: configuring \"%s\" (%s)...",
+	       hwaddr,
+	       nm_device_get_iface (device) ?: "/unknown/",
+	       nm_object_get_path (NM_OBJECT (device)));
+
+	try_count = 0;
+
+try_again:
+
+	applied_connection = nmcs_device_get_applied_connection (device,
+	                                                         sigterm_cancellable,
+	                                                         &applied_version_id,
+	                                                         &error);
+	if (!applied_connection) {
+		if (!nm_utils_error_is_cancelled (error, FALSE))
+			_LOGD ("config device %s: device has no applied connection (%s). Skip", hwaddr, error->message);
+		return any_changes;
+	}
+
+	if (_nmc_skip_connection (applied_connection)) {
+		_LOGD ("config device %s: skip applied connection due to user data %s", hwaddr, USER_TAG_SKIP);
+		return any_changes;
+	}
+
+	if (!_nmc_mangle_connection (device,
+	                             applied_connection,
+	                             is_single_nic,
+	                             config_data,
+	                             &changed)) {
+		_LOGD ("config device %s: device has no suitable applied connection. Skip", hwaddr);
+		return any_changes;
+	}
+
+	if (!changed) {
+		_LOGD ("config device %s: device needs no update to applied connection \"%s\" (%s). Skip",
+		       hwaddr,
+		       nm_connection_get_id (applied_connection),
+		       nm_connection_get_uuid (applied_connection));
+		return any_changes;
+	}
+
+	_LOGD ("config device %s: reapply connection \"%s\" (%s)",
+	       hwaddr,
+	       nm_connection_get_id (applied_connection),
+	       nm_connection_get_uuid (applied_connection));
+
+	/* we are about to call Reapply(). If if that fails, it counts as if we changed something. */
+	any_changes = TRUE;
+
+	if (!nmcs_device_reapply (device,
+	                          sigterm_cancellable,
+	                          applied_connection,
+	                          applied_version_id,
+	                          &version_id_changed,
+	                          &error)) {
+		if (   version_id_changed
+		    && try_count < 5) {
+			_LOGD ("config device %s: applied connection changed in the meantime. Retry...",
+			       hwaddr);
+			g_clear_object (&applied_connection);
+			g_clear_error (&error);
+			try_count++;
+			goto try_again;
+		}
+
+		if (!nm_utils_error_is_cancelled (error, FALSE)) {
+			_LOGD ("config device %s: failure to reapply connection \"%s\" (%s): %s",
+			       hwaddr,
+			       nm_connection_get_id (applied_connection),
+			       nm_connection_get_uuid (applied_connection),
+			       error->message);
+		}
+		return any_changes;
+	}
+
+	_LOGD ("config device %s: connection \"%s\" (%s) reapplied",
+	       hwaddr,
+	       nm_connection_get_id (applied_connection),
+	       nm_connection_get_uuid (applied_connection));
+
+	return any_changes;
+}
+
+static gboolean
+_config_all (GCancellable *sigterm_cancellable,
+             NMClient *nmc,
+             GHashTable *config_dict)
+{
+	GHashTableIter h_iter;
+	const NMCSProviderGetConfigIfaceData *c_config_data;
+	const char *c_hwaddr;
+	gboolean is_single_nic;
+	gboolean any_changes = FALSE;
+
+	is_single_nic = (_config_data_get_num_valid (config_dict) <= 1);
+
+	g_hash_table_iter_init (&h_iter, config_dict);
+	while (g_hash_table_iter_next (&h_iter, (gpointer *) &c_hwaddr, (gpointer *) &c_config_data)) {
+		if (_config_one (sigterm_cancellable, nmc, is_single_nic, c_hwaddr, c_config_data))
+			any_changes = TRUE;
+	}
+
+	return any_changes;
+}
+
+/*****************************************************************************/
+
+static gboolean
+sigterm_handler (gpointer user_data)
+{
+	GCancellable *sigterm_cancellable = user_data;
+
+	if (!g_cancellable_is_cancelled (sigterm_cancellable)) {
+		_LOGD ("SIGTERM received");
+		g_cancellable_cancel (user_data);
+	} else
+		_LOGD ("SIGTERM received (again)");
+	return G_SOURCE_CONTINUE;
+}
+
+/*****************************************************************************/
+
+int
+main (int argc, const char *const*argv)
+{
+	gs_unref_object GCancellable *sigterm_cancellable = NULL;
+	nm_auto_destroy_and_unref_gsource GSource *sigterm_source = NULL;
+	gs_unref_object NMCSProvider *provider = NULL;
+	gs_unref_object NMClient *nmc = NULL;
+	gs_unref_hashtable GHashTable *config_dict = NULL;
+
+	_nm_logging_enabled_init (g_getenv (NMCS_ENV_VARIABLE ("NM_CLOUD_SETUP_LOG")));
+
+	_LOGD ("nm-cloud-setup %s starting...", NM_DIST_VERSION);
+
+	if (argc != 1) {
+		g_printerr ("%s: no command line arguments supported\n", argv[0]);
+		return EXIT_FAILURE;
+	}
+
+	sigterm_cancellable = g_cancellable_new ();
+
+	sigterm_source = nm_g_source_attach (nm_g_unix_signal_source_new (SIGTERM,
+	                                                                  G_PRIORITY_DEFAULT,
+	                                                                  sigterm_handler,
+	                                                                  sigterm_cancellable,
+	                                                                  NULL),
+	                                     NULL);
+
+	provider = _provider_detect (sigterm_cancellable);
+	if (!provider)
+		goto done;
+
+	nmc = _nmc_create (sigterm_cancellable);
+	if (!nmc)
+		goto done;
+
+	config_dict = _get_config (sigterm_cancellable, provider, nmc);
+	if (!config_dict)
+		goto done;
+
+	if (_config_all (sigterm_cancellable, nmc, config_dict))
+		_LOGI ("some changes were applied for provider %s", nmcs_provider_get_name (provider));
+	else
+		_LOGD ("no changes were applied for provider %s", nmcs_provider_get_name (provider));
+
+done:
+	nm_clear_pointer (&config_dict, g_hash_table_unref);
+	g_clear_object (&nmc);
+	g_clear_object (&provider);
+
+	if (!nmcs_wait_for_objects_iterate_until_done (NULL, 2000)) {
+		_LOGE ("shutdown: timeout waiting to application to quit. This is a bug");
+		nm_assert_not_reached ();
+	}
+
+	nm_clear_g_source_inst (&sigterm_source);
+	g_clear_object (&sigterm_cancellable);
+
+	return 0;
+}
diff --git a/clients/cloud-setup/meson.build b/clients/cloud-setup/meson.build
new file mode 100644
index 00000000..e9cd970a
--- /dev/null
+++ b/clients/cloud-setup/meson.build
@@ -0,0 +1,49 @@
+name = 'nm-cloud-setup'
+
+if install_systemdunitdir
+
+  nm_cloud_setup_service = configure_file(
+    input: 'nm-cloud-setup.service.in',
+    output: '@BASENAME@',
+    install_dir: systemd_systemdsystemunitdir,
+    configuration: data_conf,
+  )
+
+  install_data(
+    'nm-cloud-setup.timer',
+    install_dir: systemd_systemdsystemunitdir,
+  )
+
+  install_data(
+    '90-nm-cloud-setup.sh',
+    install_dir: join_paths(nm_pkglibdir, 'dispatcher.d', 'no-wait.d'),
+  )
+
+endif
+
+sources = files(
+  'main.c',
+  'nm-cloud-setup-utils.c',
+  'nm-http-client.c',
+  'nmcs-provider-ec2.c',
+  'nmcs-provider.c',
+)
+
+deps = [
+  libnmc_base_dep,
+  libnmc_dep,
+  libcurl_dep,
+]
+
+executable(
+  name,
+  sources,
+  dependencies: deps,
+  c_args: clients_c_flags +
+          ['-DG_LOG_DOMAIN="@0@"'.format(name)],
+  link_with: libnm_systemd_logging_stub,
+  link_args: ldflags_linker_script_binary,
+  link_depends: linker_script_binary,
+  install: true,
+  install_dir: nm_libexecdir,
+)
diff --git a/clients/cloud-setup/nm-cloud-setup-utils.c b/clients/cloud-setup/nm-cloud-setup-utils.c
new file mode 100644
index 00000000..50a59892
--- /dev/null
+++ b/clients/cloud-setup/nm-cloud-setup-utils.c
@@ -0,0 +1,835 @@
+// SPDX-License-Identifier: LGPL-2.1+
+
+#include "nm-default.h"
+
+#include "nm-cloud-setup-utils.h"
+
+#include "nm-glib-aux/nm-time-utils.h"
+#include "nm-glib-aux/nm-logging-base.h"
+
+/*****************************************************************************/
+
+volatile NMLogLevel _nm_logging_configured_level = LOGL_TRACE;
+
+void
+_nm_logging_enabled_init (const char *level_str)
+{
+	NMLogLevel level;
+
+	if (!_nm_log_parse_level (level_str, &level))
+		level = LOGL_WARN;
+	else if (level == _LOGL_KEEP)
+		level = LOGL_WARN;
+
+	_nm_logging_configured_level = level;
+}
+
+void
+_nm_log_impl_cs (NMLogLevel level,
+                 const char *fmt,
+                 ...)
+{
+	gs_free char *msg = NULL;
+	va_list ap;
+	const char *level_str;
+	gint64 ts;
+
+	va_start (ap, fmt);
+	msg = g_strdup_vprintf (fmt, ap);
+	va_end (ap);
+
+	switch (level) {
+	case LOGL_TRACE: level_str = "<trace>"; break;
+	case LOGL_DEBUG: level_str = "<debug>"; break;
+	case LOGL_INFO:  level_str = "<info> "; break;
+	case LOGL_WARN:  level_str = "<warn> "; break;
+	default:
+		nm_assert (level == LOGL_ERR);
+		level_str = "<error>";
+		break;
+	}
+
+	ts = nm_utils_clock_gettime_ns (CLOCK_BOOTTIME);
+
+	g_print ("[%"G_GINT64_FORMAT".%05"G_GINT64_FORMAT"] %s %s\n",
+	         ts / NM_UTILS_NS_PER_SECOND,
+	         (ts / (NM_UTILS_NS_PER_SECOND / 10000)) % 10000,
+	         level_str,
+	         msg);
+}
+
+void
+_nm_utils_monotonic_timestamp_initialized (const struct timespec *tp,
+                                           gint64 offset_sec,
+                                           gboolean is_boottime)
+{
+}
+
+/*****************************************************************************/
+
+G_LOCK_DEFINE_STATIC  (_wait_for_objects_lock);
+static GSList *_wait_for_objects_list;
+static GSList *_wait_for_objects_iterate_loops;
+
+static void
+_wait_for_objects_maybe_quit_mainloops_with_lock (void)
+{
+	GSList *iter;
+
+	if (!_wait_for_objects_list) {
+		for (iter = _wait_for_objects_iterate_loops; iter; iter = iter->next)
+			g_main_loop_quit (iter->data);
+	}
+}
+
+static void
+_wait_for_objects_weak_cb (gpointer data,
+                           GObject *where_the_object_was)
+{
+	G_LOCK (_wait_for_objects_lock);
+	nm_assert (g_slist_find (_wait_for_objects_list, where_the_object_was));
+	_wait_for_objects_list = g_slist_remove (_wait_for_objects_list, where_the_object_was);
+	_wait_for_objects_maybe_quit_mainloops_with_lock ();
+	G_UNLOCK (_wait_for_objects_lock);
+}
+
+/**
+ * nmcs_wait_for_objects_register:
+ * @target: a #GObject to wait for.
+ *
+ * Registers @target as a pointer to wait during shutdown. Using
+ * nmcs_wait_for_objects_iterate_until_done() we keep waiting until
+ * @target gets destroyed, which means that it gets completely unreferenced.
+ */
+gpointer
+nmcs_wait_for_objects_register (gpointer target)
+{
+	g_return_val_if_fail (G_IS_OBJECT (target), NULL);
+
+	G_LOCK (_wait_for_objects_lock);
+	_wait_for_objects_list = g_slist_prepend (_wait_for_objects_list, target);
+	G_UNLOCK (_wait_for_objects_lock);
+
+	g_object_weak_ref (target,
+	                   _wait_for_objects_weak_cb,
+	                   NULL);
+	return target;
+}
+
+typedef struct {
+	GMainLoop *loop;
+	gboolean got_timeout;
+} WaitForObjectsData;
+
+static gboolean
+_wait_for_objects_iterate_until_done_timeout_cb (gpointer user_data)
+{
+	WaitForObjectsData *data = user_data;
+
+	data->got_timeout = TRUE;
+	g_main_loop_quit (data->loop);
+	return G_SOURCE_CONTINUE;
+}
+
+static gboolean
+_wait_for_objects_iterate_until_done_idle_cb (gpointer user_data)
+{
+	/* This avoids a race where:
+	 *
+	 *   - we check whether there are objects to wait for.
+	 *   - the last object to wait for gets removed (issuing g_main_loop_quit()).
+	 *   - we run the mainloop (and missed our signal).
+	 *
+	 * It's really a missing feature of GMainLoop where the "is-running" flag is always set to
+	 * TRUE by g_main_loop_run(). That means, you cannot catch a g_main_loop_quit() in a race
+	 * free way while not iterating the loop.
+	 *
+	 * Avoid this, by checking once again after we start running the mainloop.
+	 */
+
+	G_LOCK (_wait_for_objects_lock);
+	_wait_for_objects_maybe_quit_mainloops_with_lock ();
+	G_UNLOCK (_wait_for_objects_lock);
+	return G_SOURCE_REMOVE;
+}
+
+/**
+ * nmcs_wait_for_objects_iterate_until_done:
+ * @context: the #GMainContext to iterate.
+ * @timeout_msec: timeout or -1 for no timeout.
+ *
+ * Iterates the provided @context until all objects that we wait for
+ * are destroyed.
+ *
+ * The purpose of this is to cleanup all objects that we have on exit. That
+ * is especially because objects have asynchronous operations pending that
+ * should be cancelled and properly completed during exit.
+ *
+ * Returns: %FALSE on timeout or %TRUE if all objects destroyed before timeout.
+ */
+gboolean
+nmcs_wait_for_objects_iterate_until_done (GMainContext *context,
+                                          int timeout_msec)
+{
+	nm_auto_unref_gmainloop GMainLoop *loop = g_main_loop_new (context, FALSE);
+	nm_auto_destroy_and_unref_gsource GSource *timeout_source = NULL;
+	WaitForObjectsData data;
+	gboolean has_more_objects;
+
+	G_LOCK (_wait_for_objects_lock);
+	if (!_wait_for_objects_list) {
+		G_UNLOCK (_wait_for_objects_lock);
+		return TRUE;
+	}
+	_wait_for_objects_iterate_loops = g_slist_prepend (_wait_for_objects_iterate_loops, loop);
+	G_UNLOCK (_wait_for_objects_lock);
+
+	data = (WaitForObjectsData) {
+		.loop        = loop,
+		.got_timeout = FALSE,
+	};
+
+	if (timeout_msec >= 0) {
+		timeout_source = nm_g_source_attach (nm_g_timeout_source_new (timeout_msec,
+		                                                              G_PRIORITY_DEFAULT,
+		                                                              _wait_for_objects_iterate_until_done_timeout_cb,
+		                                                              &data,
+		                                                              NULL),
+		                                     context);
+	}
+
+	has_more_objects = TRUE;
+	while (   has_more_objects
+	       && !data.got_timeout) {
+		nm_auto_destroy_and_unref_gsource GSource *idle_source = NULL;
+
+		idle_source = nm_g_source_attach (nm_g_idle_source_new (G_PRIORITY_DEFAULT,
+		                                                        _wait_for_objects_iterate_until_done_idle_cb,
+		                                                        &data,
+		                                                        NULL),
+		                                  context);
+
+		g_main_loop_run (loop);
+
+		G_LOCK (_wait_for_objects_lock);
+		has_more_objects = (!!_wait_for_objects_list);
+		if (   data.got_timeout
+			|| !has_more_objects)
+			_wait_for_objects_iterate_loops = g_slist_remove (_wait_for_objects_iterate_loops, loop);
+		G_UNLOCK (_wait_for_objects_lock);
+	}
+
+	return !data.got_timeout;
+}
+
+/*****************************************************************************/
+
+typedef struct {
+	GTask *task;
+	GSource *source_timeout;
+	GSource *source_next_poll;
+	GMainContext *context;
+	GCancellable *internal_cancellable;
+	NMCSUtilsPollProbeStartFcn probe_start_fcn;
+	NMCSUtilsPollProbeFinishFcn probe_finish_fcn;
+	gpointer probe_user_data;
+	gulong cancellable_id;
+	gint64 last_poll_start_ms;
+	int sleep_timeout_ms;
+	int ratelimit_timeout_ms;
+	bool completed:1;
+} PollTaskData;
+
+static void
+_poll_task_data_free (gpointer data)
+{
+	PollTaskData *poll_task_data = data;
+
+	nm_assert (G_IS_TASK (poll_task_data->task));
+	nm_assert (!poll_task_data->source_next_poll);
+	nm_assert (!poll_task_data->source_timeout);
+	nm_assert (poll_task_data->cancellable_id == 0);
+
+	g_main_context_unref (poll_task_data->context);
+
+	nm_g_slice_free (poll_task_data);
+}
+
+static void
+_poll_return (PollTaskData *poll_task_data,
+              gboolean success,
+              GError *error_take)
+{
+	nm_clear_g_source_inst (&poll_task_data->source_next_poll);
+	nm_clear_g_source_inst (&poll_task_data->source_timeout);
+	nm_clear_g_cancellable_disconnect (g_task_get_cancellable (poll_task_data->task),
+	                                   &poll_task_data->cancellable_id);
+
+	nm_clear_g_cancellable (&poll_task_data->internal_cancellable);
+
+	if (error_take)
+		g_task_return_error (poll_task_data->task, g_steal_pointer (&error_take));
+	else
+		g_task_return_boolean (poll_task_data->task, success);
+
+	g_object_unref (poll_task_data->task);
+}
+
+static gboolean _poll_start_cb (gpointer user_data);
+
+static void
+_poll_done_cb (GObject *source,
+               GAsyncResult *result,
+               gpointer user_data)
+{
+	PollTaskData *poll_task_data = user_data;
+	_nm_unused gs_unref_object GTask *task = poll_task_data->task; /* balance ref from _poll_start_cb() */
+	gs_free_error GError *error = NULL;
+	gint64 now_ms;
+	gint64 wait_ms;
+	gboolean is_finished;
+
+	is_finished = poll_task_data->probe_finish_fcn (source,
+	                                                result,
+	                                                poll_task_data->probe_user_data,
+	                                                &error);
+
+	if (nm_utils_error_is_cancelled (error, FALSE)) {
+		/* we already handle this differently. Nothing to do. */
+		return;
+	}
+
+	if (   error
+	    || is_finished) {
+		_poll_return (poll_task_data, TRUE, g_steal_pointer (&error));
+		return;
+	}
+
+	now_ms = nm_utils_get_monotonic_timestamp_ms ();
+	if (poll_task_data->ratelimit_timeout_ms > 0)
+		wait_ms = (poll_task_data->last_poll_start_ms + poll_task_data->ratelimit_timeout_ms) - now_ms;
+	else
+		wait_ms = 0;
+	if (poll_task_data->sleep_timeout_ms > 0)
+		wait_ms = MAX (wait_ms, poll_task_data->sleep_timeout_ms);
+
+	poll_task_data->source_next_poll = nm_g_source_attach (nm_g_timeout_source_new (MAX (1, wait_ms),
+	                                                                                G_PRIORITY_DEFAULT,
+	                                                                                _poll_start_cb,
+	                                                                                poll_task_data,
+	                                                                                NULL),
+	                                                       poll_task_data->context);
+}
+
+static gboolean
+_poll_start_cb (gpointer user_data)
+{
+	PollTaskData *poll_task_data = user_data;
+
+	nm_clear_g_source_inst (&poll_task_data->source_next_poll);
+
+	poll_task_data->last_poll_start_ms = nm_utils_get_monotonic_timestamp_ms ();
+
+	g_object_ref (poll_task_data->task); /* balanced by _poll_done_cb() */
+
+	poll_task_data->probe_start_fcn (poll_task_data->internal_cancellable,
+	                                 poll_task_data->probe_user_data,
+	                                 _poll_done_cb,
+	                                 poll_task_data);
+
+	return G_SOURCE_CONTINUE;
+}
+
+static gboolean
+_poll_timeout_cb (gpointer user_data)
+{
+	PollTaskData *poll_task_data = user_data;
+
+	_poll_return (poll_task_data, FALSE, NULL);
+	return G_SOURCE_CONTINUE;
+}
+
+static void
+_poll_cancelled_cb (GObject *object, gpointer user_data)
+{
+	PollTaskData *poll_task_data = user_data;
+	GError *error = NULL;
+
+	_LOGD (">> poll cancelled");
+	nm_clear_g_signal_handler (g_task_get_cancellable (poll_task_data->task),
+	                           &poll_task_data->cancellable_id);
+	nm_utils_error_set_cancelled (&error, FALSE, NULL);
+	_poll_return (poll_task_data, FALSE, error);
+}
+
+/**
+ * nmcs_utils_poll:
+ * @poll_timeout_ms: if >= 0, then this is the overall timeout for how long we poll.
+ *   When this timeout expires, the request completes with failure (but no error set).
+ * @ratelimit_timeout_ms: if > 0, we ratelimit the starts from one prope_start_fcn
+ *   call to the next.
+ * @sleep_timeout_ms: if > 0, then we wait after a probe finished this timeout
+ *   before the next. Together with @ratelimit_timeout_ms this determines how
+ *   frequently we probe.
+ * @probe_start_fcn: used to start a (asynchrnous) probe. A probe must be completed
+ *   by calling the provided callback. While a probe is in progress, we will not
+ *   start another. This function is already invoked the first time synchronously,
+ *   during nmcs_utils_poll().
+ * @probe_finish_fcn: will be called from the callback of @probe_start_fcn. If the
+ *   function returns %TRUE (polling done) or an error, polling stops. Otherwise,
+ *   another poll will be started.
+ * @probe_user_data: user_data for the probe functions.
+ * @cancellable: cancellable for polling.
+ * @callback: when polling completes.
+ * @user_data: for @callback.
+ *
+ * This uses the current g_main_context_get_thread_default() for scheduling
+ * actions.
+ */
+void
+nmcs_utils_poll (int poll_timeout_ms,
+                 int sleep_timeout_ms,
+                 int ratelimit_timeout_ms,
+                 NMCSUtilsPollProbeStartFcn probe_start_fcn,
+                 NMCSUtilsPollProbeFinishFcn probe_finish_fcn,
+                 gpointer probe_user_data,
+                 GCancellable *cancellable,
+                 GAsyncReadyCallback callback,
+                 gpointer user_data)
+{
+	PollTaskData *poll_task_data;
+
+	poll_task_data = g_slice_new (PollTaskData);
+	*poll_task_data = (PollTaskData) {
+		.task                 = nm_g_task_new (NULL, cancellable, nmcs_utils_poll, callback, user_data),
+		.probe_start_fcn      = probe_start_fcn,
+		.probe_finish_fcn     = probe_finish_fcn,
+		.probe_user_data      = probe_user_data,
+		.completed            = FALSE,
+		.context              = g_main_context_ref_thread_default (),
+		.sleep_timeout_ms     = sleep_timeout_ms,
+		.ratelimit_timeout_ms = ratelimit_timeout_ms,
+		.internal_cancellable = g_cancellable_new (),
+	};
+
+	nmcs_wait_for_objects_register (poll_task_data->task);
+
+	g_task_set_task_data (poll_task_data->task, poll_task_data, _poll_task_data_free);
+
+	if (poll_timeout_ms >= 0) {
+		poll_task_data->source_timeout = nm_g_source_attach (nm_g_timeout_source_new (poll_timeout_ms,
+		                                                                              G_PRIORITY_DEFAULT,
+		                                                                              _poll_timeout_cb,
+		                                                                              poll_task_data,
+		                                                                              NULL),
+		                                                     poll_task_data->context);
+	}
+
+	poll_task_data->source_next_poll = nm_g_source_attach (nm_g_idle_source_new (G_PRIORITY_DEFAULT,
+	                                                                             _poll_start_cb,
+	                                                                             poll_task_data,
+	                                                                             NULL),
+	                                                       poll_task_data->context);
+
+	if (cancellable) {
+		gulong signal_id;
+
+		signal_id = g_cancellable_connect (cancellable,
+		                                   G_CALLBACK (_poll_cancelled_cb),
+		                                   poll_task_data,
+		                                   NULL);
+		if (signal_id == 0) {
+			/* the request is already cancelled. Return. */
+			return;
+		}
+		poll_task_data->cancellable_id = signal_id;
+	}
+}
+
+/**
+ * nmcs_utils_poll_finish:
+ * @result: the GAsyncResult from the GAsyncReadyCallback callback.
+ * @probe_user_data: the user data provided to nmcs_utils_poll().
+ * @error: the failure code.
+ *
+ * Returns: %TRUE if the polling completed with success. In that case,
+ *   the error won't be set.
+ *   If the request was cancelled, this is indicated by @error and
+ *   %FALSE will be returned.
+ *   If the probe returned a failure, this returns %FALSE and the error
+ *   provided by @probe_finish_fcn.
+ *   If the request times out, this returns %FALSE without error set.
+ */
+gboolean
+nmcs_utils_poll_finish (GAsyncResult *result,
+                        gpointer *probe_user_data,
+                        GError **error)
+{
+	GTask *task;
+	PollTaskData *poll_task_data;
+
+	g_return_val_if_fail (nm_g_task_is_valid (result, NULL, nmcs_utils_poll), FALSE);
+	g_return_val_if_fail (!error || !*error, FALSE);
+
+	task = G_TASK (result);
+
+	if (probe_user_data) {
+		poll_task_data = g_task_get_task_data (task);
+		NM_SET_OUT (probe_user_data, poll_task_data->probe_user_data);
+	}
+
+	return g_task_propagate_boolean (task, error);
+}
+
+/*****************************************************************************/
+
+char *
+nmcs_utils_hwaddr_normalize (const char *hwaddr, gssize len)
+{
+	gs_free char *hwaddr_clone = NULL;
+	guint8 buf[ETH_ALEN];
+
+	nm_assert (len >= -1);
+
+	if (len < 0) {
+		if (!hwaddr)
+			return NULL;
+	} else {
+		if (len == 0)
+			return NULL;
+		nm_assert (hwaddr);
+		hwaddr = nm_strndup_a (300, hwaddr, len, &hwaddr_clone);
+	}
+
+	if (!nm_utils_hwaddr_aton (hwaddr, buf, sizeof (buf)))
+		return NULL;
+
+	return nm_utils_hwaddr_ntoa (buf, sizeof (buf));
+}
+
+/*****************************************************************************/
+
+const char *
+nmcs_utils_parse_memmem (GBytes *mem, const char *needle)
+{
+	const char *mem_data;
+	gsize mem_size;
+
+	g_return_val_if_fail (mem, NULL);
+	g_return_val_if_fail (needle, NULL);
+
+	mem_data = g_bytes_get_data (mem, &mem_size);
+	return memmem (mem_data, mem_size, needle, strlen (needle));
+}
+
+const char *
+nmcs_utils_parse_get_full_line (GBytes *mem, const char *needle)
+{
+	const char *mem_data;
+	gsize mem_size;
+	gsize c;
+	gsize l;
+
+	const char *line;
+
+	line = nmcs_utils_parse_memmem (mem, needle);
+	if (!line)
+		return NULL;
+
+	mem_data = g_bytes_get_data (mem, &mem_size);
+
+	if (   line != mem_data
+	    && line[-1] != '\n') {
+		/* the line must be preceeded either by the begin of the data or
+		 * by a newline. */
+		return NULL;
+	}
+
+	c = mem_size - (line - mem_data);
+	l = strlen (needle);
+
+	if (   c != l
+	    && line[l] != '\n') {
+		/* the end of the needle must be either a newline or the end of the buffer. */
+		return NULL;
+	}
+
+	return line;
+}
+
+/*****************************************************************************/
+
+char *
+nmcs_utils_uri_build_concat_v (const char *base,
+                               const char **components,
+                               gsize n_components)
+{
+	GString *uri;
+
+	nm_assert (base);
+	nm_assert (base[0]);
+	nm_assert (!NM_STR_HAS_SUFFIX (base, "/"));
+
+	uri = g_string_sized_new (100);
+
+	g_string_append (uri, base);
+
+	if (   n_components > 0
+	    && components[0]
+	    && components[0][0] == '/') {
+		/* the first component starts with a slash. We allow that, and don't add a duplicate
+		 * slash. Otherwise, we add a separator after base.
+		 *
+		 * We only do that for the first component. */
+	} else
+		g_string_append_c (uri, '/');
+
+	while (n_components > 0) {
+		if (!components[0]) {
+			/* we allow NULL, to indicate nothing to append*/
+		} else
+			g_string_append (uri, components[0]);
+		components++;
+		n_components--;
+	}
+
+	return g_string_free (uri, FALSE);
+}
+
+/*****************************************************************************/
+
+gboolean
+nmcs_setting_ip_replace_ipv4_addresses (NMSettingIPConfig *s_ip,
+                                        NMIPAddress **entries_arr,
+                                        guint entries_len)
+{
+	gboolean any_changes = FALSE;
+	guint i_next;
+	guint num;
+	guint i;
+
+	num = nm_setting_ip_config_get_num_addresses (s_ip);
+
+	i_next = 0;
+
+	for (i = 0; i < entries_len; i++) {
+		NMIPAddress *entry = entries_arr[i];
+
+		if (!any_changes) {
+			if (i_next < num) {
+				if (nm_ip_address_cmp_full (entry,
+				                            nm_setting_ip_config_get_address (s_ip, i_next),
+				                            NM_IP_ADDRESS_CMP_FLAGS_WITH_ATTRS) == 0) {
+					i_next++;
+					continue;
+				}
+			}
+			while (i_next < num)
+				nm_setting_ip_config_remove_address (s_ip, --num);
+			any_changes = TRUE;
+		}
+
+		if (!nm_setting_ip_config_add_address (s_ip, entry))
+			continue;
+
+		i_next++;
+	}
+	if (any_changes) {
+		while (i_next < num) {
+			nm_setting_ip_config_remove_address (s_ip, --num);
+			any_changes = TRUE;
+		}
+	}
+
+	return any_changes;
+}
+
+gboolean
+nmcs_setting_ip_replace_ipv4_routes (NMSettingIPConfig *s_ip,
+                                     NMIPRoute **entries_arr,
+                                     guint entries_len)
+{
+	gboolean any_changes = FALSE;
+	guint i_next;
+	guint num;
+	guint i;
+
+	num = nm_setting_ip_config_get_num_routes (s_ip);
+
+	i_next = 0;
+
+	for (i = 0; i < entries_len; i++) {
+		NMIPRoute *entry = entries_arr[i];
+
+		if (!any_changes) {
+			if (i_next < num) {
+				if (nm_ip_route_equal_full (entry,
+				                            nm_setting_ip_config_get_route (s_ip, i_next),
+				                            NM_IP_ROUTE_EQUAL_CMP_FLAGS_WITH_ATTRS)) {
+					i_next++;
+					continue;
+				}
+			}
+			while (i_next < num)
+				nm_setting_ip_config_remove_route (s_ip, --num);
+			any_changes = TRUE;
+		}
+
+		if (!nm_setting_ip_config_add_route (s_ip, entry))
+			continue;
+
+		i_next++;
+	}
+	if (!any_changes) {
+		while (i_next < num) {
+			nm_setting_ip_config_remove_route (s_ip, --num);
+			any_changes = TRUE;
+		}
+	}
+
+	return any_changes;
+}
+
+gboolean
+nmcs_setting_ip_replace_ipv4_rules (NMSettingIPConfig *s_ip,
+                                    NMIPRoutingRule **entries_arr,
+                                    guint entries_len)
+{
+	gboolean any_changes = FALSE;
+	guint i_next;
+	guint num;
+	guint i;
+
+	num = nm_setting_ip_config_get_num_routing_rules (s_ip);
+
+	i_next = 0;
+
+	for (i = 0; i < entries_len; i++) {
+		NMIPRoutingRule *entry = entries_arr[i];
+
+		if (!any_changes) {
+			if (i_next < num) {
+				if (nm_ip_routing_rule_cmp (entry,
+				                            nm_setting_ip_config_get_routing_rule (s_ip, i_next)) == 0) {
+					i_next++;
+					continue;
+				}
+			}
+			while (i_next < num)
+				nm_setting_ip_config_remove_routing_rule (s_ip, --num);
+			any_changes = TRUE;
+		}
+
+		nm_setting_ip_config_add_routing_rule (s_ip, entry);
+		i_next++;
+	}
+	if (!any_changes) {
+		while (i_next < num) {
+			nm_setting_ip_config_remove_routing_rule (s_ip, --num);
+			any_changes = TRUE;
+		}
+	}
+
+	return any_changes;
+}
+
+/*****************************************************************************/
+
+typedef struct {
+	GMainLoop *main_loop;
+	NMConnection *connection;
+	GError *error;
+	guint64 version_id;
+} DeviceGetAppliedConnectionData;
+
+static void
+_nmcs_device_get_applied_connection_cb (GObject *source,
+                                        GAsyncResult *result,
+                                        gpointer user_data)
+{
+	DeviceGetAppliedConnectionData *data = user_data;
+
+	data->connection = nm_device_get_applied_connection_finish (NM_DEVICE (source),
+	                                                            result,
+	                                                            &data->version_id,
+	                                                            &data->error);
+	g_main_loop_quit (data->main_loop);
+}
+
+NMConnection *
+nmcs_device_get_applied_connection (NMDevice *device,
+                                    GCancellable *cancellable,
+                                    guint64 *version_id,
+                                    GError **error)
+{
+	nm_auto_unref_gmainloop GMainLoop *main_loop = g_main_loop_new (NULL, FALSE);
+	DeviceGetAppliedConnectionData data = {
+		.main_loop = main_loop,
+	};
+
+	nm_device_get_applied_connection_async (device,
+	                                        0,
+	                                        cancellable,
+	                                        _nmcs_device_get_applied_connection_cb,
+	                                        &data);
+
+	g_main_loop_run (main_loop);
+
+	if (data.error)
+		g_propagate_error (error, data.error);
+	NM_SET_OUT (version_id, data.version_id);
+	return data.connection;
+}
+
+/*****************************************************************************/
+
+typedef struct {
+	GMainLoop *main_loop;
+	GError *error;
+} DeviceReapplyData;
+
+static void
+_nmcs_device_reapply_cb (GObject *source,
+                         GAsyncResult *result,
+                         gpointer user_data)
+{
+	DeviceReapplyData *data = user_data;
+
+	nm_device_reapply_finish (NM_DEVICE (source),
+	                          result,
+	                          &data->error);
+	g_main_loop_quit (data->main_loop);
+}
+
+gboolean
+nmcs_device_reapply (NMDevice *device,
+                     GCancellable *sigterm_cancellable,
+                     NMConnection *connection,
+                     guint64 version_id,
+                     gboolean *out_version_id_changed,
+                     GError **error)
+{
+	nm_auto_unref_gmainloop GMainLoop *main_loop = g_main_loop_new (NULL, FALSE);
+	DeviceReapplyData data = {
+		.main_loop = main_loop,
+	};
+
+	nm_device_reapply_async (device,
+	                         connection,
+	                         version_id,
+	                         0,
+	                         sigterm_cancellable,
+	                         _nmcs_device_reapply_cb,
+	                         &data);
+
+	g_main_loop_run (main_loop);
+
+	if (data.error) {
+		NM_SET_OUT (out_version_id_changed, g_error_matches (data.error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_VERSION_ID_MISMATCH));
+		g_propagate_error (error, data.error);
+		return FALSE;
+	}
+
+	NM_SET_OUT (out_version_id_changed, FALSE);
+	return TRUE;
+}
diff --git a/clients/cloud-setup/nm-cloud-setup-utils.h b/clients/cloud-setup/nm-cloud-setup-utils.h
new file mode 100644
index 00000000..7c3e267a
--- /dev/null
+++ b/clients/cloud-setup/nm-cloud-setup-utils.h
@@ -0,0 +1,127 @@
+// SPDX-License-Identifier: LGPL-2.1+
+
+#ifndef __NM_CLOUD_SETUP_UTILS_H__
+#define __NM_CLOUD_SETUP_UTILS_H__
+
+#include "nm-glib-aux/nm-logging-fwd.h"
+
+/*****************************************************************************/
+
+/* mark names for  variables that can be used as configuration. Search
+ * for NMCS_ENV_VARIABLE() to find all honored environment variables. */
+#define NMCS_ENV_VARIABLE(var) ""var""
+
+/*****************************************************************************/
+
+extern volatile NMLogLevel _nm_logging_configured_level;
+
+static inline gboolean
+nm_logging_enabled (NMLogLevel level)
+{
+	return level >= _nm_logging_configured_level;
+}
+
+void _nm_logging_enabled_init (const char *level_str);
+
+void _nm_log_impl_cs (NMLogLevel level,
+                      const char *fmt,
+                      ...) _nm_printf (2, 3);
+
+#define _nm_log(level, ...) \
+	_nm_log_impl_cs ((level), __VA_ARGS__);
+
+#define _NMLOG(level, ...) \
+	G_STMT_START { \
+		const NMLogLevel _level = (level); \
+		\
+		if (nm_logging_enabled (_level)) { \
+			_nm_log (_level, __VA_ARGS__); \
+		} \
+	} G_STMT_END
+
+/*****************************************************************************/
+
+#ifndef NM_DIST_VERSION
+#define NM_DIST_VERSION VERSION
+#endif
+
+/*****************************************************************************/
+
+gpointer nmcs_wait_for_objects_register (gpointer target);
+
+gboolean nmcs_wait_for_objects_iterate_until_done (GMainContext *context,
+                                                   int timeout_msec);
+
+/*****************************************************************************/
+
+typedef void (*NMCSUtilsPollProbeStartFcn) (GCancellable *cancellable,
+                                            gpointer probe_user_data,
+                                            GAsyncReadyCallback callback,
+                                            gpointer user_data);
+
+typedef gboolean (*NMCSUtilsPollProbeFinishFcn) (GObject *source,
+                                                 GAsyncResult *result,
+                                                 gpointer probe_user_data,
+                                                 GError **error);
+
+void nmcs_utils_poll (int poll_timeout_ms,
+                      int ratelimit_timeout_ms,
+                      int sleep_timeout_ms,
+                      NMCSUtilsPollProbeStartFcn probe_start_fcn,
+                      NMCSUtilsPollProbeFinishFcn probe_finish_fcn,
+                      gpointer probe_user_data,
+                      GCancellable *cancellable,
+                      GAsyncReadyCallback callback,
+                      gpointer user_data);
+
+gboolean nmcs_utils_poll_finish (GAsyncResult *result,
+                                 gpointer *probe_user_data,
+                                 GError **error);
+
+/*****************************************************************************/
+
+char *nmcs_utils_hwaddr_normalize (const char *hwaddr, gssize len);
+
+/*****************************************************************************/
+
+const char *nmcs_utils_parse_memmem (GBytes *mem, const char *needle);
+
+const char *nmcs_utils_parse_get_full_line (GBytes *mem, const char *needle);
+
+/*****************************************************************************/
+
+char *nmcs_utils_uri_build_concat_v (const char *base,
+                                     const char **components,
+                                     gsize n_components);
+
+#define nmcs_utils_uri_build_concat(base, ...) nmcs_utils_uri_build_concat_v (base, ((const char *[]) { __VA_ARGS__ }), NM_NARG (__VA_ARGS__))
+
+/*****************************************************************************/
+
+gboolean nmcs_setting_ip_replace_ipv4_addresses (NMSettingIPConfig *s_ip,
+                                                 NMIPAddress **entries_arr,
+                                                 guint entries_len);
+
+gboolean nmcs_setting_ip_replace_ipv4_routes (NMSettingIPConfig *s_ip,
+                                              NMIPRoute **entries_arr,
+                                              guint entries_len);
+
+gboolean nmcs_setting_ip_replace_ipv4_rules (NMSettingIPConfig *s_ip,
+                                             NMIPRoutingRule **entries_arr,
+                                             guint entries_len);
+
+/*****************************************************************************/
+
+NMConnection *nmcs_device_get_applied_connection (NMDevice *device,
+                                                  GCancellable *cancellable,
+                                                  guint64 *version_id,
+                                                  GError **error);
+
+gboolean nmcs_device_reapply (NMDevice *device,
+                              GCancellable *sigterm_cancellable,
+                              NMConnection *connection,
+                              guint64 version_id,
+                              gboolean *out_version_id_changed,
+                              GError **error);
+
+#endif /* __NM_CLOUD_SETUP_UTILS_H__ */
diff --git a/clients/cloud-setup/nm-cloud-setup.service.in b/clients/cloud-setup/nm-cloud-setup.service.in
new file mode 100644
index 00000000..69a1a29c
--- /dev/null
+++ b/clients/cloud-setup/nm-cloud-setup.service.in
@@ -0,0 +1,36 @@
+[Unit]
+Description=Automatically configure NetworkManager in cloud
+After=NetworkManager.service
+
+[Service]
+Type=oneshot
+ExecStart=@libexecdir@/nm-cloud-setup
+
+#Environment=NM_CLOUD_SETUP_LOG=TRACE
+
+# Cloud providers are disabled by default. You need to
+# Opt-in by setting the right environment variable for
+# the provider.
+#Environment=NM_CLOUD_SETUP_EC2=yes
+
+CapabilityBoundingSet=
+LockPersonality=yes
+MemoryDenyWriteExecute=yes
+NoNewPrivileges=yes
+PrivateDevices=yes
+PrivateTmp=yes
+ProtectControlGroups=yes
+ProtectHome=yes
+ProtectHostname=yes
+ProtectKernelLogs=yes
+ProtectKernelModules=yes
+ProtectKernelTunables=yes
+ProtectSystem=strict
+RestrictAddressFamilies=AF_UNIX AF_NETLINK AF_INET AF_INET6
+RestrictNamespaces=yes
+RestrictRealtime=yes
+RestrictSUIDSGID=yes
+SystemCallFilter=@system-service
+
+[Install]
+WantedBy=NetworkManager.service
diff --git a/clients/cloud-setup/nm-cloud-setup.timer b/clients/cloud-setup/nm-cloud-setup.timer
new file mode 100644
index 00000000..fd1722a6
--- /dev/null
+++ b/clients/cloud-setup/nm-cloud-setup.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Periodically run nm-cloud-setup
+
+[Timer]
+OnBootSec=5min
+OnUnitActiveSec=5min
+
+[Install]
+WantedBy=timers.target
diff --git a/clients/cloud-setup/nm-http-client.c b/clients/cloud-setup/nm-http-client.c
new file mode 100644
index 00000000..94331095
--- /dev/null
+++ b/clients/cloud-setup/nm-http-client.c
@@ -0,0 +1,746 @@
+// SPDX-License-Identifier: LGPL-2.1+
+
+#include "nm-default.h"
+
+#include "nm-http-client.h"
+
+#include <curl/curl.h>
+#include <glib-unix.h>
+
+#include "nm-cloud-setup-utils.h"
+
+#define NM_CURL_DEBUG 0
+
+/*****************************************************************************/
+
+typedef struct {
+	GMainContext *context;
+	CURLM *mhandle;
+	GSource *mhandle_source_timeout;
+	GSource *mhandle_source_socket;
+} NMHttpClientPrivate;
+
+struct _NMHttpClient {
+	GObject parent;
+	NMHttpClientPrivate _priv;
+};
+
+struct _NMHttpClientClass {
+	GObjectClass parent;
+};
+
+G_DEFINE_TYPE (NMHttpClient, nm_http_client, G_TYPE_OBJECT);
+
+#define NM_HTTP_CLIENT_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMHttpClient, NM_IS_HTTP_CLIENT)
+
+/*****************************************************************************/
+
+#define _NMLOG2(level, edata, ...) \
+	G_STMT_START { \
+		EHandleData *_edata = (edata); \
+		\
+		_NMLOG (level, \
+		        "http-request["NM_HASH_OBFUSCATE_PTR_FMT", \"%s\"]: " \
+		        _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \
+		        NM_HASH_OBFUSCATE_PTR (_edata), \
+		        (_edata)->url \
+		        _NM_UTILS_MACRO_REST (__VA_ARGS__)); \
+	} G_STMT_END
+
+/*****************************************************************************/
+
+G_LOCK_DEFINE_STATIC (_my_curl_initalized_lock);
+static bool _my_curl_initialized = FALSE;
+
+__attribute__((destructor))
+static void
+_my_curl_global_cleanup (void)
+{
+	G_LOCK (_my_curl_initalized_lock);
+	if (_my_curl_initialized) {
+		_my_curl_initialized = FALSE;
+		curl_global_cleanup ();
+	}
+	G_UNLOCK (_my_curl_initalized_lock);
+}
+
+static void
+nm_http_client_curl_global_init (void)
+{
+	G_LOCK (_my_curl_initalized_lock);
+	if (!_my_curl_initialized) {
+		_my_curl_initialized = TRUE;
+		if (curl_global_init (CURL_GLOBAL_ALL) != CURLE_OK) {
+			/* Even if this fails, we are partly initialized. WTF. */
+			_LOGE ("curl: curl_global_init() failed!");
+		}
+	}
+	G_UNLOCK (_my_curl_initalized_lock);
+}
+
+/*****************************************************************************/
+
+GMainContext *
+nm_http_client_get_main_context (NMHttpClient *self)
+{
+	g_return_val_if_fail (NM_IS_HTTP_CLIENT (self), NULL);
+
+	return NM_HTTP_CLIENT_GET_PRIVATE (self)->context;
+}
+
+/*****************************************************************************/
+
+static GSource *
+_source_attach (NMHttpClient *self,
+                GSource *source)
+{
+	return nm_g_source_attach (source, NM_HTTP_CLIENT_GET_PRIVATE (self)->context);
+}
+
+/*****************************************************************************/
+
+typedef struct {
+	long response_code;
+	GBytes *response_data;
+} GetResult;
+
+static void
+_get_result_free (gpointer data)
+{
+	GetResult *get_result = data;
+
+	g_bytes_unref (get_result->response_data);
+	nm_g_slice_free (get_result);
+}
+
+typedef struct {
+	GTask *task;
+	GSource *timeout_source;
+	CURLcode ehandle_result;
+	CURL *ehandle;
+	char *url;
+	GString *recv_data;
+	gssize max_data;
+	gulong cancellable_id;
+} EHandleData;
+
+static void
+_ehandle_free_ehandle (EHandleData *edata)
+{
+	if (edata->ehandle) {
+		NMHttpClient *self = g_task_get_source_object (edata->task);
+		NMHttpClientPrivate *priv = NM_HTTP_CLIENT_GET_PRIVATE (self);
+
+		curl_multi_remove_handle (priv->mhandle, edata->ehandle);
+		curl_easy_cleanup (g_steal_pointer (&edata->ehandle));
+	}
+}
+
+static void
+_ehandle_free (EHandleData *edata)
+{
+	nm_assert (!edata->ehandle);
+	nm_assert (!edata->timeout_source);
+
+	g_object_unref (edata->task);
+
+	if (edata->recv_data)
+		g_string_free (edata->recv_data, TRUE);
+	g_free (edata->url);
+	nm_g_slice_free (edata);
+}
+
+static void
+_ehandle_complete (EHandleData *edata,
+                   GError *error_take)
+{
+	GetResult *get_result;
+	gs_free char *str_tmp_1 = NULL;
+	long response_code = -1;
+
+	nm_clear_pointer (&edata->timeout_source, nm_g_source_destroy_and_unref);
+
+	 nm_clear_g_cancellable_disconnect (g_task_get_cancellable (edata->task),
+	                                    &edata->cancellable_id);
+
+	if (error_take) {
+		if (nm_utils_error_is_cancelled (error_take, FALSE))
+			_LOG2T (edata, "cancelled");
+		else
+			_LOG2D (edata, "failed with %s", error_take->message);
+	} else if (edata->ehandle_result != CURLE_OK) {
+		_LOG2D (edata, "failed with curl error \"%s\"", curl_easy_strerror (edata->ehandle_result));
+		nm_utils_error_set (&error_take,
+		                    NM_UTILS_ERROR_UNKNOWN,
+		                    "failed with curl error \"%s\"",
+		                    curl_easy_strerror (edata->ehandle_result));
+	}
+
+	if (error_take) {
+		_ehandle_free_ehandle (edata);
+		g_task_return_error (edata->task, error_take);
+		_ehandle_free (edata);
+		return;
+	}
+
+	if (curl_easy_getinfo (edata->ehandle,
+	                       CURLINFO_RESPONSE_CODE,
+	                       &response_code) != CURLE_OK)
+		_LOG2E (edata, "failed to get response code from curl easy handle");
+
+	_LOG2D (edata, "success getting %"G_GSIZE_FORMAT" bytes (response code %ld)",
+	        edata->recv_data->len,
+	        response_code);
+
+	_LOG2T (edata, "received %"G_GSIZE_FORMAT" bytes: [[%s]]",
+	       edata->recv_data->len,
+	       nm_utils_buf_utf8safe_escape (edata->recv_data->str, edata->recv_data->len, NM_UTILS_STR_UTF8_SAFE_FLAG_ESCAPE_CTRL, &str_tmp_1));
+
+	_ehandle_free_ehandle (edata);
+
+	get_result = g_slice_new (GetResult);
+	*get_result = (GetResult) {
+		.response_code = response_code,
+		/* This ensures that response_data is always NUL terminated. This is an important guarantee
+		 * that NMHttpClient makes. */
+		.response_data = g_string_free_to_bytes (g_steal_pointer (&edata->recv_data)),
+	};
+
+	g_task_return_pointer (edata->task, get_result, _get_result_free);
+
+	_ehandle_free (edata);
+}
+
+/*****************************************************************************/
+
+static size_t
+_get_writefunction_cb (char *ptr, size_t size, size_t nmemb, void *user_data)
+{
+	EHandleData *edata = user_data;
+	gsize nconsume;
+
+	/* size should always be 1, but still. Multiply them to be sure. */
+	nmemb *= size;
+
+	if (edata->max_data >= 0) {
+		nm_assert (edata->recv_data->len <= edata->max_data);
+		nconsume = (((gsize) edata->max_data) - edata->recv_data->len);
+		if (nconsume > nmemb)
+			nconsume = nmemb;
+	} else
+		nconsume = nmemb;
+
+	g_string_append_len (edata->recv_data, ptr, nconsume);
+	return nconsume;
+}
+
+static gboolean
+_get_timeout_cb (gpointer user_data)
+{
+	_ehandle_complete (user_data,
+	                   g_error_new_literal (NM_UTILS_ERROR,
+	                                        NM_UTILS_ERROR_UNKNOWN,
+	                                        "HTTP request timed out"));
+	return G_SOURCE_REMOVE;
+}
+
+static void
+_get_cancelled_cb (GObject *object, gpointer user_data)
+{
+	EHandleData *edata = user_data;
+	GError *error = NULL;
+
+	nm_clear_g_signal_handler (g_task_get_cancellable (edata->task),
+	                           &edata->cancellable_id);
+	nm_utils_error_set_cancelled (&error, FALSE, NULL);
+	_ehandle_complete (edata, error);
+}
+
+void
+nm_http_client_get (NMHttpClient *self,
+                    const char *url,
+                    int timeout_msec,
+                    gssize max_data,
+                    GCancellable *cancellable,
+                    GAsyncReadyCallback callback,
+                    gpointer user_data)
+{
+	NMHttpClientPrivate *priv;
+	EHandleData *edata;
+
+	g_return_if_fail (NM_IS_HTTP_CLIENT (self));
+	g_return_if_fail (url);
+	g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable));
+	g_return_if_fail (timeout_msec >= 0);
+	g_return_if_fail (max_data >= -1);
+
+	priv = NM_HTTP_CLIENT_GET_PRIVATE (self);
+
+	edata = g_slice_new (EHandleData);
+	*edata = (EHandleData) {
+		.task           = nm_g_task_new (self, cancellable, nm_http_client_get, callback, user_data),
+		.recv_data      = g_string_sized_new (NM_MIN (max_data, 245)),
+		.max_data       = max_data,
+		.url            = g_strdup (url),
+	};
+
+	nmcs_wait_for_objects_register (edata->task);
+
+	_LOG2D (edata, "start get ...");
+
+	edata->ehandle = curl_easy_init ();
+	if (!edata->ehandle) {
+		_ehandle_complete (edata,
+		                   g_error_new_literal (NM_UTILS_ERROR,
+		                                        NM_UTILS_ERROR_UNKNOWN,
+		                                        "HTTP request failed to create curl handle"));
+		return;
+	}
+
+	curl_easy_setopt (edata->ehandle, CURLOPT_URL, url);
+
+	curl_easy_setopt (edata->ehandle, CURLOPT_WRITEFUNCTION, _get_writefunction_cb);
+	curl_easy_setopt (edata->ehandle, CURLOPT_WRITEDATA, edata);
+	curl_easy_setopt (edata->ehandle, CURLOPT_PRIVATE, edata);
+
+	if (timeout_msec > 0) {
+		edata->timeout_source = _source_attach (self,
+		                                        nm_g_timeout_source_new (timeout_msec,
+		                                                                 G_PRIORITY_DEFAULT,
+		                                                                 _get_timeout_cb,
+		                                                                 edata,
+		                                                                 NULL));
+	}
+
+	curl_multi_add_handle (priv->mhandle, edata->ehandle);
+
+	if (cancellable) {
+		gulong signal_id;
+
+		signal_id = g_cancellable_connect (cancellable,
+		                                   G_CALLBACK (_get_cancelled_cb),
+		                                   edata,
+		                                   NULL);
+		if (signal_id == 0) {
+			/* the request is already cancelled. Return. */
+			return;
+		}
+		edata->cancellable_id = signal_id;
+	}
+}
+
+gboolean
+nm_http_client_get_finish (NMHttpClient *self,
+                           GAsyncResult *result,
+                           long *out_response_code,
+                           GBytes **out_response_data,
+                           GError **error)
+{
+	GetResult *get_result;
+
+	g_return_val_if_fail (NM_IS_HTTP_CLIENT (self), FALSE);
+	g_return_val_if_fail (nm_g_task_is_valid (result, self, nm_http_client_get), FALSE);
+
+	get_result = g_task_propagate_pointer (G_TASK (result), error);
+	if (!get_result) {
+		NM_SET_OUT (out_response_code, -1);
+		NM_SET_OUT (out_response_data, NULL);
+		return FALSE;
+	}
+
+	NM_SET_OUT (out_response_code, get_result->response_code);
+
+	/* response_data is binary, but is also guaranteed to be NUL terminated! */
+	NM_SET_OUT (out_response_data, g_steal_pointer (&get_result->response_data));
+
+	_get_result_free (get_result);
+
+	return TRUE;
+}
+
+/*****************************************************************************/
+
+typedef struct {
+	GTask *task;
+	char *uri;
+	NMHttpClientPollGetCheckFcn check_fcn;
+	gpointer check_user_data;
+	GBytes *response_data;
+	gsize request_max_data;
+	long response_code;
+	int request_timeout_ms;
+} PollGetData;
+
+static void
+_poll_get_data_free (gpointer data)
+{
+	PollGetData *poll_get_data = data;
+
+	g_free (poll_get_data->uri);
+
+	nm_clear_pointer (&poll_get_data->response_data, g_bytes_unref);
+
+	nm_g_slice_free (poll_get_data);
+}
+
+static void
+_poll_get_probe_start_fcn (GCancellable *cancellable,
+                           gpointer probe_user_data,
+                           GAsyncReadyCallback callback,
+                           gpointer user_data)
+{
+	PollGetData *poll_get_data = probe_user_data;
+
+	/* balanced by _poll_get_probe_finish_fcn() */
+	g_object_ref (poll_get_data->task);
+
+	nm_http_client_get (g_task_get_source_object (poll_get_data->task),
+	                    poll_get_data->uri,
+	                    poll_get_data->request_timeout_ms,
+	                    poll_get_data->request_max_data,
+	                    cancellable,
+	                    callback,
+	                    user_data);
+}
+
+static gboolean
+_poll_get_probe_finish_fcn (GObject *source,
+                            GAsyncResult *result,
+                            gpointer probe_user_data,
+                            GError **error)
+{
+	PollGetData *poll_get_data = probe_user_data;
+	_nm_unused gs_unref_object GTask *task = poll_get_data->task; /* balance ref from _poll_get_probe_start_fcn() */
+	gboolean success;
+	gs_free_error GError *local_error = NULL;
+	long response_code;
+	gs_unref_bytes GBytes *response_data = NULL;
+
+	success = nm_http_client_get_finish (g_task_get_source_object (poll_get_data->task),
+	                                     result,
+	                                     &response_code,
+	                                     &response_data,
+	                                     &local_error);
+
+	if (!success) {
+		if (nm_utils_error_is_cancelled (local_error, FALSE)) {
+			g_propagate_error (error, g_steal_pointer (&local_error));
+			return TRUE;
+		}
+		return FALSE;
+	}
+
+	if (poll_get_data->check_fcn) {
+		success = poll_get_data->check_fcn (response_code,
+		                                    response_data,
+		                                    poll_get_data->check_user_data,
+		                                    &local_error);
+	} else
+		success = (response_code == 200);
+
+	if (local_error) {
+		g_propagate_error (error, g_steal_pointer (&local_error));
+		return TRUE;
+	}
+
+	if (!success)
+		return FALSE;
+
+	poll_get_data->response_code = response_code;
+	poll_get_data->response_data = g_steal_pointer (&response_data);
+	return TRUE;
+}
+
+static void
+_poll_get_done_cb (GObject *source,
+                   GAsyncResult *result,
+                   gpointer user_data)
+{
+	PollGetData *poll_get_data = user_data;
+	gs_free_error GError *error = NULL;
+	gboolean success;
+
+	success = nmcs_utils_poll_finish (result, NULL, &error);
+
+	if (error)
+		g_task_return_error (poll_get_data->task, g_steal_pointer (&error));
+	else
+		g_task_return_boolean (poll_get_data->task, success);
+
+	g_object_unref (poll_get_data->task);
+}
+
+void
+nm_http_client_poll_get (NMHttpClient *self,
+                         const char *uri,
+                         int request_timeout_ms,
+                         gssize request_max_data,
+                         int poll_timeout_ms,
+                         int ratelimit_timeout_ms,
+                         GCancellable *cancellable,
+                         NMHttpClientPollGetCheckFcn check_fcn,
+                         gpointer check_user_data,
+                         GAsyncReadyCallback callback,
+                         gpointer user_data)
+{
+	nm_auto_pop_gmaincontext GMainContext *context = NULL;
+	PollGetData *poll_get_data;
+
+	g_return_if_fail (NM_IS_HTTP_CLIENT (self));
+	g_return_if_fail (uri && uri[0]);
+	g_return_if_fail (request_timeout_ms >= -1);
+	g_return_if_fail (request_max_data >= -1);
+	g_return_if_fail (poll_timeout_ms >= -1);
+	g_return_if_fail (ratelimit_timeout_ms >= -1);
+	g_return_if_fail (!cancellable || G_CANCELLABLE (cancellable));
+
+	poll_get_data = g_slice_new (PollGetData);
+	*poll_get_data = (PollGetData) {
+		.task               = nm_g_task_new (self, cancellable, nm_http_client_poll_get, callback, user_data),
+		.uri                = g_strdup (uri),
+		.request_timeout_ms = request_timeout_ms,
+		.request_max_data   = request_max_data,
+		.check_fcn          = check_fcn,
+		.check_user_data    = check_user_data,
+		.response_code      = -1,
+	};
+
+	nmcs_wait_for_objects_register (poll_get_data->task);
+
+	g_task_set_task_data (poll_get_data->task,
+	                      poll_get_data,
+	                      _poll_get_data_free);
+
+	context = nm_g_main_context_push_thread_default_if_necessary (nm_http_client_get_main_context (self));
+
+	nmcs_utils_poll (poll_timeout_ms,
+	                 ratelimit_timeout_ms,
+	                 0,
+	                 _poll_get_probe_start_fcn,
+	                 _poll_get_probe_finish_fcn,
+	                 poll_get_data,
+	                 cancellable,
+	                 _poll_get_done_cb,
+	                 poll_get_data);
+}
+
+gboolean
+nm_http_client_poll_get_finish (NMHttpClient *self,
+                                GAsyncResult *result,
+                                long *out_response_code,
+                                GBytes **out_response_data,
+                                GError **error)
+{
+	PollGetData *poll_get_data;
+	GTask *task;
+	gboolean success;
+	gs_free_error GError *local_error = NULL;
+
+	g_return_val_if_fail (NM_HTTP_CLIENT (self), FALSE);
+	g_return_val_if_fail (nm_g_task_is_valid (result, self, nm_http_client_poll_get), FALSE);
+
+	task = G_TASK (result);
+
+	success = g_task_propagate_boolean (task, &local_error);
+	if (   local_error
+	    || !success) {
+		if (local_error)
+			g_propagate_error (error, g_steal_pointer (&local_error));
+		NM_SET_OUT (out_response_code, -1);
+		NM_SET_OUT (out_response_data, NULL);
+		return FALSE;
+	}
+
+	poll_get_data = g_task_get_task_data (task);
+
+	NM_SET_OUT (out_response_code, poll_get_data->response_code);
+	NM_SET_OUT (out_response_data, g_steal_pointer (&poll_get_data->response_data));
+
+	return TRUE;
+}
+
+/*****************************************************************************/
+
+static void
+_mhandle_action (NMHttpClient *self,
+                 int sockfd,
+                 int ev_bitmask)
+{
+	NMHttpClientPrivate *priv = NM_HTTP_CLIENT_GET_PRIVATE (self);
+	EHandleData *edata;
+	CURLMsg *msg;
+	CURLcode eret;
+	int m_left;
+	CURLMcode ret;
+	int running_handles;
+
+	ret = curl_multi_socket_action (priv->mhandle, sockfd, ev_bitmask, &running_handles);
+	if (ret != CURLM_OK) {
+		_LOGE ("curl: curl_multi_socket_action() failed: (%d) %s", ret, curl_multi_strerror (ret));
+		/* really unexpected. Not clear how to handle this. */
+	}
+
+	while ((msg = curl_multi_info_read (priv->mhandle, &m_left))) {
+
+		if (msg->msg != CURLMSG_DONE)
+			continue;
+
+		eret = curl_easy_getinfo (msg->easy_handle, CURLINFO_PRIVATE, (char **) &edata);
+
+		nm_assert (eret == CURLE_OK);
+		nm_assert (edata);
+
+		edata->ehandle_result = msg->data.result;
+		_ehandle_complete (edata, NULL);
+	}
+}
+
+static gboolean
+_mhandle_socket_cb (int fd,
+                    GIOCondition condition,
+                    gpointer user_data)
+{
+	int ev_bitmask = 0;
+
+	if (condition & G_IO_IN)
+		ev_bitmask |= CURL_CSELECT_IN;
+	if (condition & G_IO_OUT)
+		ev_bitmask |= CURL_CSELECT_OUT;
+	if (condition & G_IO_ERR)
+		ev_bitmask |= CURL_CSELECT_ERR;
+
+	_mhandle_action (user_data, fd, ev_bitmask);
+	return G_SOURCE_CONTINUE;
+}
+
+static int
+_mhandle_socketfunction_cb (CURL *e_handle, curl_socket_t fd, int what, void *user_data, void *socketp)
+{
+	NMHttpClient *self = user_data;
+	NMHttpClientPrivate *priv = NM_HTTP_CLIENT_GET_PRIVATE (self);
+
+	(void) _NM_ENSURE_TYPE (int, fd);
+
+	nm_clear_g_source_inst (&priv->mhandle_source_socket);
+
+	if (what != CURL_POLL_REMOVE) {
+		GIOCondition condition = 0;
+
+		if (what == CURL_POLL_IN)
+			condition = G_IO_IN;
+		else if (what == CURL_POLL_OUT)
+			condition = G_IO_OUT;
+		else if (what == CURL_POLL_INOUT)
+			condition = G_IO_IN | G_IO_OUT;
+		else
+			condition = 0;
+
+		if (condition) {
+			priv->mhandle_source_socket = g_unix_fd_source_new (fd, condition);
+			g_source_set_callback (priv->mhandle_source_socket, G_SOURCE_FUNC (_mhandle_socket_cb), self, NULL);
+			g_source_attach (priv->mhandle_source_socket, priv->context);
+		}
+	}
+
+	return CURLM_OK;
+}
+
+static gboolean
+_mhandle_timeout_cb (gpointer user_data)
+{
+	_mhandle_action (user_data, CURL_SOCKET_TIMEOUT, 0);
+	return G_SOURCE_CONTINUE;
+}
+
+static int
+_mhandle_timerfunction_cb (CURLM *multi, long timeout_msec, void *user_data)
+{
+	NMHttpClient *self = user_data;
+	NMHttpClientPrivate *priv = NM_HTTP_CLIENT_GET_PRIVATE (self);
+
+	nm_clear_pointer (&priv->mhandle_source_timeout, nm_g_source_destroy_and_unref);
+	if (timeout_msec >= 0) {
+		priv->mhandle_source_timeout = _source_attach (self,
+		                                               nm_g_timeout_source_new (NM_MIN (timeout_msec, G_MAXINT),
+		                                                                        G_PRIORITY_DEFAULT,
+		                                                                        _mhandle_timeout_cb,
+		                                                                        self,
+		                                                                        NULL));
+	}
+	return 0;
+}
+
+/*****************************************************************************/
+
+static void
+nm_http_client_init (NMHttpClient *self)
+{
+}
+
+static void
+constructed (GObject *object)
+{
+	NMHttpClient *self = NM_HTTP_CLIENT (object);
+	NMHttpClientPrivate *priv = NM_HTTP_CLIENT_GET_PRIVATE (self);
+
+	priv->context = g_main_context_ref_thread_default ();
+
+	priv->mhandle = curl_multi_init ();
+	if (!priv->mhandle)
+		_LOGE ("curl: failed to create multi-handle");
+	else {
+		curl_multi_setopt (priv->mhandle, CURLMOPT_SOCKETFUNCTION, _mhandle_socketfunction_cb);
+		curl_multi_setopt (priv->mhandle, CURLMOPT_SOCKETDATA, self);
+		curl_multi_setopt (priv->mhandle, CURLMOPT_TIMERFUNCTION, _mhandle_timerfunction_cb);
+		curl_multi_setopt (priv->mhandle, CURLMOPT_TIMERDATA, self);
+		if (NM_CURL_DEBUG)
+			curl_multi_setopt (priv->mhandle, CURLOPT_VERBOSE, 1);
+	}
+
+	G_OBJECT_CLASS (nm_http_client_parent_class)->constructed (object);
+}
+
+NMHttpClient *
+nm_http_client_new (void)
+{
+	return g_object_new (NM_TYPE_HTTP_CLIENT, NULL);
+}
+
+static void
+dispose (GObject *object)
+{
+	NMHttpClient *self = NM_HTTP_CLIENT (object);
+	NMHttpClientPrivate *priv = NM_HTTP_CLIENT_GET_PRIVATE (self);
+
+	nm_clear_pointer (&priv->mhandle, curl_multi_cleanup);
+
+	nm_clear_g_source_inst (&priv->mhandle_source_timeout);
+	nm_clear_g_source_inst (&priv->mhandle_source_socket);
+
+	G_OBJECT_CLASS (nm_http_client_parent_class)->dispose (object);
+}
+
+static void
+finalize (GObject *object)
+{
+	NMHttpClient *self = NM_HTTP_CLIENT (object);
+	NMHttpClientPrivate *priv = NM_HTTP_CLIENT_GET_PRIVATE (self);
+
+	G_OBJECT_CLASS (nm_http_client_parent_class)->finalize (object);
+
+	g_main_context_unref (priv->context);
+
+	curl_global_cleanup ();
+}
+
+static void
+nm_http_client_class_init (NMHttpClientClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	object_class->constructed = constructed;
+	object_class->dispose     = dispose;
+	object_class->finalize    = finalize;
+
+	nm_http_client_curl_global_init ();
+}
diff --git a/clients/cloud-setup/nm-http-client.h b/clients/cloud-setup/nm-http-client.h
new file mode 100644
index 00000000..86ee938e
--- /dev/null
+++ b/clients/cloud-setup/nm-http-client.h
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: LGPL-2.1+
+
+#ifndef __NM_HTTP_CLIENT_C__
+#define __NM_HTTP_CLIENT_C__
+
+/*****************************************************************************/
+
+typedef struct _NMHttpClient      NMHttpClient;
+typedef struct _NMHttpClientClass NMHttpClientClass;
+
+#define NM_TYPE_HTTP_CLIENT            (nm_http_client_get_type ())
+#define NM_HTTP_CLIENT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_HTTP_CLIENT, NMHttpClient))
+#define NM_HTTP_CLIENT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_HTTP_CLIENT, NMHttpClientClass))
+#define NM_IS_HTTP_CLIENT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_HTTP_CLIENT))
+#define NM_IS_HTTP_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_HTTP_CLIENT))
+#define NM_HTTP_CLIENT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_HTTP_CLIENT, NMHttpClientClass))
+
+GType nm_http_client_get_type (void);
+
+NMHttpClient *nm_http_client_new (void);
+
+/*****************************************************************************/
+
+GMainContext *nm_http_client_get_main_context (NMHttpClient *self);
+
+/*****************************************************************************/
+
+void nm_http_client_get (NMHttpClient *self,
+                         const char *uri,
+                         int timeout_msec,
+                         gssize max_data,
+                         GCancellable *cancellable,
+                         GAsyncReadyCallback callback,
+                         gpointer user_data);
+
+gboolean nm_http_client_get_finish (NMHttpClient *self,
+                                    GAsyncResult *result,
+                                    long *out_response_code,
+                                    GBytes **out_response_data,
+                                    GError **error);
+
+typedef gboolean (*NMHttpClientPollGetCheckFcn) (long response_code,
+                                                 GBytes *response_data,
+                                                 gpointer check_user_data,
+                                                 GError **error);
+
+void nm_http_client_poll_get (NMHttpClient *self,
+                              const char *uri,
+                              int request_timeout_ms,
+                              gssize request_max_data,
+                              int poll_timeout_ms,
+                              int ratelimit_timeout_ms,
+                              GCancellable *cancellable,
+                              NMHttpClientPollGetCheckFcn check_fcn,
+                              gpointer check_user_data,
+                              GAsyncReadyCallback callback,
+                              gpointer user_data);
+
+gboolean nm_http_client_poll_get_finish (NMHttpClient *self,
+                                         GAsyncResult *result,
+                                         long *out_response_code,
+                                         GBytes **out_response_data,
+                                         GError **error);
+
+/*****************************************************************************/
+
+#endif /* __NM_HTTP_CLIENT_C__ */
diff --git a/clients/cloud-setup/nmcs-provider-ec2.c b/clients/cloud-setup/nmcs-provider-ec2.c
new file mode 100644
index 00000000..b6ac5a4c
--- /dev/null
+++ b/clients/cloud-setup/nmcs-provider-ec2.c
@@ -0,0 +1,555 @@
+// SPDX-License-Identifier: LGPL-2.1+
+
+#include "nm-default.h"
+
+#include "nmcs-provider-ec2.h"
+
+#include "nm-cloud-setup-utils.h"
+
+/*****************************************************************************/
+
+#define HTTP_TIMEOUT_MS 3000
+
+#define NM_EC2_HOST               "169.254.169.254"
+#define NM_EC2_BASE               "http://" NM_EC2_HOST
+#define NM_EC2_API_VERSION        "2018-09-24"
+#define NM_EC2_METADATA_URL_BASE  /* $NM_EC2_BASE/$NM_EC2_API_VERSION */ "/meta-data/network/interfaces/macs/"
+
+static const char *
+_ec2_base (void)
+{
+	static const char *base_cached = NULL;
+	const char *base;
+
+again:
+	base = g_atomic_pointer_get (&base_cached);
+	if (G_UNLIKELY (!base)) {
+
+		/* The base URI can be set via environment variable.
+		 * This is mainly for testing, it's not usually supposed to be configured.
+		 * Consider this private API! */
+		base = g_getenv (NMCS_ENV_VARIABLE ("NM_CLOUD_SETUP_EC2_HOST"));
+
+		if (   base
+		    && base[0]
+		    && !strchr (base, '/')) {
+			if (   NM_STR_HAS_PREFIX (base, "http://")
+			    || NM_STR_HAS_PREFIX (base, "https://"))
+				base = g_intern_string (base);
+			else {
+				gs_free char *s = NULL;
+
+				s = g_strconcat ("http://", base, NULL);
+				base = g_intern_string (s);
+			}
+		}
+		if (!base)
+			base = NM_EC2_BASE;
+
+		nm_assert (!NM_STR_HAS_SUFFIX (base, "/"));
+
+		if (!g_atomic_pointer_compare_and_exchange (&base_cached, NULL, base))
+			goto again;
+	}
+
+	return base;
+}
+
+#define _ec2_uri_concat(...)     nmcs_utils_uri_build_concat (_ec2_base (), __VA_ARGS__)
+#define _ec2_uri_interfaces(...) _ec2_uri_concat (NM_EC2_API_VERSION, NM_EC2_METADATA_URL_BASE, ##__VA_ARGS__)
+
+/*****************************************************************************/
+
+struct _NMCSProviderEC2 {
+	NMCSProvider parent;
+};
+
+struct _NMCSProviderEC2Class {
+	NMCSProviderClass parent;
+};
+
+G_DEFINE_TYPE (NMCSProviderEC2, nmcs_provider_ec2, NMCS_TYPE_PROVIDER);
+
+/*****************************************************************************/
+
+static gboolean
+_detect_get_meta_data_check_cb (long response_code,
+                                GBytes *response_data,
+                                gpointer check_user_data,
+                                GError **error)
+{
+	return    response_code == 200
+	       && nmcs_utils_parse_get_full_line (response_data, "ami-id");
+}
+
+static void
+_detect_get_meta_data_done_cb (GObject *source,
+                               GAsyncResult *result,
+                               gpointer user_data)
+{
+	gs_unref_object GTask *task = user_data;
+	gs_free_error GError *get_error = NULL;
+	gs_free_error GError *error = NULL;
+	gboolean success;
+
+	success = nm_http_client_poll_get_finish (NM_HTTP_CLIENT (source),
+	                                          result,
+	                                          NULL,
+	                                          NULL,
+	                                          &get_error);
+
+	if (nm_utils_error_is_cancelled (get_error, FALSE)) {
+		g_task_return_error (task, g_steal_pointer (&get_error));
+		return;
+	}
+
+	if (get_error) {
+		nm_utils_error_set (&error,
+		                    NM_UTILS_ERROR_UNKNOWN,
+		                    "failure to get EC2 metadata: %s",
+		                    get_error->message);
+		g_task_return_error (task, g_steal_pointer (&error));
+		return;
+	}
+
+	if (!success) {
+		nm_utils_error_set (&error,
+		                    NM_UTILS_ERROR_UNKNOWN,
+		                    "failure to detect EC2 metadata");
+		g_task_return_error (task, g_steal_pointer (&error));
+		return;
+	}
+
+	g_task_return_boolean (task, TRUE);
+}
+
+static void
+detect (NMCSProvider *provider,
+        GTask *task)
+{
+	NMHttpClient *http_client;
+	gs_free char *uri = NULL;
+
+	http_client = nmcs_provider_get_http_client (provider);
+
+	nm_http_client_poll_get (http_client,
+	                         (uri = _ec2_uri_concat ("latest/meta-data/")),
+	                         HTTP_TIMEOUT_MS,
+	                         256*1024,
+	                         7000,
+	                         1000,
+	                         g_task_get_cancellable (task),
+	                         _detect_get_meta_data_check_cb,
+	                         NULL,
+	                         _detect_get_meta_data_done_cb,
+	                         task);
+}
+
+/*****************************************************************************/
+
+typedef struct {
+	NMCSProviderGetConfigTaskData *get_config_data;
+	GCancellable *cancellable;
+	gulong cancelled_id;
+	guint n_pending;
+} GetConfigIfaceData;
+
+static void
+_get_config_task_return (GetConfigIfaceData *iface_data,
+                         GError *error_take)
+{
+	NMCSProviderGetConfigTaskData *get_config_data = iface_data->get_config_data;
+
+	nm_clear_g_cancellable_disconnect (g_task_get_cancellable (get_config_data->task),
+	                                   &iface_data->cancelled_id);
+
+	nm_clear_g_cancellable (&iface_data->cancellable);
+
+	nm_g_slice_free (iface_data);
+
+	if (error_take) {
+		if (nm_utils_error_is_cancelled (error_take, FALSE))
+			_LOGD ("get-config: cancelled");
+		else
+			_LOGD ("get-config: failed: %s", error_take->message);
+		g_task_return_error (get_config_data->task, error_take);
+	} else {
+		_LOGD ("get-config: success");
+		g_task_return_pointer (get_config_data->task,
+		                       g_hash_table_ref (get_config_data->result_dict),
+		                       (GDestroyNotify) g_hash_table_unref);
+	}
+
+	g_object_unref (get_config_data->task);
+}
+
+static void
+_get_config_fetch_done_cb (NMHttpClient *http_client,
+                           GAsyncResult *result,
+                           gpointer user_data,
+                           gboolean is_local_ipv4)
+{
+	GetConfigIfaceData *iface_data;
+	NMCSProviderGetConfigTaskData *get_config_data;
+	const char *hwaddr = NULL;
+	gs_unref_bytes GBytes *response_data = NULL;
+	gs_free_error GError *error = NULL;
+	gboolean success;
+	NMCSProviderGetConfigIfaceData *config_iface_data;
+
+	nm_utils_user_data_unpack (user_data, &iface_data, &hwaddr);
+
+	success = nm_http_client_poll_get_finish (http_client,
+	                                          result,
+	                                          NULL,
+	                                          &response_data,
+	                                          &error);
+	if (nm_utils_error_is_cancelled (error, FALSE))
+		return;
+
+	get_config_data = iface_data->get_config_data;
+
+	config_iface_data = g_hash_table_lookup (get_config_data->result_dict, hwaddr);
+
+	if (success) {
+		in_addr_t tmp_addr;
+		int tmp_prefix;
+
+		if (is_local_ipv4) {
+			gs_free const char **s_addrs = NULL;
+			gsize i, len;
+
+			s_addrs = nm_utils_strsplit_set_full (g_bytes_get_data (response_data, NULL), "\n", NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP);
+			len = NM_PTRARRAY_LEN (s_addrs);
+
+			nm_assert (!config_iface_data->has_ipv4s);
+			nm_assert (!config_iface_data->ipv4s_arr);
+			config_iface_data->has_ipv4s = TRUE;
+			config_iface_data->ipv4s_len = 0;
+			if (len > 0) {
+				config_iface_data->ipv4s_arr = g_new (in_addr_t, len);
+
+				for (i = 0; i < len; i++) {
+					if (nm_utils_parse_inaddr_bin (AF_INET,
+					                               s_addrs[i],
+					                               NULL,
+					                               &tmp_addr))
+						config_iface_data->ipv4s_arr[config_iface_data->ipv4s_len++] = tmp_addr;
+				}
+			}
+		} else {
+			if (nm_utils_parse_inaddr_prefix_bin (AF_INET,
+			                                      g_bytes_get_data (response_data, NULL),
+			                                      NULL,
+			                                      &tmp_addr,
+			                                      &tmp_prefix)) {
+				nm_assert (!config_iface_data->has_cidr);
+				config_iface_data->has_cidr = TRUE;
+				config_iface_data->cidr_prefix = tmp_prefix;
+				config_iface_data->cidr_addr = tmp_addr;
+			}
+		}
+	}
+
+	if (--iface_data->n_pending > 0)
+		return;
+
+	_get_config_task_return (iface_data, NULL);
+}
+
+static void
+_get_config_fetch_done_cb_subnet_ipv4_cidr_block (GObject *source,
+                                                  GAsyncResult *result,
+                                                  gpointer user_data)
+{
+	_get_config_fetch_done_cb (NM_HTTP_CLIENT (source), result, user_data, FALSE);
+}
+
+static void
+_get_config_fetch_done_cb_local_ipv4s (GObject *source,
+                                       GAsyncResult *result,
+                                       gpointer user_data)
+{
+	_get_config_fetch_done_cb (NM_HTTP_CLIENT (source), result, user_data, TRUE);
+}
+
+static void
+_get_config_fetch_cancelled_cb (GObject *object, gpointer user_data)
+{
+	GetConfigIfaceData *iface_data = user_data;
+
+	if (iface_data->cancelled_id == 0)
+		return;
+
+	nm_clear_g_signal_handler (g_task_get_cancellable (iface_data->get_config_data->task),
+	                           &iface_data->cancelled_id);
+	_get_config_task_return (iface_data,
+	                         nm_utils_error_new_cancelled (FALSE, NULL));
+}
+
+typedef struct {
+	NMCSProviderGetConfigTaskData *get_config_data;
+	GHashTable *response_parsed;
+} GetConfigMetadataData;
+
+typedef struct {
+	gssize iface_idx;
+	char path[0];
+} GetConfigMetadataMac;
+
+static void
+_get_config_metadata_ready_cb (GObject *source,
+                               GAsyncResult *result,
+                               gpointer user_data)
+{
+	GetConfigMetadataData *metadata_data = user_data;
+	GetConfigIfaceData *iface_data;
+	NMCSProviderGetConfigTaskData *get_config_data = metadata_data->get_config_data;
+	gs_unref_hashtable GHashTable *response_parsed = g_steal_pointer (&metadata_data->response_parsed);
+	gs_free_error GError *error = NULL;
+	GCancellable *cancellable;
+	GetConfigMetadataMac *v_mac_data;
+	const char *v_hwaddr;
+	GHashTableIter h_iter;
+	NMHttpClient *http_client;
+
+	nm_g_slice_free (metadata_data);
+
+	nm_http_client_poll_get_finish (NM_HTTP_CLIENT (source),
+	                                result,
+	                                NULL,
+	                                NULL,
+	                                &error);
+
+	iface_data = g_slice_new (GetConfigIfaceData);
+	*iface_data = (GetConfigIfaceData) {
+		.get_config_data = get_config_data,
+		.n_pending       = 0,
+	};
+
+	if (nm_utils_error_is_cancelled (error, FALSE)) {
+		_get_config_task_return (iface_data, g_steal_pointer (&error));
+		return;
+	}
+
+	/* We ignore errors. Only if we got no response at all, it's a problem.
+	 * Otherwise, we proceed with whatever we could fetch. */
+	if (!response_parsed) {
+		_get_config_task_return (iface_data,
+		                         nm_utils_error_new (NM_UTILS_ERROR_UNKNOWN,
+		                                             "meta data for interfaces not found"));
+		return;
+	}
+
+	cancellable = g_task_get_cancellable (get_config_data->task);
+	if (cancellable) {
+		gulong cancelled_id;
+
+		cancelled_id = g_cancellable_connect (cancellable,
+		                                      G_CALLBACK (_get_config_fetch_cancelled_cb),
+		                                      iface_data,
+		                                      NULL);
+		if (cancelled_id == 0) {
+			_get_config_task_return (iface_data,
+			                         nm_utils_error_new_cancelled (FALSE, NULL));
+			return;
+		}
+
+		iface_data->cancelled_id = cancelled_id;
+	}
+
+	iface_data->cancellable = g_cancellable_new ();
+
+	http_client = nmcs_provider_get_http_client (g_task_get_source_object (get_config_data->task));
+
+	g_hash_table_iter_init (&h_iter, response_parsed);
+	while (g_hash_table_iter_next (&h_iter, (gpointer *) &v_hwaddr, (gpointer *) &v_mac_data)) {
+		NMCSProviderGetConfigIfaceData *config_iface_data;
+		gs_free char *uri1 = NULL;
+		gs_free char *uri2 = NULL;
+		const char *hwaddr;
+
+		if (!g_hash_table_lookup_extended (get_config_data->result_dict, v_hwaddr, (gpointer *) &hwaddr, (gpointer *) &config_iface_data)) {
+			if (!get_config_data->any) {
+				_LOGD ("get-config: skip fetching meta data for %s (%s)", v_hwaddr, v_mac_data->path);
+				continue;
+			}
+			config_iface_data = nmcs_provider_get_config_iface_data_new (FALSE);
+			g_hash_table_insert (get_config_data->result_dict,
+			                     (char *) (hwaddr = g_strdup (v_hwaddr)),
+			                     config_iface_data);
+		}
+
+		nm_assert (config_iface_data->iface_idx == -1);
+		config_iface_data->iface_idx = v_mac_data->iface_idx;
+
+		_LOGD ("get-config: start fetching meta data for #%"G_GSSIZE_FORMAT", %s (%s)", config_iface_data->iface_idx, hwaddr, v_mac_data->path);
+
+		iface_data->n_pending++;
+		nm_http_client_poll_get (http_client,
+		                         (uri1 = _ec2_uri_interfaces (v_mac_data->path,
+		                                                        NM_STR_HAS_SUFFIX (v_mac_data->path, "/")
+		                                                      ? ""
+		                                                      : "/",
+		                                                      "subnet-ipv4-cidr-block")),
+		                         HTTP_TIMEOUT_MS,
+		                         512*1024,
+		                         10000,
+		                         1000,
+		                         iface_data->cancellable,
+		                         NULL,
+		                         NULL,
+		                         _get_config_fetch_done_cb_subnet_ipv4_cidr_block,
+		                         nm_utils_user_data_pack (iface_data, hwaddr));
+
+		iface_data->n_pending++;
+		nm_http_client_poll_get (http_client,
+		                         (uri2 = _ec2_uri_interfaces (v_mac_data->path,
+		                                                        NM_STR_HAS_SUFFIX (v_mac_data->path, "/")
+		                                                      ? ""
+		                                                      : "/",
+		                                                      "local-ipv4s")),
+		                         HTTP_TIMEOUT_MS,
+		                         512*1024,
+		                         10000,
+		                         1000,
+		                         iface_data->cancellable,
+		                         NULL,
+		                         NULL,
+		                         _get_config_fetch_done_cb_local_ipv4s,
+		                         nm_utils_user_data_pack (iface_data, hwaddr));
+	}
+
+	if (iface_data->n_pending == 0)
+		_get_config_task_return (iface_data, NULL);
+}
+
+static gboolean
+_get_config_metadata_ready_check (long response_code,
+                                  GBytes *response_data,
+                                  gpointer check_user_data,
+                                  GError **error)
+{
+	GetConfigMetadataData *metadata_data = check_user_data;
+	gs_unref_hashtable GHashTable *response_parsed = NULL;
+	const guint8 *r_data;
+	gsize r_len;
+	GHashTableIter h_iter;
+	gboolean has_all;
+	const char *c_hwaddr;
+	gssize iface_idx_counter = 0;
+
+	if (   response_code != 200
+	    || !response_data) {
+		/* we wait longer. */
+		return FALSE;
+	}
+
+	r_data = g_bytes_get_data (response_data, &r_len);
+
+	while (r_len > 0) {
+		const guint8 *p_eol;
+		const char *p_start;
+		gsize p_start_l;
+		gsize p_start_l_2;
+		char *hwaddr;
+		GetConfigMetadataMac *mac_data;
+
+		p_start = (const char *) r_data;
+
+		p_eol = memchr (r_data, '\n', r_len);
+		if (p_eol) {
+			p_start_l = (p_eol - r_data);
+			r_len -= p_start_l + 1;
+			r_data = &p_eol[1];
+		} else {
+			p_start_l = r_len;
+			r_data = &r_data[r_len];
+			r_len = 0;
+		}
+
+		if (p_start_l == 0)
+			continue;
+
+		p_start_l_2 = p_start_l;
+		if (p_start[p_start_l_2 - 1] == '/') {
+			/* trim the trailing "/". */
+			p_start_l_2--;
+		}
+
+		hwaddr = nmcs_utils_hwaddr_normalize (p_start, p_start_l_2);
+		if (!hwaddr)
+			continue;
+
+		if (!response_parsed)
+			response_parsed = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, g_free);
+
+		mac_data = g_malloc (sizeof (GetConfigMetadataData) + 1 + p_start_l);
+		mac_data->iface_idx = iface_idx_counter++;
+		memcpy (mac_data->path, p_start, p_start_l);
+		mac_data->path[p_start_l] = '\0';
+
+		g_hash_table_insert (response_parsed, hwaddr, mac_data);
+	}
+
+	has_all = TRUE;
+	g_hash_table_iter_init (&h_iter, metadata_data->get_config_data->result_dict);
+	while (g_hash_table_iter_next (&h_iter, (gpointer *) &c_hwaddr, NULL)) {
+		if (   !response_parsed
+		    || !g_hash_table_contains (response_parsed, c_hwaddr)) {
+			has_all = FALSE;
+			break;
+		}
+	}
+
+	nm_clear_pointer (&metadata_data->response_parsed, g_hash_table_unref);
+	metadata_data->response_parsed = g_steal_pointer (&response_parsed);
+	return has_all;
+}
+
+static void
+get_config (NMCSProvider *provider,
+            NMCSProviderGetConfigTaskData *get_config_data)
+{
+	gs_free char *uri = NULL;
+	GetConfigMetadataData *metadata_data;
+
+	metadata_data = g_slice_new (GetConfigMetadataData);
+	*metadata_data = (GetConfigMetadataData) {
+		.get_config_data = get_config_data,
+	};
+
+	/* First we fetch the "macs/". If the caller requested some particular
+	 * MAC addresses, then we poll until we see them. They might not yet be
+	 * around from the start...
+	 */
+	nm_http_client_poll_get (nmcs_provider_get_http_client (provider),
+	                         (uri = _ec2_uri_interfaces ()),
+	                         HTTP_TIMEOUT_MS,
+	                         256 * 1024,
+	                         15000,
+	                         1000,
+	                         g_task_get_cancellable (get_config_data->task),
+	                         _get_config_metadata_ready_check,
+	                         metadata_data,
+	                         _get_config_metadata_ready_cb,
+	                         metadata_data);
+}
+
+/*****************************************************************************/
+
+static void
+nmcs_provider_ec2_init (NMCSProviderEC2 *self)
+{
+}
+
+static void
+nmcs_provider_ec2_class_init (NMCSProviderEC2Class *klass)
+{
+	NMCSProviderClass *provider_class = NMCS_PROVIDER_CLASS (klass);
+
+	provider_class->_name                 = "ec2";
+	provider_class->_env_provider_enabled = NMCS_ENV_VARIABLE ("NM_CLOUD_SETUP_EC2");
+	provider_class->detect                = detect;
+	provider_class->get_config            = get_config;
+}
diff --git a/clients/cloud-setup/nmcs-provider-ec2.h b/clients/cloud-setup/nmcs-provider-ec2.h
new file mode 100644
index 00000000..763c3af8
--- /dev/null
+++ b/clients/cloud-setup/nmcs-provider-ec2.h
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: LGPL-2.1+
+
+#ifndef __NMCS_PROVIDER_EC2_H__
+#define __NMCS_PROVIDER_EC2_H__
+
+#include "nmcs-provider.h"
+
+/*****************************************************************************/
+
+typedef struct _NMCSProviderEC2      NMCSProviderEC2;
+typedef struct _NMCSProviderEC2Class NMCSProviderEC2Class;
+
+#define NMCS_TYPE_PROVIDER_EC2            (nmcs_provider_ec2_get_type ())
+#define NMCS_PROVIDER_EC2(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMCS_TYPE_PROVIDER_EC2, NMCSProviderEC2))
+#define NMCS_PROVIDER_EC2_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NMCS_TYPE_PROVIDER_EC2, NMCSProviderEC2Class))
+#define NMCS_IS_PROVIDER_EC2(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMCS_TYPE_PROVIDER_EC2))
+#define NMCS_IS_PROVIDER_EC2_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NMCS_TYPE_PROVIDER_EC2))
+#define NMCS_PROVIDER_EC2_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NMCS_TYPE_PROVIDER_EC2, NMCSProviderEC2Class))
+
+GType nmcs_provider_ec2_get_type (void);
+
+/*****************************************************************************/
+
+#endif /* __NMCS_PROVIDER_EC2_H__ */
diff --git a/clients/cloud-setup/nmcs-provider.c b/clients/cloud-setup/nmcs-provider.c
new file mode 100644
index 00000000..1f1b6e60
--- /dev/null
+++ b/clients/cloud-setup/nmcs-provider.c
@@ -0,0 +1,245 @@
+// SPDX-License-Identifier: LGPL-2.1+
+
+#include "nm-default.h"
+
+#include "nmcs-provider.h"
+
+#include "nm-cloud-setup-utils.h"
+
+/*****************************************************************************/
+
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+	PROP_HTTP_CLIENT,
+);
+
+typedef struct _NMCSProviderPrivate {
+	NMHttpClient *http_client;
+} NMCSProviderPrivate;
+
+G_DEFINE_TYPE (NMCSProvider, nmcs_provider, G_TYPE_OBJECT);
+
+#define NMCS_PROVIDER_GET_PRIVATE(self) _NM_GET_PRIVATE_PTR(self, NMCSProvider, NMCS_IS_PROVIDER)
+
+/*****************************************************************************/
+
+const char *
+nmcs_provider_get_name (NMCSProvider *self)
+{
+	NMCSProviderClass *klass;
+
+	g_return_val_if_fail (NMCS_IS_PROVIDER (self), NULL);
+
+	klass = NMCS_PROVIDER_GET_CLASS (self);
+	nm_assert (klass->_name);
+	return klass->_name;
+}
+
+/*****************************************************************************/
+
+NMHttpClient *
+nmcs_provider_get_http_client (NMCSProvider *self)
+{
+	g_return_val_if_fail (NMCS_IS_PROVIDER (self), NULL);
+
+	return NMCS_PROVIDER_GET_PRIVATE (self)->http_client;
+}
+
+GMainContext *
+nmcs_provider_get_main_context (NMCSProvider *self)
+{
+	g_return_val_if_fail (NMCS_IS_PROVIDER (self), NULL);
+
+	return nm_http_client_get_main_context (NMCS_PROVIDER_GET_PRIVATE (self)->http_client);
+}
+
+/*****************************************************************************/
+
+void
+nmcs_provider_detect (NMCSProvider *self,
+                      GCancellable *cancellable,
+                      GAsyncReadyCallback callback,
+                      gpointer user_data)
+{
+	gs_unref_object GTask *task = NULL;
+	const char *env;
+
+	g_return_if_fail (NMCS_IS_PROVIDER (self));
+	g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable));
+
+	task = nm_g_task_new (self, cancellable, nmcs_provider_detect, callback, user_data);
+
+	nmcs_wait_for_objects_register (task);
+
+	env = g_getenv (NMCS_PROVIDER_GET_CLASS (self)->_env_provider_enabled);
+	if (!_nm_utils_ascii_str_to_bool (env, FALSE)) {
+		g_task_return_error (task,
+		                     nm_utils_error_new (NM_UTILS_ERROR_UNKNOWN,
+		                                         "provider is disabled"));
+		return;
+	}
+
+	NMCS_PROVIDER_GET_CLASS (self)->detect (self,
+	                                        g_steal_pointer (&task));
+}
+
+gboolean
+nmcs_provider_detect_finish (NMCSProvider *self,
+                             GAsyncResult *result,
+                             GError **error)
+{
+	g_return_val_if_fail (NMCS_IS_PROVIDER (self), FALSE);
+	g_return_val_if_fail (nm_g_task_is_valid (result, self, nmcs_provider_detect), FALSE);
+
+	return g_task_propagate_boolean (G_TASK (result), error);
+}
+
+/*****************************************************************************/
+
+NMCSProviderGetConfigIfaceData *
+nmcs_provider_get_config_iface_data_new (gboolean was_requested)
+{
+	NMCSProviderGetConfigIfaceData *iface_data;
+
+	iface_data = g_slice_new (NMCSProviderGetConfigIfaceData);
+	*iface_data = (NMCSProviderGetConfigIfaceData) {
+		.iface_idx     = -1,
+		.was_requested = was_requested,
+	};
+	return iface_data;
+}
+
+static void
+_iface_data_free (gpointer data)
+{
+	NMCSProviderGetConfigIfaceData *iface_data = data;
+
+	g_free (iface_data->ipv4s_arr);
+
+	nm_g_slice_free (iface_data);
+}
+
+static void
+_get_config_data_free (gpointer data)
+{
+	NMCSProviderGetConfigTaskData *get_config_data = data;
+
+	if (get_config_data->extra_destroy)
+		get_config_data->extra_destroy (get_config_data->extra_data);
+
+	nm_clear_pointer (&get_config_data->result_dict, g_hash_table_unref);
+
+	nm_g_slice_free (get_config_data);
+}
+
+void
+nmcs_provider_get_config (NMCSProvider *self,
+                          gboolean any,
+                          const char *const*hwaddrs,
+                          GCancellable *cancellable,
+                          GAsyncReadyCallback callback,
+                          gpointer user_data)
+{
+	NMCSProviderGetConfigTaskData *get_config_data;
+
+	g_return_if_fail (NMCS_IS_PROVIDER (self));
+	g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable));
+
+	get_config_data = g_slice_new (NMCSProviderGetConfigTaskData);
+	*get_config_data = (NMCSProviderGetConfigTaskData) {
+		.task        = nm_g_task_new (self, cancellable, nmcs_provider_get_config, callback, user_data),
+		.any         = any,
+		.result_dict = g_hash_table_new_full (nm_str_hash,
+		                                      g_str_equal,
+		                                      g_free,
+		                                      _iface_data_free),
+	};
+
+	g_task_set_task_data (get_config_data->task, get_config_data, _get_config_data_free);
+
+	nmcs_wait_for_objects_register (get_config_data->task);
+
+	for (; hwaddrs && hwaddrs[0]; hwaddrs++) {
+		g_hash_table_insert (get_config_data->result_dict,
+		                     g_strdup (hwaddrs[0]),
+		                     nmcs_provider_get_config_iface_data_new (TRUE));
+	}
+
+	_LOGD ("get-config: starting");
+
+	NMCS_PROVIDER_GET_CLASS (self)->get_config (self, get_config_data);
+}
+
+GHashTable *
+nmcs_provider_get_config_finish (NMCSProvider *self,
+                                 GAsyncResult *result,
+                                 GError **error)
+{
+	g_return_val_if_fail (NMCS_IS_PROVIDER (self), FALSE);
+	g_return_val_if_fail (nm_g_task_is_valid (result, self, nmcs_provider_get_config), FALSE);
+
+	return g_task_propagate_pointer (G_TASK (result), error);
+}
+
+/*****************************************************************************/
+
+static void
+set_property (GObject *object,
+              guint prop_id,
+              const GValue *value,
+              GParamSpec *pspec)
+{
+	NMCSProviderPrivate *priv = NMCS_PROVIDER_GET_PRIVATE (object);
+
+	switch (prop_id) {
+	case PROP_HTTP_CLIENT:
+		priv->http_client = g_value_dup_object (value);
+		g_return_if_fail (NM_IS_HTTP_CLIENT (priv->http_client));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+/*****************************************************************************/
+
+static void
+nmcs_provider_init (NMCSProvider *self)
+{
+	NMCSProviderPrivate *priv;
+
+	priv = G_TYPE_INSTANCE_GET_PRIVATE (self, NMCS_TYPE_PROVIDER, NMCSProviderPrivate);
+
+	self->_priv = priv;
+}
+
+static void
+dispose (GObject *object)
+{
+	NMCSProvider *self = NMCS_PROVIDER (object);
+	NMCSProviderPrivate *priv = NMCS_PROVIDER_GET_PRIVATE (self);
+
+	g_clear_object (&priv->http_client);
+
+	G_OBJECT_CLASS (nmcs_provider_parent_class)->dispose (object);
+}
+
+static void
+nmcs_provider_class_init (NMCSProviderClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	g_type_class_add_private (object_class, sizeof (NMCSProviderPrivate));
+
+	object_class->set_property = set_property;
+	object_class->dispose      = dispose;
+
+	obj_properties[PROP_HTTP_CLIENT] =
+	    g_param_spec_object (NMCS_PROVIDER_HTTP_CLIENT, "", "",
+	                         NM_TYPE_HTTP_CLIENT,
+	                         G_PARAM_WRITABLE |
+	                         G_PARAM_CONSTRUCT_ONLY |
+	                         G_PARAM_STATIC_STRINGS);
+
+	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+}
diff --git a/clients/cloud-setup/nmcs-provider.h b/clients/cloud-setup/nmcs-provider.h
new file mode 100644
index 00000000..e5a44da1
--- /dev/null
+++ b/clients/cloud-setup/nmcs-provider.h
@@ -0,0 +1,108 @@
+// SPDX-License-Identifier: LGPL-2.1+
+
+#ifndef __NMCS_PROVIDER_H__
+#define __NMCS_PROVIDER_H__
+
+/*****************************************************************************/
+
+#include "nm-http-client.h"
+
+/*****************************************************************************/
+
+typedef struct {
+	in_addr_t *ipv4s_arr;
+	gsize ipv4s_len;
+	gssize iface_idx;
+	in_addr_t cidr_addr;
+	guint8 cidr_prefix;
+	bool has_ipv4s:1;
+	bool has_cidr:1;
+
+	/* TRUE, if the configuration was requested via hwaddrs argument to
+	 * nmcs_provider_get_config(). */
+	bool was_requested:1;
+
+} NMCSProviderGetConfigIfaceData;
+
+static inline gboolean
+nmcs_provider_get_config_iface_data_is_valid (const NMCSProviderGetConfigIfaceData *config_data)
+{
+	return    config_data
+	       && config_data->iface_idx >= 0
+	       && config_data->has_cidr
+	       && config_data->has_ipv4s;
+}
+
+NMCSProviderGetConfigIfaceData *nmcs_provider_get_config_iface_data_new (gboolean was_requested);
+
+typedef struct {
+	GTask *task;
+	GHashTable *result_dict;
+	gpointer extra_data;
+	GDestroyNotify extra_destroy;
+	bool any:1;
+} NMCSProviderGetConfigTaskData;
+
+#define NMCS_TYPE_PROVIDER            (nmcs_provider_get_type ())
+#define NMCS_PROVIDER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMCS_TYPE_PROVIDER, NMCSProvider))
+#define NMCS_PROVIDER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NMCS_TYPE_PROVIDER, NMCSProviderClass))
+#define NMCS_IS_PROVIDER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMCS_TYPE_PROVIDER))
+#define NMCS_IS_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NMCS_TYPE_PROVIDER))
+#define NMCS_PROVIDER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NMCS_TYPE_PROVIDER, NMCSProviderClass))
+
+#define NMCS_PROVIDER_HTTP_CLIENT "http-client"
+
+struct _NMCSProviderPrivate;
+
+typedef struct {
+	GObject parent;
+	struct _NMCSProviderPrivate *_priv;
+} NMCSProvider;
+
+typedef struct {
+	GObjectClass parent;
+	const char *_name;
+	const char *_env_provider_enabled;
+
+	void (*detect) (NMCSProvider *self,
+	                GTask *task);
+
+	void (*get_config) (NMCSProvider *self,
+	                    NMCSProviderGetConfigTaskData *get_config_data);
+
+} NMCSProviderClass;
+
+GType nmcs_provider_get_type (void);
+
+/*****************************************************************************/
+
+const char *nmcs_provider_get_name (NMCSProvider *provider);
+
+NMHttpClient *nmcs_provider_get_http_client (NMCSProvider *provider);
+GMainContext *nmcs_provider_get_main_context (NMCSProvider *provider);
+
+/*****************************************************************************/
+
+void nmcs_provider_detect (NMCSProvider *provider,
+                           GCancellable *cancellable,
+                           GAsyncReadyCallback callback,
+                           gpointer user_data);
+
+gboolean nmcs_provider_detect_finish (NMCSProvider *provider,
+                                      GAsyncResult *result,
+                                      GError **error);
+
+/*****************************************************************************/
+
+void nmcs_provider_get_config (NMCSProvider *provider,
+                               gboolean any,
+                               const char *const*hwaddrs,
+                               GCancellable *cancellable,
+                               GAsyncReadyCallback callback,
+                               gpointer user_data);
+
+GHashTable *nmcs_provider_get_config_finish (NMCSProvider *provider,
+                                             GAsyncResult *result,
+                                             GError **error);
+
+#endif /* __NMCS_PROVIDER_H__ */
diff --git a/clients/common/meson.build b/clients/common/meson.build
index fed0f3bf..afa257b1 100644
--- a/clients/common/meson.build
+++ b/clients/common/meson.build
@@ -2,28 +2,29 @@ common_inc = include_directories('.')
 
 nm_polkit_listener = files('nm-polkit-listener.c')
 
-deps = [
+common_deps = [
   libnm_dep,
-  shared_nm_libnm_core_aux_dep,
+  libnm_nm_default_dep,
 ]
 
-cflags = clients_cflags + [
-  '-DG_LOG_DOMAIN="libnmc"',
-]
+common_c_flags = clients_c_flags + ['-DG_LOG_DOMAIN="libnmc"']
+
+sources = files(
+  'nm-client-utils.c',
+  'nm-secret-agent-simple.c',
+  'nm-vpn-helpers.c',
+)
 
 libnmc_base = static_library(
   'nmc-base',
-  sources: files(
-    'nm-client-utils.c',
-    'nm-secret-agent-simple.c',
-    'nm-vpn-helpers.c',
-  ),
-  dependencies: deps,
-  c_args: cflags,
+  sources: sources,
+  dependencies: common_deps,
+  c_args: common_c_flags,
 )
 
 libnmc_base_dep = declare_dependency(
   include_directories: common_inc,
+  dependencies: common_deps,
   link_with: libnmc_base,
 )
 
@@ -39,31 +40,33 @@ if enable_introspection
 
   test(
     'check-settings-docs',
-    find_program(join_paths(meson.source_root(), 'tools', 'check-settings-docs.sh')),
-    args: [meson.source_root(), meson.build_root(), 'clients/common/' + settings_docs]
+    find_program(join_paths(source_root, 'tools', 'check-settings-docs.sh')),
+    args: [source_root, build_root, 'clients/common/' + settings_docs],
   )
 else
   settings_docs_source = configure_file(
     input: settings_docs + '.in',
-    output: settings_docs,
+    output: '@BASENAME@',
     configuration: configuration_data(),
   )
 endif
 
+sources = nm_meta_setting_source + [settings_docs_source] + files(
+  'nm-meta-setting-access.c',
+  'nm-meta-setting-desc.c',
+)
+
 libnmc = static_library(
   'nmc',
-  sources: files(
-    'nm-meta-setting-access.c',
-    'nm-meta-setting-desc.c',
-  ) + shared_nm_meta_setting_c + [settings_docs_source],
-  dependencies: deps,
-  c_args: cflags,
-  link_with: libnmc_base,
+  sources: sources,
+  dependencies: common_deps + [libnm_libnm_core_aux_dep],
+  c_args: c_flags,
   link_depends: settings_docs_source,
 )
 
 libnmc_dep = declare_dependency(
   include_directories: common_inc,
+  dependencies: common_deps,
   link_with: libnmc,
 )
 
diff --git a/clients/common/nm-client-utils.c b/clients/common/nm-client-utils.c
index 0a155dae..4d356edb 100644
--- a/clients/common/nm-client-utils.c
+++ b/clients/common/nm-client-utils.c
@@ -1,20 +1,6 @@
-/* nmcli - command-line tool to control NetworkManager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2010 - 2017 Red Hat, Inc.
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2010 - 2017 Red Hat, Inc.
  */
 
 #include "nm-default.h"
@@ -448,14 +434,14 @@ nmc_activation_get_effective_state (NMActiveConnection *active,
 }
 
 static gboolean
-can_show_graphics (void)
+can_show_utf8 (void)
 {
-	static gboolean can_show_graphics_set = FALSE;
-	gboolean can_show_graphics = TRUE;
+	static gboolean can_show_utf8_set = FALSE;
+	static gboolean can_show_utf8 = TRUE;
 	char *locale_str;
 
-	if (G_LIKELY (can_show_graphics_set))
-		return can_show_graphics;
+	if (G_LIKELY (can_show_utf8_set))
+		return can_show_utf8;
 
 	if (!g_get_charset (NULL)) {
 		/* Non-UTF-8 locale */
@@ -463,9 +449,24 @@ can_show_graphics (void)
 		if (locale_str)
 			g_free (locale_str);
 		else
-			can_show_graphics = FALSE;
+			can_show_utf8 = FALSE;
 	}
 
+	return can_show_utf8;
+}
+
+
+static gboolean
+can_show_graphics (void)
+{
+	static gboolean can_show_graphics_set = FALSE;
+	static gboolean can_show_graphics = TRUE;
+
+	if (G_LIKELY (can_show_graphics_set))
+		return can_show_graphics;
+
+	can_show_graphics = can_show_utf8 ();
+
 	/* The linux console font typically doesn't have characters we need */
 	if (g_strcmp0 (g_getenv ("TERM"), "linux") == 0)
 		can_show_graphics = FALSE;
@@ -515,3 +516,73 @@ nmc_password_subst_char (void)
 	else
 		return "*";
 }
+
+/*
+ * We actually use a small part of qrcodegen.c, but we'd prefer to keep it
+ * intact. Include it instead of linking to it to give the compiler a
+ * chance to optimize bits we don't need away.
+ */
+
+#pragma GCC visibility push(hidden)
+NM_PRAGMA_WARNING_DISABLE("-Wdeclaration-after-statement")
+#define NDEBUG
+#include "qrcodegen.c"
+NM_PRAGMA_WARNING_REENABLE
+#pragma GCC visibility pop
+
+void
+nmc_print_qrcode (const char *str)
+{
+	uint8_t tempBuffer[qrcodegen_BUFFER_LEN_FOR_VERSION (qrcodegen_VERSION_MAX)];
+	uint8_t qrcode[qrcodegen_BUFFER_LEN_FOR_VERSION (qrcodegen_VERSION_MAX)];
+	gboolean term_linux;
+	int size;
+	int x;
+	int y;
+
+	term_linux = g_strcmp0 (g_getenv ("TERM"), "linux") == 0;
+	if (!term_linux && !can_show_graphics ())
+		return;
+
+	if (!qrcodegen_encodeText (str,
+	                           tempBuffer,
+	                           qrcode,
+	                           qrcodegen_Ecc_LOW,
+	                           qrcodegen_VERSION_MIN,
+	                           qrcodegen_VERSION_MAX,
+	                           qrcodegen_Mask_AUTO,
+	                           FALSE)) {
+		return;
+	}
+
+	size = qrcodegen_getSize (qrcode);
+
+	g_print ("\n");
+
+	if (term_linux) {
+		/* G1 alternate character set on Linux console. */
+		for (y = -1; y < size + 1; y += 1) {
+			g_print ("  \033[37;40;1m\016");
+			for (x = -1; x < size + 1; x++) {
+				g_print (  qrcodegen_getModule (qrcode, x, y)
+				         ? "  " : "\060\060");
+			}
+			g_print ("\017\033[0m\n");
+		}
+	} else {
+		/* UTF-8 */
+		for (y = -2; y < size + 2; y += 2) {
+			g_print ("  \033[37;40m");
+			for (x = -2; x < size + 2; x++) {
+				bool top = qrcodegen_getModule (qrcode, x, y);
+				bool bottom = qrcodegen_getModule (qrcode, x, y + 1);
+				if (top) {
+					g_print (bottom ? " " : "\u2584");
+				} else {
+					g_print (bottom ? "\u2580" : "\u2588");
+				}
+			}
+			g_print ("\033[0m\n");
+		}
+	}
+}
diff --git a/clients/common/nm-client-utils.h b/clients/common/nm-client-utils.h
index 08a39f03..1e3085d5 100644
--- a/clients/common/nm-client-utils.h
+++ b/clients/common/nm-client-utils.h
@@ -1,20 +1,6 @@
-/* nmcli - command-line tool to control NetworkManager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2010 - 2017 Red Hat, Inc.
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2010 - 2017 Red Hat, Inc.
  */
 
 #ifndef __NM_CLIENT_UTILS_H__
@@ -55,4 +41,6 @@ const char *nmc_wifi_strength_bars (guint8 strength);
 
 const char *nmc_password_subst_char (void);
 
+void nmc_print_qrcode (const char *str);
+
 #endif /* __NM_CLIENT_UTILS_H__ */
diff --git a/clients/common/nm-meta-setting-access.c b/clients/common/nm-meta-setting-access.c
index ce5cd331..1167b555 100644
--- a/clients/common/nm-meta-setting-access.c
+++ b/clients/common/nm-meta-setting-access.c
@@ -1,20 +1,6 @@
-/* NetworkManager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2010 - 2017 Red Hat, Inc.
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2010 - 2017 Red Hat, Inc.
  */
 
 #include "nm-default.h"
diff --git a/clients/common/nm-meta-setting-access.h b/clients/common/nm-meta-setting-access.h
index 38f22c7a..543b51fc 100644
--- a/clients/common/nm-meta-setting-access.h
+++ b/clients/common/nm-meta-setting-access.h
@@ -1,20 +1,6 @@
-/* NetworkManager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2010 - 2017 Red Hat, Inc.
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2010 - 2017 Red Hat, Inc.
  */
 
 #ifndef _NM_META_SETTING_ACCESS_H__
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 3ee25d06..8e05c9bc 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -1,20 +1,6 @@
-/* nmcli - command-line tool to control NetworkManager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2010 - 2018 Red Hat, Inc.
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2010 - 2018 Red Hat, Inc.
  */
 
 #include "nm-default.h"
@@ -367,7 +353,7 @@ _parse_ip_route (int family,
 	}
 	prefix = MAX_PREFIX;
 	if (plen) {
-		if ((prefix = _nm_utils_ascii_str_to_int64 (plen, 10, 1, MAX_PREFIX, -1)) == -1) {
+		if ((prefix = _nm_utils_ascii_str_to_int64 (plen, 10, 0, MAX_PREFIX, -1)) == -1) {
 			g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT,
 			             _("invalid prefix '%s'; <1-%d> allowed"),
 			             plen, MAX_PREFIX);
@@ -638,7 +624,7 @@ _env_warn_fcn (const NMMetaEnvironment *environment,
 	const NMMetaPropertyInfo *property_info, const NMMetaEnvironment *environment, gpointer environment_user_data, NMSetting *setting, NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, gboolean *out_is_default, gpointer *out_to_free
 
 #define ARGS_SET_FCN \
-	const NMMetaPropertyInfo *property_info, const NMMetaEnvironment *environment, gpointer environment_user_data, NMSetting *setting, char modifier, const char *value, GError **error
+	const NMMetaPropertyInfo *property_info, const NMMetaEnvironment *environment, gpointer environment_user_data, NMSetting *setting, NMMetaAccessorModifier modifier, const char *value, GError **error
 
 #define ARGS_REMOVE_FCN \
 	const NMMetaPropertyInfo *property_info, const NMMetaEnvironment *environment, gpointer environment_user_data, NMSetting *setting, const char *value, GError **error
@@ -653,43 +639,52 @@ _env_warn_fcn (const NMMetaEnvironment *environment,
 	const NMMetaSettingInfoEditor *setting_info, NMSetting *setting, NMMetaAccessorSettingInitType init_type
 
 static gboolean
-_SET_FCN_DO_RESET_DEFAULT (const NMMetaPropertyInfo *property_info, char modifier, const char *value)
+_SET_FCN_DO_RESET_DEFAULT (const NMMetaPropertyInfo *property_info, NMMetaAccessorModifier modifier, const char *value)
 {
 	nm_assert (property_info);
 	nm_assert (!property_info->property_type->set_supports_remove);
-	nm_assert (NM_IN_SET (modifier, '\0', '+'));
-	nm_assert (value || modifier == '\0');
+	nm_assert (NM_IN_SET (modifier, NM_META_ACCESSOR_MODIFIER_SET,
+	                                NM_META_ACCESSOR_MODIFIER_ADD));
+	nm_assert (   value
+	           || modifier == NM_META_ACCESSOR_MODIFIER_SET);
 
 	return value == NULL;
 }
 
 static gboolean
-_SET_FCN_DO_RESET_DEFAULT_WITH_SUPPORTS_REMOVE (const NMMetaPropertyInfo *property_info, char modifier, const char *value)
+_SET_FCN_DO_RESET_DEFAULT_WITH_SUPPORTS_REMOVE (const NMMetaPropertyInfo *property_info, NMMetaAccessorModifier modifier, const char *value)
 {
 	nm_assert (property_info);
 	nm_assert (property_info->property_type->set_supports_remove);
-	nm_assert (NM_IN_SET (modifier, '\0', '+', '-'));
-	nm_assert (value || modifier == '\0');
+	nm_assert (NM_IN_SET (modifier, NM_META_ACCESSOR_MODIFIER_SET,
+	                                NM_META_ACCESSOR_MODIFIER_ADD,
+	                                NM_META_ACCESSOR_MODIFIER_DEL));
+	nm_assert (   value
+	           || modifier == NM_META_ACCESSOR_MODIFIER_SET);
 
 	return value == NULL;
 }
 
 static gboolean
-_SET_FCN_DO_SET_ALL (char modifier, const char *value)
+_SET_FCN_DO_SET_ALL (NMMetaAccessorModifier modifier, const char *value)
 {
-	nm_assert (NM_IN_SET (modifier, '\0', '+', '-'));
+	nm_assert (NM_IN_SET (modifier, NM_META_ACCESSOR_MODIFIER_SET,
+	                                NM_META_ACCESSOR_MODIFIER_ADD,
+	                                NM_META_ACCESSOR_MODIFIER_DEL));
 	nm_assert (value);
 
-	return modifier == '\0';
+	return modifier == NM_META_ACCESSOR_MODIFIER_SET;
 }
 
 static gboolean
-_SET_FCN_DO_REMOVE (char modifier, const char *value)
+_SET_FCN_DO_REMOVE (NMMetaAccessorModifier modifier, const char *value)
 {
-	nm_assert (NM_IN_SET (modifier, '\0', '+', '-'));
+	nm_assert (NM_IN_SET (modifier, NM_META_ACCESSOR_MODIFIER_SET,
+	                                NM_META_ACCESSOR_MODIFIER_ADD,
+	                                NM_META_ACCESSOR_MODIFIER_DEL));
 	nm_assert (value);
 
-	return modifier == '-';
+	return modifier == NM_META_ACCESSOR_MODIFIER_DEL;
 }
 
 #define RETURN_UNSUPPORTED_GET_TYPE() \
@@ -1458,11 +1453,12 @@ _set_fcn_gobject_enum (ARGS_SET_FCN)
 	GType gtype_prop;
 	gboolean has_gtype = FALSE;
 	nm_auto_unset_gvalue GValue gval = G_VALUE_INIT;
+	nm_auto_unref_gtypeclass GTypeClass *gtype_prop_class = NULL;
 	nm_auto_unref_gtypeclass GTypeClass *gtype_class = NULL;
 	gboolean is_flags;
 	int v;
 
-	if (_SET_FCN_DO_RESET_DEFAULT (property_info, modifier, value))
+	if (_SET_FCN_DO_RESET_DEFAULT_WITH_SUPPORTS_REMOVE (property_info, modifier, value))
 		return _gobject_property_reset_default (setting, property_info->property_name);
 
 	if (property_info->property_typ_data) {
@@ -1479,15 +1475,15 @@ _set_fcn_gobject_enum (ARGS_SET_FCN)
 	                  G_TYPE_INT,
 	                  G_TYPE_UINT)
 	    && G_TYPE_IS_CLASSED (gtype)
-	    && (gtype_class = g_type_class_ref (gtype))
-	    && (   (is_flags = G_IS_FLAGS_CLASS (gtype_class))
-	        || G_IS_ENUM_CLASS (gtype_class))) {
+	    && (gtype_prop_class = g_type_class_ref (gtype))
+	    && (   (is_flags = G_IS_FLAGS_CLASS (gtype_prop_class))
+	        || G_IS_ENUM_CLASS (gtype_prop_class))) {
 		/* valid */
 	} else if (   !has_gtype
 	           && G_TYPE_IS_CLASSED (gtype_prop)
-	           && (gtype_class = g_type_class_ref (gtype_prop))
-	           && (   (is_flags = G_IS_FLAGS_CLASS (gtype_class))
-	               || G_IS_ENUM_CLASS (gtype_class))) {
+	           && (gtype_prop_class = g_type_class_ref (gtype_prop))
+	           && (   (is_flags = G_IS_FLAGS_CLASS (gtype_prop_class))
+	               || G_IS_ENUM_CLASS (gtype_prop_class))) {
 		gtype = gtype_prop;
 	} else
 		g_return_val_if_reached (FALSE);
@@ -1507,16 +1503,33 @@ _set_fcn_gobject_enum (ARGS_SET_FCN)
 		                                                                       v);
 	}
 
+	gtype_class = g_type_class_ref (gtype);
+
+	if (   G_IS_FLAGS_CLASS (gtype_class)
+	    && !_SET_FCN_DO_SET_ALL (modifier, value)) {
+		nm_auto_unset_gvalue GValue int_value = { };
+		guint v_flag;
+
+		g_value_init (&int_value, G_TYPE_UINT);
+		g_object_get_property (G_OBJECT (setting), property_info->property_name, &int_value);
+		v_flag = g_value_get_uint (&int_value);
+
+		if (_SET_FCN_DO_REMOVE (modifier, value))
+			v = (int) (v_flag & ~((guint) v));
+		else
+			v = (int) (v_flag | ((guint) v));
+	}
+
 	g_value_init (&gval, gtype_prop);
 	if (gtype_prop == G_TYPE_INT)
 		g_value_set_int (&gval, v);
 	else if (gtype_prop == G_TYPE_UINT)
 		g_value_set_uint (&gval, v);
 	else if (is_flags) {
-		nm_assert (G_IS_FLAGS_CLASS (gtype_class));
+		nm_assert (G_IS_FLAGS_CLASS (gtype_prop_class));
 		g_value_set_flags (&gval, v);
 	} else {
-		nm_assert (G_IS_ENUM_CLASS (gtype_class));
+		nm_assert (G_IS_ENUM_CLASS (gtype_prop_class));
 		g_value_set_enum (&gval, v);
 	}
 
@@ -4339,12 +4352,14 @@ static const NMMetaPropertyType _pt_gobject_secret_flags = {
 	.get_fcn =                      _get_fcn_gobject_secret_flags,
 	.set_fcn =                      _set_fcn_gobject_enum,
 	.values_fcn =                   _values_fcn_gobject_enum,
+	.set_supports_remove =          TRUE,
 };
 
 static const NMMetaPropertyType _pt_gobject_enum = {
 	.get_fcn =                      _get_fcn_gobject_enum,
 	.set_fcn =                      _set_fcn_gobject_enum,
 	.values_fcn =                   _values_fcn_gobject_enum,
+	.set_supports_remove =          TRUE,
 };
 
 static const NMMetaPropertyType _pt_gobject_devices = {
@@ -4462,24 +4477,24 @@ static const NMMetaPropertyType _pt_objlist = {
 	   "   name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, name=ethtool delay-up=3\n")
 
 #define DEFINE_DCB_PROPRITY_PROPERTY_TYPE \
-		.property_type =                &_pt_gobject_int, \
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
-			.value_infos =              INT_VALUE_INFOS ( \
-				{ \
-					.value.i64 = -1, \
-					.nick = "unset", \
-				}, \
-			), \
-		),
+    .property_type =                &_pt_gobject_int, \
+    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
+        .value_infos =              INT_VALUE_INFOS ( \
+            { \
+                .value.i64 = -1, \
+                .nick = "unset", \
+            }, \
+        ), \
+    ),
 
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_6LOWPAN
 static const NMMetaPropertyInfo *const property_infos_6LOWPAN[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_6LOWPAN_PARENT,
-		.is_cli_option =                TRUE,
-		.property_alias =               "dev",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       N_("IEEE 802.15.4 (WPAN) parent device or connection UUID"),
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "dev",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	    .prompt =                       N_("IEEE 802.15.4 (WPAN) parent device or connection UUID"),
+	    .property_type =                &_pt_gobject_string,
 	),
 	NULL
 };
@@ -4491,255 +4506,255 @@ static const NMMetaPropertyInfo *const property_infos_802_1X[] = {
 		.property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_EAP,
-		.property_type =                &_pt_multilist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (multilist,
-				.get_num_fcn_u32 =      MULTILIST_GET_NUM_FCN_U32     (NMSetting8021x, nm_setting_802_1x_get_num_eap_methods),
-				.add_fcn =              MULTILIST_ADD_FCN             (NMSetting8021x, nm_setting_802_1x_add_eap_method),
-				.remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSetting8021x, nm_setting_802_1x_remove_eap_method),
-				.remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSetting8021x, nm_setting_802_1x_remove_eap_method_by_value),
-				.strsplit_plain =       TRUE,
-			),
-			.values_static =            NM_MAKE_STRV ("leap", "md5", "tls", "peap", "ttls", "sim", "fast", "pwd"),
-		),
+	    .property_type =                &_pt_multilist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
+	            .get_num_fcn_u32 =      MULTILIST_GET_NUM_FCN_U32     (NMSetting8021x, nm_setting_802_1x_get_num_eap_methods),
+	            .add_fcn =              MULTILIST_ADD_FCN             (NMSetting8021x, nm_setting_802_1x_add_eap_method),
+	            .remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSetting8021x, nm_setting_802_1x_remove_eap_method),
+	            .remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSetting8021x, nm_setting_802_1x_remove_eap_method_by_value),
+	            .strsplit_plain =       TRUE,
+	        ),
+	        .values_static =            NM_MAKE_STRV ("leap", "md5", "tls", "peap", "ttls", "sim", "fast", "pwd"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_IDENTITY,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_ANONYMOUS_IDENTITY,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PAC_FILE,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_CA_CERT,
-		.describe_message =
-		    N_("Enter file path to CA certificate (optionally prefixed with file://).\n"
-		       "  [file://]<file path>\n"
-		       "Note that nmcli does not support specifying certificates as raw blob data.\n"
-		       "Example: /home/cimrman/cacert.crt\n"),
-		.property_type =                &_pt_cert_8021x,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (cert_8021x,
-			.scheme_type =              NM_SETTING_802_1X_SCHEME_TYPE_CA_CERT,
-		),
+	    .describe_message =
+	        N_("Enter file path to CA certificate (optionally prefixed with file://).\n"
+	           "  [file://]<file path>\n"
+	           "Note that nmcli does not support specifying certificates as raw blob data.\n"
+	           "Example: /home/cimrman/cacert.crt\n"),
+	    .property_type =                &_pt_cert_8021x,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (cert_8021x,
+	        .scheme_type =              NM_SETTING_802_1X_SCHEME_TYPE_CA_CERT,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_CA_CERT_PASSWORD,
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
+	    .is_secret =                    TRUE,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_CA_CERT_PASSWORD_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
+	    .property_type =                &_pt_gobject_secret_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_CA_PATH,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_SUBJECT_MATCH,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_ALTSUBJECT_MATCHES,
-		.property_type =                &_pt_multilist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (multilist,
-				.get_num_fcn_u32 =      MULTILIST_GET_NUM_FCN_U32     (NMSetting8021x, nm_setting_802_1x_get_num_altsubject_matches),
-				.add_fcn =              MULTILIST_ADD_FCN             (NMSetting8021x, nm_setting_802_1x_add_altsubject_match),
-				.remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSetting8021x, nm_setting_802_1x_remove_altsubject_match),
-				.remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSetting8021x, nm_setting_802_1x_remove_altsubject_match_by_value),
-				.strsplit_plain =       TRUE,
-			),
-		),
+	    .property_type =                &_pt_multilist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
+	            .get_num_fcn_u32 =      MULTILIST_GET_NUM_FCN_U32     (NMSetting8021x, nm_setting_802_1x_get_num_altsubject_matches),
+	            .add_fcn =              MULTILIST_ADD_FCN             (NMSetting8021x, nm_setting_802_1x_add_altsubject_match),
+	            .remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSetting8021x, nm_setting_802_1x_remove_altsubject_match),
+	            .remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSetting8021x, nm_setting_802_1x_remove_altsubject_match_by_value),
+	            .strsplit_plain =       TRUE,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_CLIENT_CERT,
-		.describe_message =
-		    N_("Enter file path to client certificate (optionally prefixed with file://).\n"
-		       "  [file://]<file path>\n"
-		       "Note that nmcli does not support specifying certificates as raw blob data.\n"
-		       "Example: /home/cimrman/jara.crt\n"),
-		.property_type =                &_pt_cert_8021x,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (cert_8021x,
-			.scheme_type =              NM_SETTING_802_1X_SCHEME_TYPE_CLIENT_CERT,
-		),
+	    .describe_message =
+	        N_("Enter file path to client certificate (optionally prefixed with file://).\n"
+	           "  [file://]<file path>\n"
+	           "Note that nmcli does not support specifying certificates as raw blob data.\n"
+	           "Example: /home/cimrman/jara.crt\n"),
+	    .property_type =                &_pt_cert_8021x,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (cert_8021x,
+	        .scheme_type =              NM_SETTING_802_1X_SCHEME_TYPE_CLIENT_CERT,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_CLIENT_CERT_PASSWORD,
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
+	    .is_secret =                    TRUE,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
+	    .property_type =                &_pt_gobject_secret_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE1_PEAPVER,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV ("0", "1"),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV ("0", "1"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE1_PEAPLABEL,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV ("0", "1"),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV ("0", "1"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV ("0", "1", "2", "3"),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV ("0", "1", "2", "3"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE1_AUTH_FLAGS,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.get_gtype =            nm_setting_802_1x_auth_flags_get_type,
-			),
-			.typ_flags =                NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT,
-		),
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .get_gtype =            nm_setting_802_1x_auth_flags_get_type,
+	        ),
+	        .typ_flags =                NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_AUTH,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV ("pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", "tls"),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV ("pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", "tls"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_AUTHEAP,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV ("md5", "mschapv2", "otp", "gtc", "tls"),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV ("md5", "mschapv2", "otp", "gtc", "tls"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_CA_CERT,
-		.describe_message =
-		    N_("Enter file path to CA certificate for inner authentication (optionally prefixed\n"
-		       "with file://).\n"
-		       "  [file://]<file path>\n"
-		       "Note that nmcli does not support specifying certificates as raw blob data.\n"
-		       "Example: /home/cimrman/ca-zweite-phase.crt\n"),
-		.property_type =                &_pt_cert_8021x,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (cert_8021x,
-			.scheme_type =              NM_SETTING_802_1X_SCHEME_TYPE_PHASE2_CA_CERT,
-		),
+	    .describe_message =
+	        N_("Enter file path to CA certificate for inner authentication (optionally prefixed\n"
+	           "with file://).\n"
+	           "  [file://]<file path>\n"
+	           "Note that nmcli does not support specifying certificates as raw blob data.\n"
+	           "Example: /home/cimrman/ca-zweite-phase.crt\n"),
+	    .property_type =                &_pt_cert_8021x,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (cert_8021x,
+	        .scheme_type =              NM_SETTING_802_1X_SCHEME_TYPE_PHASE2_CA_CERT,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD,
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
+	    .is_secret =                    TRUE,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
+	    .property_type =                &_pt_gobject_secret_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_CA_PATH,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES,
-		.property_type =                &_pt_multilist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (multilist,
-				.get_num_fcn_u32 =      MULTILIST_GET_NUM_FCN_U32     (NMSetting8021x, nm_setting_802_1x_get_num_phase2_altsubject_matches),
-				.add_fcn =              MULTILIST_ADD_FCN             (NMSetting8021x, nm_setting_802_1x_add_phase2_altsubject_match),
-				.remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSetting8021x, nm_setting_802_1x_remove_phase2_altsubject_match),
-				.remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSetting8021x, nm_setting_802_1x_remove_phase2_altsubject_match_by_value),
-				.strsplit_plain =       TRUE,
-			),
-		),
+	    .property_type =                &_pt_multilist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
+	            .get_num_fcn_u32 =      MULTILIST_GET_NUM_FCN_U32     (NMSetting8021x, nm_setting_802_1x_get_num_phase2_altsubject_matches),
+	            .add_fcn =              MULTILIST_ADD_FCN             (NMSetting8021x, nm_setting_802_1x_add_phase2_altsubject_match),
+	            .remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSetting8021x, nm_setting_802_1x_remove_phase2_altsubject_match),
+	            .remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSetting8021x, nm_setting_802_1x_remove_phase2_altsubject_match_by_value),
+	            .strsplit_plain =       TRUE,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_CLIENT_CERT,
-		.describe_message =
-		    N_("Enter file path to client certificate for inner authentication (optionally prefixed\n"
-		       "with file://).\n"
-		       "  [file://]<file path>\n"
-		       "Note that nmcli does not support specifying certificates as raw blob data.\n"
-		       "Example: /home/cimrman/jara-zweite-phase.crt\n"),
-		.property_type =                &_pt_cert_8021x,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (cert_8021x,
-			.scheme_type =              NM_SETTING_802_1X_SCHEME_TYPE_PHASE2_CLIENT_CERT,
-		),
+	    .describe_message =
+	        N_("Enter file path to client certificate for inner authentication (optionally prefixed\n"
+	           "with file://).\n"
+	           "  [file://]<file path>\n"
+	           "Note that nmcli does not support specifying certificates as raw blob data.\n"
+	           "Example: /home/cimrman/jara-zweite-phase.crt\n"),
+	    .property_type =                &_pt_cert_8021x,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (cert_8021x,
+	        .scheme_type =              NM_SETTING_802_1X_SCHEME_TYPE_PHASE2_CLIENT_CERT,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD,
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
+	    .is_secret =                    TRUE,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
+	    .property_type =                &_pt_gobject_secret_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PASSWORD,
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
+	    .is_secret =                    TRUE,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PASSWORD_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
+	    .property_type =                &_pt_gobject_secret_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PASSWORD_RAW,
-		.is_secret =                    TRUE,
-		.describe_message =
-		    N_("Enter bytes as a list of hexadecimal values.\n"
-		       "Two formats are accepted:\n"
-		       "(a) a string of hexadecimal digits, where each two digits represent one byte\n"
-		       "(b) space-separated list of bytes written as hexadecimal digits "
-		       "(with optional 0x/0X prefix, and optional leading 0).\n\n"
-		       "Examples: ab0455a6ea3a74C2\n"
-		       "          ab 4 55 0xa6 ea 3a 74 C2\n"),
-		.property_type =                 &_pt_gobject_bytes,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_bytes,
-			.legacy_format =            TRUE,
-		),
+	    .is_secret =                    TRUE,
+	    .describe_message =
+	        N_("Enter bytes as a list of hexadecimal values.\n"
+	           "Two formats are accepted:\n"
+	           "(a) a string of hexadecimal digits, where each two digits represent one byte\n"
+	           "(b) space-separated list of bytes written as hexadecimal digits "
+	           "(with optional 0x/0X prefix, and optional leading 0).\n\n"
+	           "Examples: ab0455a6ea3a74C2\n"
+	           "          ab 4 55 0xa6 ea 3a 74 C2\n"),
+	    .property_type =                 &_pt_gobject_bytes,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_bytes,
+	        .legacy_format =            TRUE,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PASSWORD_RAW_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
+	    .property_type =                &_pt_gobject_secret_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PRIVATE_KEY,
-		.describe_message =
-		    N_("Enter path to a private key and the key password (if not set yet):\n"
-		       "  [file://]<file path> [<password>]\n"
-		       "Note that nmcli does not support specifying private key as raw blob data.\n"
-		       "Example: /home/cimrman/jara-priv-key Dardanely\n"),
-		.property_type =                &_pt_cert_8021x,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (cert_8021x,
-			.scheme_type =              NM_SETTING_802_1X_SCHEME_TYPE_PRIVATE_KEY,
-		),
+	    .describe_message =
+	        N_("Enter path to a private key and the key password (if not set yet):\n"
+	           "  [file://]<file path> [<password>]\n"
+	           "Note that nmcli does not support specifying private key as raw blob data.\n"
+	           "Example: /home/cimrman/jara-priv-key Dardanely\n"),
+	    .property_type =                &_pt_cert_8021x,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (cert_8021x,
+	        .scheme_type =              NM_SETTING_802_1X_SCHEME_TYPE_PRIVATE_KEY,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD,
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
+	    .is_secret =                    TRUE,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
+	    .property_type =                &_pt_gobject_secret_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY,
-		.describe_message =
-		    N_("Enter path to a private key and the key password (if not set yet):\n"
-		       "  [file://]<file path> [<password>]\n"
-		       "Note that nmcli does not support specifying private key as raw blob data.\n"
-		       "Example: /home/cimrman/jara-priv-key Dardanely\n"),
-		.property_type =                &_pt_cert_8021x,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (cert_8021x,
-			.scheme_type =              NM_SETTING_802_1X_SCHEME_TYPE_PHASE2_PRIVATE_KEY,
-		),
+	    .describe_message =
+	        N_("Enter path to a private key and the key password (if not set yet):\n"
+	           "  [file://]<file path> [<password>]\n"
+	           "Note that nmcli does not support specifying private key as raw blob data.\n"
+	           "Example: /home/cimrman/jara-priv-key Dardanely\n"),
+	    .property_type =                &_pt_cert_8021x,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (cert_8021x,
+	        .scheme_type =              NM_SETTING_802_1X_SCHEME_TYPE_PHASE2_PRIVATE_KEY,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD,
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
+	    .is_secret =                    TRUE,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
+	    .property_type =                &_pt_gobject_secret_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PIN,
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
+	    .is_secret =                    TRUE,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_PIN_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
+	    .property_type =                &_pt_gobject_secret_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_SYSTEM_CA_CERTS,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_802_1X_AUTH_TIMEOUT,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	NULL
 };
@@ -4748,51 +4763,51 @@ static const NMMetaPropertyInfo *const property_infos_802_1X[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_ADSL
 static const NMMetaPropertyInfo *const property_infos_ADSL[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_ADSL_USERNAME,
-		.is_cli_option =                TRUE,
-		.property_alias =               "username",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       N_("Username"),
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "username",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	    .prompt =                       N_("Username"),
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_ADSL_PASSWORD,
-		.is_cli_option =                TRUE,
-		.property_alias =               "password",
-		.prompt =                       N_("Password [none]"),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "password",
+	    .prompt =                       N_("Password [none]"),
+	    .is_secret =                    TRUE,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_ADSL_PASSWORD_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
+	    .property_type =                &_pt_gobject_secret_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_ADSL_PROTOCOL,
-		.is_cli_option =                TRUE,
-		.property_alias =               "protocol",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       NM_META_TEXT_PROMPT_ADSL_PROTO,
-		.def_hint =                     NM_META_TEXT_PROMPT_ADSL_PROTO_CHOICES,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV (NM_SETTING_ADSL_PROTOCOL_PPPOA,
-			                                          NM_SETTING_ADSL_PROTOCOL_PPPOE,
-			                                          NM_SETTING_ADSL_PROTOCOL_IPOATM),
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "protocol",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	    .prompt =                       NM_META_TEXT_PROMPT_ADSL_PROTO,
+	    .def_hint =                     NM_META_TEXT_PROMPT_ADSL_PROTO_CHOICES,
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV (NM_SETTING_ADSL_PROTOCOL_PPPOA,
+	                                                  NM_SETTING_ADSL_PROTOCOL_PPPOE,
+	                                                  NM_SETTING_ADSL_PROTOCOL_IPOATM),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_ADSL_ENCAPSULATION,
-		.is_cli_option =                TRUE,
-		.property_alias =               "encapsulation",
-		.prompt =                       NM_META_TEXT_PROMPT_ADSL_ENCAP,
-		.def_hint =                     NM_META_TEXT_PROMPT_ADSL_ENCAP_CHOICES,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV (NM_SETTING_ADSL_ENCAPSULATION_VCMUX,
-			                                          NM_SETTING_ADSL_ENCAPSULATION_LLC),
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "encapsulation",
+	    .prompt =                       NM_META_TEXT_PROMPT_ADSL_ENCAP,
+	    .def_hint =                     NM_META_TEXT_PROMPT_ADSL_ENCAP_CHOICES,
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV (NM_SETTING_ADSL_ENCAPSULATION_VCMUX,
+	                                                  NM_SETTING_ADSL_ENCAPSULATION_LLC),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_ADSL_VPI,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_ADSL_VCI,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	NULL
 };
@@ -4801,22 +4816,22 @@ static const NMMetaPropertyInfo *const property_infos_ADSL[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_BLUETOOTH
 static const NMMetaPropertyInfo *const property_infos_BLUETOOTH[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BLUETOOTH_BDADDR,
-		.is_cli_option =                TRUE,
-		.property_alias =               "addr",
-		.prompt =                       N_("Bluetooth device address"),
-		.property_type =                &_pt_gobject_mac,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "addr",
+	    .prompt =                       N_("Bluetooth device address"),
+	    .property_type =                &_pt_gobject_mac,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BLUETOOTH_TYPE,
-		.is_cli_option =                TRUE,
-		.property_alias =               "bt-type",
-		.prompt =                       NM_META_TEXT_PROMPT_BT_TYPE,
-		.def_hint =                     NM_META_TEXT_PROMPT_BT_TYPE_CHOICES,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV (NM_SETTING_BLUETOOTH_TYPE_DUN,
-			                                          NM_SETTING_BLUETOOTH_TYPE_PANU,
-			                                          NM_SETTING_BLUETOOTH_TYPE_NAP),
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "bt-type",
+	    .prompt =                       NM_META_TEXT_PROMPT_BT_TYPE,
+	    .def_hint =                     NM_META_TEXT_PROMPT_BT_TYPE_CHOICES,
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV (NM_SETTING_BLUETOOTH_TYPE_DUN,
+	                                                  NM_SETTING_BLUETOOTH_TYPE_PANU,
+	                                                  NM_SETTING_BLUETOOTH_TYPE_NAP),
+	    ),
 	),
 	NULL
 };
@@ -4825,19 +4840,19 @@ static const NMMetaPropertyInfo *const property_infos_BLUETOOTH[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_BOND
 static const NMMetaPropertyInfo property_info_BOND_OPTIONS =
 	PROPERTY_INFO_INIT (NM_SETTING_BOND_OPTIONS, DESCRIBE_DOC_NM_SETTING_BOND_OPTIONS,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.describe_fcn =             _describe_fcn_bond_options,
-			.get_fcn =                  _get_fcn_bond_options,
-			.set_fcn =                  _set_fcn_optionlist,
-			.set_supports_remove =      TRUE,
-			.values_fcn =               _values_fcn_bond_options,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (optionlist,
-				.set_fcn =              _optionlist_set_fcn_bond_options,
-			),
-			.nested =                   &nm_meta_property_typ_data_bond,
-		),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .describe_fcn =             _describe_fcn_bond_options,
+	        .get_fcn =                  _get_fcn_bond_options,
+	        .set_fcn =                  _set_fcn_optionlist,
+	        .set_supports_remove =      TRUE,
+	        .values_fcn =               _values_fcn_bond_options,
+	    ),
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (optionlist,
+	            .set_fcn =              _optionlist_set_fcn_bond_options,
+	        ),
+	        .nested =                   &nm_meta_property_typ_data_bond,
+	    ),
 	);
 
 static const NMMetaPropertyInfo *const property_infos_BOND[] = {
@@ -4849,75 +4864,75 @@ static const NMMetaPropertyInfo *const property_infos_BOND[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_BRIDGE
 static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MAC_ADDRESS,
-		.is_cli_option =                TRUE,
-		.property_alias =               "mac",
-		.prompt =                       N_("MAC [none]"),
-		.property_type =                &_pt_gobject_mac,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "mac",
+	    .prompt =                       N_("MAC [none]"),
+	    .property_type =                &_pt_gobject_mac,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_STP,
-		.is_cli_option =                TRUE,
-		.property_alias =               "stp",
-		.prompt =                       N_("Enable STP [no]"),
-		.property_type =                &_pt_gobject_bool,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "stp",
+	    .prompt =                       N_("Enable STP [no]"),
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_PRIORITY,
-		.is_cli_option =                TRUE,
-		.property_alias =               "priority",
-		.prompt =                       N_("STP priority [32768]"),
-		.property_type =                &_pt_gobject_int,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "priority",
+	    .prompt =                       N_("STP priority [32768]"),
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_FORWARD_DELAY,
-		.is_cli_option =                TRUE,
-		.property_alias =               "forward-delay",
-		.prompt =                       N_("Forward delay [15]"),
-		.property_type =                &_pt_gobject_int,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "forward-delay",
+	    .prompt =                       N_("Forward delay [15]"),
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_HELLO_TIME,
-		.is_cli_option =                TRUE,
-		.property_alias =               "hello-time",
-		.prompt =                       N_("Hello time [2]"),
-		.property_type =                &_pt_gobject_int,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "hello-time",
+	    .prompt =                       N_("Hello time [2]"),
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MAX_AGE,
-		.is_cli_option =                TRUE,
-		.property_alias =               "max-age",
-		.prompt =                       N_("Max age [20]"),
-		.property_type =                &_pt_gobject_int,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "max-age",
+	    .prompt =                       N_("Max age [20]"),
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_AGEING_TIME,
-		.is_cli_option =                TRUE,
-		.property_alias =               "ageing-time",
-		.prompt =                       N_("MAC address ageing time [300]"),
-		.property_type =                &_pt_gobject_int,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "ageing-time",
+	    .prompt =                       N_("MAC address ageing time [300]"),
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_GROUP_FORWARD_MASK,
-		.is_cli_option =                TRUE,
-		.property_alias =               "group-forward-mask",
-		.prompt =                       N_("Group forward mask [0]"),
-		.property_type =                &_pt_gobject_int,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "group-forward-mask",
+	    .prompt =                       N_("Group forward mask [0]"),
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_SNOOPING,
-		.is_cli_option =                TRUE,
-		.property_alias =               "multicast-snooping",
-		.prompt =                       N_("Enable IGMP snooping [no]"),
-		.property_type =                &_pt_gobject_bool,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "multicast-snooping",
+	    .prompt =                       N_("Enable IGMP snooping [no]"),
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_VLAN_FILTERING,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_VLANS,
-		.property_type =                &_pt_objlist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (objlist,
-				.get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingBridge, nm_setting_bridge_get_num_vlans),
-				.clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingBridge, nm_setting_bridge_clear_vlans),
-				.obj_to_str_fcn =       _objlist_obj_to_str_fcn_bridge_vlans,
-				.set_fcn =              _objlist_set_fcn_bridge_vlans,
-			),
-		),
+	    .property_type =                &_pt_objlist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (objlist,
+	            .get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingBridge, nm_setting_bridge_get_num_vlans),
+	            .clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingBridge, nm_setting_bridge_clear_vlans),
+	            .obj_to_str_fcn =       _objlist_obj_to_str_fcn_bridge_vlans,
+	            .set_fcn =              _objlist_set_fcn_bridge_vlans,
+	        ),
+	    ),
 	),
 	NULL
 };
@@ -4926,33 +4941,33 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_BRIDGE_PORT
 static const NMMetaPropertyInfo *const property_infos_BRIDGE_PORT[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_PORT_PRIORITY,
-		.is_cli_option =                TRUE,
-		.property_alias =               "priority",
-		.prompt =                       N_("Bridge port priority [32]"),
-		.property_type =                &_pt_gobject_int,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "priority",
+	    .prompt =                       N_("Bridge port priority [32]"),
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_PORT_PATH_COST,
-		.is_cli_option =                TRUE,
-		.property_alias =               "path-cost",
-		.prompt =                       N_("Bridge port STP path cost [100]"),
-		.property_type =                &_pt_gobject_int,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "path-cost",
+	    .prompt =                       N_("Bridge port STP path cost [100]"),
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE,
-		.is_cli_option =                TRUE,
-		.property_alias =               "hairpin",
-		.prompt =                       N_("Hairpin [no]"),
-		.property_type =                &_pt_gobject_bool,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "hairpin",
+	    .prompt =                       N_("Hairpin [no]"),
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_PORT_VLANS,
-		.property_type =                &_pt_objlist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (objlist,
-				.get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingBridgePort, nm_setting_bridge_port_get_num_vlans),
-				.clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingBridgePort, nm_setting_bridge_port_clear_vlans),
-				.obj_to_str_fcn =       _objlist_obj_to_str_fcn_bridge_vlans,
-				.set_fcn =              _objlist_set_fcn_bridge_vlans,
-			),
-		),
+	    .property_type =                &_pt_objlist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (objlist,
+	            .get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingBridgePort, nm_setting_bridge_port_get_num_vlans),
+	            .clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingBridgePort, nm_setting_bridge_port_clear_vlans),
+	            .obj_to_str_fcn =       _objlist_obj_to_str_fcn_bridge_vlans,
+	            .set_fcn =              _objlist_set_fcn_bridge_vlans,
+	        ),
+	    ),
 	),
 	NULL
 };
@@ -4961,29 +4976,29 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE_PORT[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_CDMA
 static const NMMetaPropertyInfo *const property_infos_CDMA[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CDMA_NUMBER,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CDMA_USERNAME,
-		.is_cli_option =                TRUE,
-		.property_alias =               "user",
-		.prompt =                       N_("Username [none]"),
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "user",
+	    .prompt =                       N_("Username [none]"),
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CDMA_PASSWORD,
-		.is_cli_option =                TRUE,
-		.property_alias =               "password",
-		.prompt =                       N_("Password [none]"),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "password",
+	    .prompt =                       N_("Password [none]"),
+	    .is_secret =                    TRUE,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CDMA_PASSWORD_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
+	    .property_type =                &_pt_gobject_secret_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CDMA_MTU,
-		.property_type =                &_pt_gobject_mtu,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
-			.get_fcn =                  MTU_GET_FCN (NMSettingCdma, nm_setting_cdma_get_mtu),
-		),
+	    .property_type =                &_pt_gobject_mtu,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
+	        .get_fcn =                  MTU_GET_FCN (NMSettingCdma, nm_setting_cdma_get_mtu),
+	    ),
 	),
 	NULL
 };
@@ -4992,205 +5007,204 @@ static const NMMetaPropertyInfo *const property_infos_CDMA[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_CONNECTION
 static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_ID,
-		.is_cli_option =                TRUE,
-		.property_alias =               "con-name",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_DONT_ASK,
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "con-name",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_DONT_ASK,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_UUID,
-		.property_type =                DEFINE_PROPERTY_TYPE ( .get_fcn = _get_fcn_gobject ),
+	    .property_type =                DEFINE_PROPERTY_TYPE ( .get_fcn = _get_fcn_gobject ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_STABLE_ID,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 [_NM_META_PROPERTY_TYPE_CONNECTION_TYPE] =
-		PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_TYPE,
-			.is_cli_option =                TRUE,
-			.property_alias =               "type",
-			.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-			.prompt =                       NM_META_TEXT_PROMPT_CON_TYPE,
-			.property_type = DEFINE_PROPERTY_TYPE (
-				.get_fcn =                  _get_fcn_gobject,
-				.set_fcn =                  _set_fcn_connection_type,
-				.complete_fcn =             _complete_fcn_connection_type,
-			),
-		),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_TYPE,
+	        .is_cli_option =                TRUE,
+	        .property_alias =               "type",
+	        .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	        .prompt =                       NM_META_TEXT_PROMPT_CON_TYPE,
+	        .property_type = DEFINE_PROPERTY_TYPE (
+	            .get_fcn =                  _get_fcn_gobject,
+	            .set_fcn =                  _set_fcn_connection_type,
+	            .complete_fcn =             _complete_fcn_connection_type,
+	        ),
+	    ),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_INTERFACE_NAME,
-		.is_cli_option =                TRUE,
-		.property_alias =               "ifname",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       NM_META_TEXT_PROMPT_IFNAME,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_gobject_ifname,
-			.complete_fcn =             _complete_fcn_gobject_devices,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "ifname",
+	    .prompt =                       NM_META_TEXT_PROMPT_IFNAME,
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_gobject,
+	        .set_fcn =                  _set_fcn_gobject_ifname,
+	        .complete_fcn =             _complete_fcn_gobject_devices,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_AUTOCONNECT,
-		.is_cli_option =                TRUE,
-		.property_alias =               "autoconnect",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_DONT_ASK,
-		.property_type =                &_pt_gobject_bool,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "autoconnect",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_DONT_ASK,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES,
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =              INT_VALUE_INFOS (
-				{
-					.value.i64 = -1,
-					.nick = "default",
-				},
-				{
-					.value.i64 = 0,
-					.nick = "forever",
-				},
-			),
-		),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+	        .value_infos =              INT_VALUE_INFOS (
+	            {
+	                .value.i64 = -1,
+	                .nick = "default",
+	            },
+	            {
+	                .value.i64 = 0,
+	                .nick = "forever",
+	            },
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_MULTI_CONNECT,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.get_gtype =            nm_connection_multi_connect_get_type,
-			),
-		),
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .get_gtype =            nm_connection_multi_connect_get_type,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_AUTH_RETRIES,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_TIMESTAMP,
-		.property_type =                &_pt_gobject_readonly,
+	    .property_type =                &_pt_gobject_readonly,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_READ_ONLY,
-		.property_type =                &_pt_gobject_readonly,
+	    .property_type =                &_pt_gobject_readonly,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_PERMISSIONS,
-		.describe_message =
-		     N_("Enter a list of user permissions. This is a list of user names formatted as:\n"
-		        "  [user:]<user name 1>, [user:]<user name 2>,...\n"
-		        "The items can be separated by commas or spaces.\n\n"
-		        "Example: alice bob charlie\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_connection_permissions,
-			.set_fcn =                  _set_fcn_multilist,
-			.set_supports_remove =      TRUE,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (multilist,
-				.get_num_fcn_u32 =      MULTILIST_GET_NUM_FCN_U32     (NMSettingConnection, nm_setting_connection_get_num_permissions),
-				.add_fcn =              _multilist_set_fcn_connection_permissions,
-				.remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSettingConnection, nm_setting_connection_remove_permission),
-				.remove_by_value_fcn =  _multilist_remove_by_value_fcn_connection_permissions,
-				.validate2_fcn =        _multilist_validate2_fcn_connection_permissions,
-				.strsplit_plain =       TRUE,
-			),
-		),
+	    .describe_message =
+	         N_("Enter a list of user permissions. This is a list of user names formatted as:\n"
+	            "  [user:]<user name 1>, [user:]<user name 2>,...\n"
+	            "The items can be separated by commas or spaces.\n\n"
+	            "Example: alice bob charlie\n"),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_connection_permissions,
+	        .set_fcn =                  _set_fcn_multilist,
+	        .set_supports_remove =      TRUE,
+	    ),
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
+	            .get_num_fcn_u32 =      MULTILIST_GET_NUM_FCN_U32     (NMSettingConnection, nm_setting_connection_get_num_permissions),
+	            .add_fcn =              _multilist_set_fcn_connection_permissions,
+	            .remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSettingConnection, nm_setting_connection_remove_permission),
+	            .remove_by_value_fcn =  _multilist_remove_by_value_fcn_connection_permissions,
+	            .validate2_fcn =        _multilist_validate2_fcn_connection_permissions,
+	            .strsplit_plain =       TRUE,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_ZONE,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_MASTER,
-		.is_cli_option =                TRUE,
-		.property_alias =               "master",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_DONT_ASK,
-		.prompt =                       NM_META_TEXT_PROMPT_MASTER,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_connection_master,
-			.complete_fcn =             _complete_fcn_connection_master,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "master",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_DONT_ASK,
+	    .prompt =                       NM_META_TEXT_PROMPT_MASTER,
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_gobject,
+	        .set_fcn =                  _set_fcn_connection_master,
+	        .complete_fcn =             _complete_fcn_connection_master,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_SLAVE_TYPE,
-		.is_cli_option =                TRUE,
-		.property_alias =               "slave-type",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_DONT_ASK,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV (NM_SETTING_BOND_SETTING_NAME,
-			                                          NM_SETTING_BRIDGE_SETTING_NAME,
-			                                          NM_SETTING_OVS_BRIDGE_SETTING_NAME,
-			                                          NM_SETTING_OVS_PORT_SETTING_NAME,
-			                                          NM_SETTING_TEAM_SETTING_NAME),
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "slave-type",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_DONT_ASK,
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV (NM_SETTING_BOND_SETTING_NAME,
+	                                                  NM_SETTING_BRIDGE_SETTING_NAME,
+	                                                  NM_SETTING_OVS_BRIDGE_SETTING_NAME,
+	                                                  NM_SETTING_OVS_PORT_SETTING_NAME,
+	                                                  NM_SETTING_TEAM_SETTING_NAME),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES,
-		.property_type =                &_pt_gobject_enum,
+	    .property_type =                &_pt_gobject_enum,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_SECONDARIES,
-		.describe_message =
-		    N_("Enter secondary connections that should be activated when this connection is\n"
-		       "activated. Connections can be specified either by UUID or ID (name). nmcli\n"
-		       "transparently translates names to UUIDs. Note that NetworkManager only supports\n"
-		       "VPNs as secondary connections at the moment.\n"
-		       "The items can be separated by commas or spaces.\n\n"
-		       "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"),
-		.property_type =                &_pt_multilist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (multilist,
-				.get_num_fcn_u32 =      MULTILIST_GET_NUM_FCN_U32     (NMSettingConnection, nm_setting_connection_get_num_secondaries),
-				.add_fcn =              MULTILIST_ADD_FCN             (NMSettingConnection, nm_setting_connection_add_secondary),
-				.remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSettingConnection, nm_setting_connection_remove_secondary),
-				.remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingConnection, nm_setting_connection_remove_secondary_by_value),
-				.validate2_fcn =        _multilist_validate2_fcn_uuid,
-				.strsplit_plain =       TRUE,
-			),
-		),
+	    .describe_message =
+	        N_("Enter secondary connections that should be activated when this connection is\n"
+	           "activated. Connections can be specified either by UUID or ID (name). nmcli\n"
+	           "transparently translates names to UUIDs. Note that NetworkManager only supports\n"
+	           "VPNs as secondary connections at the moment.\n"
+	           "The items can be separated by commas or spaces.\n\n"
+	           "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"),
+	    .property_type =                &_pt_multilist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
+	            .get_num_fcn_u32 =      MULTILIST_GET_NUM_FCN_U32     (NMSettingConnection, nm_setting_connection_get_num_secondaries),
+	            .add_fcn =              MULTILIST_ADD_FCN             (NMSettingConnection, nm_setting_connection_add_secondary),
+	            .remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSettingConnection, nm_setting_connection_remove_secondary),
+	            .remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingConnection, nm_setting_connection_remove_secondary_by_value),
+	            .validate2_fcn =        _multilist_validate2_fcn_uuid,
+	            .strsplit_plain =       TRUE,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_METERED,
-		.describe_message =
-		    N_("Enter a value which indicates whether the connection is subject to a data\n"
-		       "quota, usage costs or other limitations. Accepted options are:\n"
-		       "'true','yes','on' to set the connection as metered\n"
-		       "'false','no','off' to set the connection as not metered\n"
-		       "'unknown' to let NetworkManager choose a value using some heuristics\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_connection_metered,
-			.set_fcn =                  _set_fcn_connection_metered,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV ("yes", "no", "unknown"),
-		),
+	    .describe_message =
+	        N_("Enter a value which indicates whether the connection is subject to a data\n"
+	           "quota, usage costs or other limitations. Accepted options are:\n"
+	           "'true','yes','on' to set the connection as metered\n"
+	           "'false','no','off' to set the connection as not metered\n"
+	           "'unknown' to let NetworkManager choose a value using some heuristics\n"),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_connection_metered,
+	        .set_fcn =                  _set_fcn_connection_metered,
+	    ),
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV ("yes", "no", "unknown"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_LLDP,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.get_gtype =            nm_setting_connection_lldp_get_type,
-				.value_infos =          ENUM_VALUE_INFOS (
-					{
-						.value = NM_SETTING_CONNECTION_LLDP_ENABLE_RX,
-						.nick = "enable",
-					},
-				),
-			),
-			.typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
-			                            | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
-		),
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .get_gtype =            nm_setting_connection_lldp_get_type,
+	            .value_infos =          ENUM_VALUE_INFOS (
+	                {
+	                    .value = NM_SETTING_CONNECTION_LLDP_ENABLE_RX,
+	                    .nick = "enable",
+	                },
+	            ),
+	        ),
+	        .typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
+	                                    | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_MDNS,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.get_gtype =            nm_setting_connection_mdns_get_type,
-			),
-		),
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .get_gtype =            nm_setting_connection_mdns_get_type,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_LLMNR,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.get_gtype =            nm_setting_connection_llmnr_get_type,
-			),
-		),
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .get_gtype =            nm_setting_connection_llmnr_get_type,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	NULL
 };
@@ -5199,97 +5213,97 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_DCB
 static const NMMetaPropertyInfo *const property_infos_DCB[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_DCB_APP_FCOE_FLAGS,
-		.property_type =                &_pt_dcb_flags,
+	    .property_type =                &_pt_dcb_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_DCB_APP_FCOE_PRIORITY,
-		DEFINE_DCB_PROPRITY_PROPERTY_TYPE
+	    DEFINE_DCB_PROPRITY_PROPERTY_TYPE
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_DCB_APP_FCOE_MODE,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV (NM_SETTING_DCB_FCOE_MODE_FABRIC,
-			                                           NM_SETTING_DCB_FCOE_MODE_VN2VN),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV (NM_SETTING_DCB_FCOE_MODE_FABRIC,
+	                                                   NM_SETTING_DCB_FCOE_MODE_VN2VN),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_DCB_APP_ISCSI_FLAGS,
-		.property_type =                &_pt_dcb_flags,
+	    .property_type =                &_pt_dcb_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_DCB_APP_ISCSI_PRIORITY,
-		DEFINE_DCB_PROPRITY_PROPERTY_TYPE
+	    DEFINE_DCB_PROPRITY_PROPERTY_TYPE
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_DCB_APP_FIP_FLAGS,
-		.property_type =                &_pt_dcb_flags,
+	    .property_type =                &_pt_dcb_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_DCB_APP_FIP_PRIORITY,
-		DEFINE_DCB_PROPRITY_PROPERTY_TYPE
+	    DEFINE_DCB_PROPRITY_PROPERTY_TYPE
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS,
-		.property_type =                &_pt_dcb_flags,
+	    .property_type =                &_pt_dcb_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL,
-		.property_type =                &_pt_dcb_bool,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (dcb_bool,
-			.get_fcn                    = nm_setting_dcb_get_priority_flow_control,
-			.set_fcn                    = nm_setting_dcb_set_priority_flow_control,
-			.with_flow_control_flags    = TRUE,
-		),
+	    .property_type =                &_pt_dcb_bool,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (dcb_bool,
+	        .get_fcn                    = nm_setting_dcb_get_priority_flow_control,
+	        .set_fcn                    = nm_setting_dcb_set_priority_flow_control,
+	        .with_flow_control_flags    = TRUE,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_DCB_PRIORITY_GROUP_FLAGS,
-		.property_type =                &_pt_dcb_flags,
+	    .property_type =                &_pt_dcb_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_DCB_PRIORITY_GROUP_ID,
-		.property_type =                &_pt_dcb,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (dcb,
-			.get_fcn =                  nm_setting_dcb_get_priority_group_id,
-			.set_fcn =                  nm_setting_dcb_set_priority_group_id,
-			.max =                      7,
-			.other =                    15,
-		),
+	    .property_type =                &_pt_dcb,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (dcb,
+	        .get_fcn =                  nm_setting_dcb_get_priority_group_id,
+	        .set_fcn =                  nm_setting_dcb_set_priority_group_id,
+	        .max =                      7,
+	        .other =                    15,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH,
-		.property_type =                &_pt_dcb,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (dcb,
-			.get_fcn =                  nm_setting_dcb_get_priority_group_bandwidth,
-			.set_fcn =                  nm_setting_dcb_set_priority_group_bandwidth,
-			.max =                      100,
-			.other =                    0,
-			.is_percent =               TRUE,
-		),
+	    .property_type =                &_pt_dcb,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (dcb,
+	        .get_fcn =                  nm_setting_dcb_get_priority_group_bandwidth,
+	        .set_fcn =                  nm_setting_dcb_set_priority_group_bandwidth,
+	        .max =                      100,
+	        .other =                    0,
+	        .is_percent =               TRUE,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_DCB_PRIORITY_BANDWIDTH,
-		.property_type =                &_pt_dcb,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (dcb,
-			.get_fcn =                  nm_setting_dcb_get_priority_bandwidth,
-			.set_fcn =                  nm_setting_dcb_set_priority_bandwidth,
-			.max =                      100,
-			.other =                    0,
-		),
+	    .property_type =                &_pt_dcb,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (dcb,
+	        .get_fcn =                  nm_setting_dcb_get_priority_bandwidth,
+	        .set_fcn =                  nm_setting_dcb_set_priority_bandwidth,
+	        .max =                      100,
+	        .other =                    0,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH,
-		.property_type =                &_pt_dcb_bool,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (dcb_bool,
-			.get_fcn                    = nm_setting_dcb_get_priority_strict_bandwidth,
-			.set_fcn                    = nm_setting_dcb_set_priority_strict_bandwidth,
-		),
+	    .property_type =                &_pt_dcb_bool,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (dcb_bool,
+	        .get_fcn                    = nm_setting_dcb_get_priority_strict_bandwidth,
+	        .set_fcn                    = nm_setting_dcb_set_priority_strict_bandwidth,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS,
-		.property_type =                &_pt_dcb,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (dcb,
-			.get_fcn =                  nm_setting_dcb_get_priority_traffic_class,
-			.set_fcn =                  nm_setting_dcb_set_priority_traffic_class,
-			.max =                      7,
-			.other =                    0,
-		),
+	    .property_type =                &_pt_dcb,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (dcb,
+	        .get_fcn =                  nm_setting_dcb_get_priority_traffic_class,
+	        .set_fcn =                  nm_setting_dcb_set_priority_traffic_class,
+	        .max =                      7,
+	        .other =                    0,
+	    ),
 	),
 	NULL
 };
 
 #define PROPERTY_INFO_ETHTOOL(xname) \
 	PROPERTY_INFO (NM_ETHTOOL_OPTNAME_##xname, NULL, \
-		.property_type = &_pt_ethtool, \
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (ethtool, \
-			.ethtool_id = NM_ETHTOOL_ID_##xname, \
-		), \
+	    .property_type = &_pt_ethtool, \
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (ethtool, \
+	        .ethtool_id = NM_ETHTOOL_ID_##xname, \
+	    ), \
 	)
 
 #undef  _CURRENT_NM_META_SETTING_TYPE
@@ -5353,61 +5367,64 @@ static const NMMetaPropertyInfo *const property_infos_ETHTOOL[] = {
 #undef  _CURRENT_NM_META_SETTING_TYPE
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_GSM
 static const NMMetaPropertyInfo *const property_infos_GSM[] = {
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_GSM_AUTO_CONFIG,
+	    .property_type =                &_pt_gobject_bool,
+	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_GSM_NUMBER,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_GSM_USERNAME,
-		.is_cli_option =                TRUE,
-		.property_alias =               "user",
-		.prompt =                       N_("Username [none]"),
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "user",
+	    .prompt =                       N_("Username [none]"),
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_GSM_PASSWORD,
-		.is_cli_option =                TRUE,
-		.property_alias =               "password",
-		.prompt =                       N_("Password [none]"),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "password",
+	    .prompt =                       N_("Password [none]"),
+	    .is_secret =                    TRUE,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_GSM_PASSWORD_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
+	    .property_type =                &_pt_gobject_secret_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_GSM_APN,
-		.is_cli_option =                TRUE,
-		.property_alias =               "apn",
-		.prompt =                       N_("APN"),
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "apn",
+	    .prompt =                       N_("APN"),
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_GSM_NETWORK_ID,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_GSM_PIN,
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
+	    .is_secret =                    TRUE,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_GSM_PIN_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
+	    .property_type =                &_pt_gobject_secret_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_GSM_HOME_ONLY,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_GSM_DEVICE_ID,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_GSM_SIM_ID,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_GSM_SIM_OPERATOR_ID,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_gsm_sim_operator_id,
-		),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_gobject,
+	        .set_fcn =                  _set_fcn_gsm_sim_operator_id,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_GSM_MTU,
-		.property_type =                &_pt_gobject_mtu,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
-			.get_fcn =                  MTU_GET_FCN (NMSettingGsm, nm_setting_gsm_get_mtu),
-		),
+	    .property_type =                &_pt_gobject_mtu,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
+	        .get_fcn =                  MTU_GET_FCN (NMSettingGsm, nm_setting_gsm_get_mtu),
+	    ),
 	),
 	NULL
 };
@@ -5416,50 +5433,50 @@ static const NMMetaPropertyInfo *const property_infos_GSM[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_INFINIBAND
 static const NMMetaPropertyInfo *const property_infos_INFINIBAND[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_INFINIBAND_MAC_ADDRESS,
-		.is_cli_option =                TRUE,
-		.property_alias =               "mac",
-		.prompt =                       N_("MAC [none]"),
-		.property_type =                &_pt_gobject_mac,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mac,
-			.mode =                     NM_META_PROPERTY_TYPE_MAC_MODE_INFINIBAND,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "mac",
+	    .prompt =                       N_("MAC [none]"),
+	    .property_type =                &_pt_gobject_mac,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mac,
+	        .mode =                     NM_META_PROPERTY_TYPE_MAC_MODE_INFINIBAND,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_INFINIBAND_MTU,
-		.is_cli_option =                TRUE,
-		.property_alias =               "mtu",
-		.prompt =                       N_("MTU [auto]"),
-		.property_type =                &_pt_gobject_mtu,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
-			.get_fcn =                  MTU_GET_FCN (NMSettingInfiniband, nm_setting_infiniband_get_mtu),
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "mtu",
+	    .prompt =                       N_("MTU [auto]"),
+	    .property_type =                &_pt_gobject_mtu,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
+	        .get_fcn =                  MTU_GET_FCN (NMSettingInfiniband, nm_setting_infiniband_get_mtu),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_INFINIBAND_TRANSPORT_MODE,
-		.is_cli_option =                TRUE,
-		.property_alias =               "transport-mode",
-		.prompt =                       NM_META_TEXT_PROMPT_IB_MODE,
-		.def_hint =                     NM_META_TEXT_PROMPT_IB_MODE_CHOICES,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV ("datagram", "connected"),
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "transport-mode",
+	    .prompt =                       NM_META_TEXT_PROMPT_IB_MODE,
+	    .def_hint =                     NM_META_TEXT_PROMPT_IB_MODE_CHOICES,
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV ("datagram", "connected"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_INFINIBAND_P_KEY,
-		.is_cli_option =                TRUE,
-		.property_alias =               "p-key",
-		.prompt =                       N_("P_KEY [none]"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_infiniband_p_key,
-			.set_fcn =                  _set_fcn_infiniband_p_key,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "p-key",
+	    .prompt =                       N_("P_KEY [none]"),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_infiniband_p_key,
+	        .set_fcn =                  _set_fcn_infiniband_p_key,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_INFINIBAND_PARENT,
-		.is_cli_option =                TRUE,
-		.property_alias =               "parent",
-		.prompt =                       N_("Parent interface [none]"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_gobject_ifname,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "parent",
+	    .prompt =                       N_("Parent interface [none]"),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_gobject,
+	        .set_fcn =                  _set_fcn_gobject_ifname,
+	    ),
 	),
 	NULL
 };
@@ -5468,204 +5485,215 @@ static const NMMetaPropertyInfo *const property_infos_INFINIBAND[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_IP4_CONFIG
 static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = {
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_METHOD, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_METHOD,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_ip_config_method,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV (NM_SETTING_IP4_CONFIG_METHOD_AUTO,
-			                                          NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL,
-			                                          NM_SETTING_IP4_CONFIG_METHOD_MANUAL,
-			                                          NM_SETTING_IP4_CONFIG_METHOD_SHARED,
-			                                          NM_SETTING_IP4_CONFIG_METHOD_DISABLED),
-		),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_gobject,
+	        .set_fcn =                  _set_fcn_ip_config_method,
+	    ),
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV (NM_SETTING_IP4_CONFIG_METHOD_AUTO,
+	                                                  NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL,
+	                                                  NM_SETTING_IP4_CONFIG_METHOD_MANUAL,
+	                                                  NM_SETTING_IP4_CONFIG_METHOD_SHARED,
+	                                                  NM_SETTING_IP4_CONFIG_METHOD_DISABLED),
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DNS, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS,
-		.describe_message =
-		    N_("Enter a list of IPv4 addresses of DNS servers.\n\n"
-		       "Example: 8.8.8.8, 8.8.4.4\n"),
-		.property_type =                &_pt_multilist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (multilist,
-				.get_num_fcn_u =        MULTILIST_GET_NUM_FCN_U       (NMSettingIPConfig, nm_setting_ip_config_get_num_dns),
-				.add_fcn =              MULTILIST_ADD_FCN             (NMSettingIPConfig, nm_setting_ip_config_add_dns),
-				.remove_by_idx_fcn_s =  MULTILIST_REMOVE_BY_IDX_FCN_S (NMSettingIPConfig, nm_setting_ip_config_remove_dns),
-				.remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingIPConfig, nm_setting_ip_config_remove_dns_by_value),
-				.validate2_fcn =        _multilist_validate2_fcn_ip_config_dns,
-				.strsplit_plain =       TRUE,
-			),
-		),
+	    .describe_message =
+	        N_("Enter a list of IPv4 addresses of DNS servers.\n\n"
+	           "Example: 8.8.8.8, 8.8.4.4\n"),
+	    .property_type =                &_pt_multilist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
+	            .get_num_fcn_u =        MULTILIST_GET_NUM_FCN_U       (NMSettingIPConfig, nm_setting_ip_config_get_num_dns),
+	            .add_fcn =              MULTILIST_ADD_FCN             (NMSettingIPConfig, nm_setting_ip_config_add_dns),
+	            .remove_by_idx_fcn_s =  MULTILIST_REMOVE_BY_IDX_FCN_S (NMSettingIPConfig, nm_setting_ip_config_remove_dns),
+	            .remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingIPConfig, nm_setting_ip_config_remove_dns_by_value),
+	            .validate2_fcn =        _multilist_validate2_fcn_ip_config_dns,
+	            .strsplit_plain =       TRUE,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DNS_SEARCH, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_SEARCH,
-		.property_type =                &_pt_multilist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (multilist,
-				.get_num_fcn_u =        MULTILIST_GET_NUM_FCN_U       (NMSettingIPConfig, nm_setting_ip_config_get_num_dns_searches),
-				.add_fcn =              MULTILIST_ADD_FCN             (NMSettingIPConfig, nm_setting_ip_config_add_dns_search),
-				.remove_by_idx_fcn_s =  MULTILIST_REMOVE_BY_IDX_FCN_S (NMSettingIPConfig, nm_setting_ip_config_remove_dns_search),
-				.remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingIPConfig, nm_setting_ip_config_remove_dns_search_by_value),
-				.validate_fcn =         _multilist_validate_fcn_is_domain,
-				.strsplit_plain =       TRUE,
-			),
-		),
+	    .property_type =                &_pt_multilist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
+	            .get_num_fcn_u =        MULTILIST_GET_NUM_FCN_U       (NMSettingIPConfig, nm_setting_ip_config_get_num_dns_searches),
+	            .add_fcn =              MULTILIST_ADD_FCN             (NMSettingIPConfig, nm_setting_ip_config_add_dns_search),
+	            .remove_by_idx_fcn_s =  MULTILIST_REMOVE_BY_IDX_FCN_S (NMSettingIPConfig, nm_setting_ip_config_remove_dns_search),
+	            .remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingIPConfig, nm_setting_ip_config_remove_dns_search_by_value),
+	            .validate_fcn =         _multilist_validate_fcn_is_domain,
+	            .strsplit_plain =       TRUE,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DNS_OPTIONS, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_OPTIONS,
-		.property_type =                &_pt_multilist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (multilist,
-				.get_num_fcn_u =        MULTILIST_GET_NUM_FCN_U       (NMSettingIPConfig, nm_setting_ip_config_get_num_dns_options),
-				.add_fcn =              _multilist_add_fcn_ip_config_dns_options,
-				.remove_by_idx_fcn_s =  MULTILIST_REMOVE_BY_IDX_FCN_S (NMSettingIPConfig, nm_setting_ip_config_remove_dns_option),
-				.remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingIPConfig, nm_setting_ip_config_remove_dns_option_by_value),
-				.clear_emptyunset_fcn = MULTILIST_CLEAR_EMPTYUNSET_FCN (NMSettingIPConfig, nm_setting_ip_config_clear_dns_options),
-				.strsplit_plain =       TRUE,
-			),
-			.is_default_fcn =           _is_default_func_ip_config_dns_options,
-		),
+	    .property_type =                &_pt_multilist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
+	            .get_num_fcn_u =        MULTILIST_GET_NUM_FCN_U       (NMSettingIPConfig, nm_setting_ip_config_get_num_dns_options),
+	            .add_fcn =              _multilist_add_fcn_ip_config_dns_options,
+	            .remove_by_idx_fcn_s =  MULTILIST_REMOVE_BY_IDX_FCN_S (NMSettingIPConfig, nm_setting_ip_config_remove_dns_option),
+	            .remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingIPConfig, nm_setting_ip_config_remove_dns_option_by_value),
+	            .clear_emptyunset_fcn = MULTILIST_CLEAR_EMPTYUNSET_FCN (NMSettingIPConfig, nm_setting_ip_config_clear_dns_options),
+	            .strsplit_plain =       TRUE,
+	        ),
+	        .is_default_fcn =           _is_default_func_ip_config_dns_options,
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DNS_PRIORITY, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_ADDRESSES, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ADDRESSES,
-		.is_cli_option =                TRUE,
-		.property_alias =               "ip4",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_MULTI,
-		.prompt =                       N_("IPv4 address (IP[/plen]) [none]"),
-		.describe_message =
-		    N_("Enter a list of IPv4 addresses formatted as:\n"
-		       "  ip[/prefix], ip[/prefix],...\n"
-		       "Missing prefix is regarded as prefix of 32.\n\n"
-		       "Example: 192.168.1.5/24, 10.0.0.11/24\n"),
-		.property_type =                &_pt_objlist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (objlist,
-				.get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingIPConfig, nm_setting_ip_config_get_num_addresses),
-				.clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingIPConfig, nm_setting_ip_config_clear_addresses),
-				.obj_to_str_fcn =       _objlist_obj_to_str_fcn_ip_config_addresses,
-				.set_fcn =              _objlist_set_fcn_ip_config_addresses,
-				.remove_by_idx_fcn_s =  OBJLIST_REMOVE_BY_IDX_FCN_S (NMSettingIPConfig, nm_setting_ip_config_remove_address),
-				.strsplit_plain =       TRUE,
-			),
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "ip4",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_MULTI,
+	    .prompt =                       N_("IPv4 address (IP[/plen]) [none]"),
+	    .describe_message =
+	        N_("Enter a list of IPv4 addresses formatted as:\n"
+	           "  ip[/prefix], ip[/prefix],...\n"
+	           "Missing prefix is regarded as prefix of 32.\n\n"
+	           "Example: 192.168.1.5/24, 10.0.0.11/24\n"),
+	    .property_type =                &_pt_objlist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (objlist,
+	            .get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingIPConfig, nm_setting_ip_config_get_num_addresses),
+	            .clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingIPConfig, nm_setting_ip_config_clear_addresses),
+	            .obj_to_str_fcn =       _objlist_obj_to_str_fcn_ip_config_addresses,
+	            .set_fcn =              _objlist_set_fcn_ip_config_addresses,
+	            .remove_by_idx_fcn_s =  OBJLIST_REMOVE_BY_IDX_FCN_S (NMSettingIPConfig, nm_setting_ip_config_remove_address),
+	            .strsplit_plain =       TRUE,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_GATEWAY, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_GATEWAY,
-		.is_cli_option =                TRUE,
-		.property_alias =               "gw4",
-		.prompt =                       N_("IPv4 gateway [none]"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_ip_config_gateway,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "gw4",
+	    .prompt =                       N_("IPv4 gateway [none]"),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_gobject,
+	        .set_fcn =                  _set_fcn_ip_config_gateway,
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_ROUTES, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ROUTES,
-		.describe_message =
-		    N_("Enter a list of IPv4 routes formatted as:\n"
-		       "  ip[/prefix] [next-hop] [metric],...\n\n"
-		       "Missing prefix is regarded as a prefix of 32.\n"
-		       "Missing next-hop is regarded as 0.0.0.0.\n"
-		       "Missing metric means default (NM/kernel will set a default value).\n\n"
-		       "Examples: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
-		       "          10.1.2.0/24\n"),
-		.property_type =                &_pt_objlist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (objlist,
-				.get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingIPConfig, nm_setting_ip_config_get_num_routes),
-				.clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingIPConfig, nm_setting_ip_config_clear_routes),
-				.obj_to_str_fcn =       _objlist_obj_to_str_fcn_ip_config_routes,
-				.set_fcn =              _objlist_set_fcn_ip_config_routes,
-				.remove_by_idx_fcn_s =  OBJLIST_REMOVE_BY_IDX_FCN_S (NMSettingIPConfig, nm_setting_ip_config_remove_route),
-				.delimit_pretty_with_semicolon = TRUE,
-				.strsplit_plain =       TRUE,
-			),
-		),
+	    .describe_message =
+	        N_("Enter a list of IPv4 routes formatted as:\n"
+	           "  ip[/prefix] [next-hop] [metric],...\n\n"
+	           "Missing prefix is regarded as a prefix of 32.\n"
+	           "Missing next-hop is regarded as 0.0.0.0.\n"
+	           "Missing metric means default (NM/kernel will set a default value).\n\n"
+	           "Examples: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
+	           "          10.1.2.0/24\n"),
+	    .property_type =                &_pt_objlist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (objlist,
+	            .get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingIPConfig, nm_setting_ip_config_get_num_routes),
+	            .clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingIPConfig, nm_setting_ip_config_clear_routes),
+	            .obj_to_str_fcn =       _objlist_obj_to_str_fcn_ip_config_routes,
+	            .set_fcn =              _objlist_set_fcn_ip_config_routes,
+	            .remove_by_idx_fcn_s =  OBJLIST_REMOVE_BY_IDX_FCN_S (NMSettingIPConfig, nm_setting_ip_config_remove_route),
+	            .delimit_pretty_with_semicolon = TRUE,
+	            .strsplit_plain =       TRUE,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_ROUTE_METRIC, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ROUTE_METRIC,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_ROUTE_TABLE, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ROUTE_TABLE,
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =              INT_VALUE_INFOS (
-				{
-					.value.i64 = 0,
-					.nick = "unspec",
-				},
-				{
-					.value.i64 = 254,
-					.nick = "main",
-				},
-			),
-		),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+	        .value_infos =              INT_VALUE_INFOS (
+	            {
+	                .value.i64 = 0,
+	                .nick = "unspec",
+	            },
+	            {
+	                .value.i64 = 254,
+	                .nick = "main",
+	            },
+	        ),
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_ROUTING_RULES, NULL,
-		.describe_message =
-		    N_("Enter a list of IPv4 routing rules formatted as:\n"
-		       "  priority [prio] [from [src]] [to [dst]], ,...\n"
-		       "\n"),
-		.property_type =                &_pt_objlist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (objlist,
-				.get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingIPConfig, nm_setting_ip_config_get_num_routing_rules),
-				.clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingIPConfig, nm_setting_ip_config_clear_routing_rules),
-				.obj_to_str_fcn =       _objlist_obj_to_str_fcn_ip_config_routing_rules,
-				.set_fcn =              _objlist_set_fcn_ip_config_routing_rules,
-				.remove_by_idx_fcn_u =  OBJLIST_REMOVE_BY_IDX_FCN_U (NMSettingIPConfig, nm_setting_ip_config_remove_routing_rule),
-			),
-		),
+	    .describe_message =
+	        N_("Enter a list of IPv4 routing rules formatted as:\n"
+	           "  priority [prio] [from [src]] [to [dst]], ,...\n"
+	           "\n"),
+	    .property_type =                &_pt_objlist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (objlist,
+	            .get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingIPConfig, nm_setting_ip_config_get_num_routing_rules),
+	            .clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingIPConfig, nm_setting_ip_config_clear_routing_rules),
+	            .obj_to_str_fcn =       _objlist_obj_to_str_fcn_ip_config_routing_rules,
+	            .set_fcn =              _objlist_set_fcn_ip_config_routing_rules,
+	            .remove_by_idx_fcn_u =  OBJLIST_REMOVE_BY_IDX_FCN_U (NMSettingIPConfig, nm_setting_ip_config_remove_routing_rule),
+	        ),
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
+	),
+	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_IAID, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_IAID,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT,
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =              INT_VALUE_INFOS (
-				{
-					.value.i64 = 0,
-					.nick = "default",
-				},
-				{
-					.value.i64 = G_MAXINT32,
-					.nick = "infinity",
-				},
-			),
-		),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+	        .value_infos =              INT_VALUE_INFOS (
+	            {
+	                .value.i64 = 0,
+	                .nick = "default",
+	            },
+	            {
+	                .value.i64 = G_MAXINT32,
+	                .nick = "infinity",
+	            },
+	        ),
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_IP4_CONFIG_DHCP_FQDN,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
+	),
+	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME_FLAGS, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME_FLAGS,
+		.property_type =                &_pt_gobject_enum,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+				.get_gtype =            nm_dhcp_hostname_flags_get_type,
+			),
+		)
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_NEVER_DEFAULT, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_NEVER_DEFAULT,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_MAY_FAIL, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_MAY_FAIL,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DAD_TIMEOUT, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DAD_TIMEOUT,
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =              INT_VALUE_INFOS (
-				{
-					.value.i64 = -1,
-					.nick = "default",
-				},
-				{
-					.value.i64 = 0,
-					.nick = "off",
-				},
-			),
-		),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+	        .value_infos =              INT_VALUE_INFOS (
+	            {
+	                .value.i64 = -1,
+	                .nick = "default",
+	            },
+	            {
+	                .value.i64 = 0,
+	                .nick = "off",
+	            },
+	        ),
+	    ),
 	),
 	NULL
 };
@@ -5674,207 +5702,218 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_IP6_CONFIG
 static const NMMetaPropertyInfo *const property_infos_IP6_CONFIG[] = {
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_METHOD, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_METHOD,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_ip_config_method,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV (NM_SETTING_IP6_CONFIG_METHOD_IGNORE,
-			                                          NM_SETTING_IP6_CONFIG_METHOD_AUTO,
-			                                          NM_SETTING_IP6_CONFIG_METHOD_DHCP,
-			                                          NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL,
-			                                          NM_SETTING_IP6_CONFIG_METHOD_MANUAL,
-			                                          NM_SETTING_IP6_CONFIG_METHOD_SHARED,
-			                                          NM_SETTING_IP6_CONFIG_METHOD_DISABLED),
-		),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_gobject,
+	        .set_fcn =                  _set_fcn_ip_config_method,
+	    ),
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV (NM_SETTING_IP6_CONFIG_METHOD_IGNORE,
+	                                                  NM_SETTING_IP6_CONFIG_METHOD_AUTO,
+	                                                  NM_SETTING_IP6_CONFIG_METHOD_DHCP,
+	                                                  NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL,
+	                                                  NM_SETTING_IP6_CONFIG_METHOD_MANUAL,
+	                                                  NM_SETTING_IP6_CONFIG_METHOD_SHARED,
+	                                                  NM_SETTING_IP6_CONFIG_METHOD_DISABLED),
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DNS, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS,
-		.describe_message =
-		    N_("Enter a list of IPv6 addresses of DNS servers.  If the IPv6 "
-		       "configuration method is 'auto' these DNS servers are appended "
-		       "to those (if any) returned by automatic configuration.  DNS "
-		       "servers cannot be used with the 'shared' or 'link-local' IPv6 "
-		       "configuration methods, as there is no upstream network. In "
-		       "all other IPv6 configuration methods, these DNS "
-		       "servers are used as the only DNS servers for this connection.\n\n"
-		       "Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"),
-		.property_type =                &_pt_multilist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (multilist,
-				.get_num_fcn_u =        MULTILIST_GET_NUM_FCN_U       (NMSettingIPConfig, nm_setting_ip_config_get_num_dns),
-				.add_fcn =              MULTILIST_ADD_FCN             (NMSettingIPConfig, nm_setting_ip_config_add_dns),
-				.remove_by_idx_fcn_s =  MULTILIST_REMOVE_BY_IDX_FCN_S (NMSettingIPConfig, nm_setting_ip_config_remove_dns),
-				.remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingIPConfig, nm_setting_ip_config_remove_dns_by_value),
-				.validate2_fcn =        _multilist_validate2_fcn_ip_config_dns,
-				.strsplit_plain =       TRUE,
-			),
-		),
+	    .describe_message =
+	        N_("Enter a list of IPv6 addresses of DNS servers.  If the IPv6 "
+	           "configuration method is 'auto' these DNS servers are appended "
+	           "to those (if any) returned by automatic configuration.  DNS "
+	           "servers cannot be used with the 'shared' or 'link-local' IPv6 "
+	           "configuration methods, as there is no upstream network. In "
+	           "all other IPv6 configuration methods, these DNS "
+	           "servers are used as the only DNS servers for this connection.\n\n"
+	           "Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"),
+	    .property_type =                &_pt_multilist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
+	            .get_num_fcn_u =        MULTILIST_GET_NUM_FCN_U       (NMSettingIPConfig, nm_setting_ip_config_get_num_dns),
+	            .add_fcn =              MULTILIST_ADD_FCN             (NMSettingIPConfig, nm_setting_ip_config_add_dns),
+	            .remove_by_idx_fcn_s =  MULTILIST_REMOVE_BY_IDX_FCN_S (NMSettingIPConfig, nm_setting_ip_config_remove_dns),
+	            .remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingIPConfig, nm_setting_ip_config_remove_dns_by_value),
+	            .validate2_fcn =        _multilist_validate2_fcn_ip_config_dns,
+	            .strsplit_plain =       TRUE,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DNS_SEARCH, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_SEARCH,
-		.property_type =                &_pt_multilist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (multilist,
-				.get_num_fcn_u =        MULTILIST_GET_NUM_FCN_U       (NMSettingIPConfig, nm_setting_ip_config_get_num_dns_searches),
-				.add_fcn =              MULTILIST_ADD_FCN             (NMSettingIPConfig, nm_setting_ip_config_add_dns_search),
-				.remove_by_idx_fcn_s =  MULTILIST_REMOVE_BY_IDX_FCN_S (NMSettingIPConfig, nm_setting_ip_config_remove_dns_search),
-				.remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingIPConfig, nm_setting_ip_config_remove_dns_search_by_value),
-				.validate_fcn =         _multilist_validate_fcn_is_domain,
-				.strsplit_plain =       TRUE,
-			),
-		),
+	    .property_type =                &_pt_multilist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
+	            .get_num_fcn_u =        MULTILIST_GET_NUM_FCN_U       (NMSettingIPConfig, nm_setting_ip_config_get_num_dns_searches),
+	            .add_fcn =              MULTILIST_ADD_FCN             (NMSettingIPConfig, nm_setting_ip_config_add_dns_search),
+	            .remove_by_idx_fcn_s =  MULTILIST_REMOVE_BY_IDX_FCN_S (NMSettingIPConfig, nm_setting_ip_config_remove_dns_search),
+	            .remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingIPConfig, nm_setting_ip_config_remove_dns_search_by_value),
+	            .validate_fcn =         _multilist_validate_fcn_is_domain,
+	            .strsplit_plain =       TRUE,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DNS_OPTIONS, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_OPTIONS,
-		.property_type =                &_pt_multilist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (multilist,
-				.get_num_fcn_u =        MULTILIST_GET_NUM_FCN_U       (NMSettingIPConfig, nm_setting_ip_config_get_num_dns_options),
-				.add_fcn =              _multilist_add_fcn_ip_config_dns_options,
-				.remove_by_idx_fcn_s =  MULTILIST_REMOVE_BY_IDX_FCN_S (NMSettingIPConfig, nm_setting_ip_config_remove_dns_option),
-				.remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingIPConfig, nm_setting_ip_config_remove_dns_option_by_value),
-				.clear_emptyunset_fcn = MULTILIST_CLEAR_EMPTYUNSET_FCN (NMSettingIPConfig, nm_setting_ip_config_clear_dns_options),
-				.strsplit_plain =       TRUE,
-			),
-			.is_default_fcn =           _is_default_func_ip_config_dns_options,
-		),
+	    .property_type =                &_pt_multilist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
+	            .get_num_fcn_u =        MULTILIST_GET_NUM_FCN_U       (NMSettingIPConfig, nm_setting_ip_config_get_num_dns_options),
+	            .add_fcn =              _multilist_add_fcn_ip_config_dns_options,
+	            .remove_by_idx_fcn_s =  MULTILIST_REMOVE_BY_IDX_FCN_S (NMSettingIPConfig, nm_setting_ip_config_remove_dns_option),
+	            .remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingIPConfig, nm_setting_ip_config_remove_dns_option_by_value),
+	            .clear_emptyunset_fcn = MULTILIST_CLEAR_EMPTYUNSET_FCN (NMSettingIPConfig, nm_setting_ip_config_clear_dns_options),
+	            .strsplit_plain =       TRUE,
+	        ),
+	        .is_default_fcn =           _is_default_func_ip_config_dns_options,
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DNS_PRIORITY, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_PRIORITY,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_ADDRESSES, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ADDRESSES,
-		.is_cli_option =                TRUE,
-		.property_alias =               "ip6",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_MULTI,
-		.prompt =                       N_("IPv6 address (IP[/plen]) [none]"),
-		.describe_message =
-		    N_("Enter a list of IPv6 addresses formatted as:\n"
-		       "  ip[/prefix], ip[/prefix],...\n"
-		       "Missing prefix is regarded as prefix of 128.\n\n"
-		       "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"),
-		.property_type =                &_pt_objlist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (objlist,
-				.get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingIPConfig, nm_setting_ip_config_get_num_addresses),
-				.clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingIPConfig, nm_setting_ip_config_clear_addresses),
-				.obj_to_str_fcn =       _objlist_obj_to_str_fcn_ip_config_addresses,
-				.set_fcn =              _objlist_set_fcn_ip_config_addresses,
-				.remove_by_idx_fcn_s =  OBJLIST_REMOVE_BY_IDX_FCN_S (NMSettingIPConfig, nm_setting_ip_config_remove_address),
-				.strsplit_plain =       TRUE,
-			),
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "ip6",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_MULTI,
+	    .prompt =                       N_("IPv6 address (IP[/plen]) [none]"),
+	    .describe_message =
+	        N_("Enter a list of IPv6 addresses formatted as:\n"
+	           "  ip[/prefix], ip[/prefix],...\n"
+	           "Missing prefix is regarded as prefix of 128.\n\n"
+	           "Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"),
+	    .property_type =                &_pt_objlist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (objlist,
+	            .get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingIPConfig, nm_setting_ip_config_get_num_addresses),
+	            .clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingIPConfig, nm_setting_ip_config_clear_addresses),
+	            .obj_to_str_fcn =       _objlist_obj_to_str_fcn_ip_config_addresses,
+	            .set_fcn =              _objlist_set_fcn_ip_config_addresses,
+	            .remove_by_idx_fcn_s =  OBJLIST_REMOVE_BY_IDX_FCN_S (NMSettingIPConfig, nm_setting_ip_config_remove_address),
+	            .strsplit_plain =       TRUE,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_GATEWAY, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_GATEWAY,
-		.is_cli_option =                TRUE,
-		.property_alias =               "gw6",
-		.prompt =                       N_("IPv6 gateway [none]"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_ip_config_gateway,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "gw6",
+	    .prompt =                       N_("IPv6 gateway [none]"),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_gobject,
+	        .set_fcn =                  _set_fcn_ip_config_gateway,
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_ROUTES, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ROUTES,
-		.describe_message =
-		    N_("Enter a list of IPv6 routes formatted as:\n"
-		       "  ip[/prefix] [next-hop] [metric],...\n\n"
-		       "Missing prefix is regarded as a prefix of 128.\n"
-		       "Missing next-hop is regarded as \"::\".\n"
-		       "Missing metric means default (NM/kernel will set a default value).\n\n"
-		       "Examples: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef::3 2\n"
-		       "          abbe::/64 55\n"),
-		.property_type =                &_pt_objlist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (objlist,
-				.get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingIPConfig, nm_setting_ip_config_get_num_routes),
-				.clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingIPConfig, nm_setting_ip_config_clear_routes),
-				.obj_to_str_fcn =       _objlist_obj_to_str_fcn_ip_config_routes,
-				.set_fcn =              _objlist_set_fcn_ip_config_routes,
-				.remove_by_idx_fcn_s =  OBJLIST_REMOVE_BY_IDX_FCN_S (NMSettingIPConfig, nm_setting_ip_config_remove_route),
-				.delimit_pretty_with_semicolon = TRUE,
-				.strsplit_plain =       TRUE,
-			),
-		),
+	    .describe_message =
+	        N_("Enter a list of IPv6 routes formatted as:\n"
+	           "  ip[/prefix] [next-hop] [metric],...\n\n"
+	           "Missing prefix is regarded as a prefix of 128.\n"
+	           "Missing next-hop is regarded as \"::\".\n"
+	           "Missing metric means default (NM/kernel will set a default value).\n\n"
+	           "Examples: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef::3 2\n"
+	           "          abbe::/64 55\n"),
+	    .property_type =                &_pt_objlist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (objlist,
+	            .get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingIPConfig, nm_setting_ip_config_get_num_routes),
+	            .clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingIPConfig, nm_setting_ip_config_clear_routes),
+	            .obj_to_str_fcn =       _objlist_obj_to_str_fcn_ip_config_routes,
+	            .set_fcn =              _objlist_set_fcn_ip_config_routes,
+	            .remove_by_idx_fcn_s =  OBJLIST_REMOVE_BY_IDX_FCN_S (NMSettingIPConfig, nm_setting_ip_config_remove_route),
+	            .delimit_pretty_with_semicolon = TRUE,
+	            .strsplit_plain =       TRUE,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_ROUTE_METRIC, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ROUTE_METRIC,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_ROUTE_TABLE, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ROUTE_TABLE,
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =              INT_VALUE_INFOS (
-				{
-					.value.i64 = 0,
-					.nick = "unspec",
-				},
-				{
-					.value.i64 = 254,
-					.nick = "main",
-				},
-			),
-		),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+	        .value_infos =              INT_VALUE_INFOS (
+	            {
+	                .value.i64 = 0,
+	                .nick = "unspec",
+	            },
+	            {
+	                .value.i64 = 254,
+	                .nick = "main",
+	            },
+	        ),
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_ROUTING_RULES, NULL,
-		.describe_message =
-		    N_("Enter a list of IPv6 routing rules formatted as:\n"
-		       "  priority [prio] [from [src]] [to [dst]], ,...\n"
-		       "\n"),
-		.property_type =                &_pt_objlist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (objlist,
-				.get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingIPConfig, nm_setting_ip_config_get_num_routing_rules),
-				.clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingIPConfig, nm_setting_ip_config_clear_routing_rules),
-				.obj_to_str_fcn =       _objlist_obj_to_str_fcn_ip_config_routing_rules,
-				.set_fcn =              _objlist_set_fcn_ip_config_routing_rules,
-				.remove_by_idx_fcn_u =  OBJLIST_REMOVE_BY_IDX_FCN_U (NMSettingIPConfig, nm_setting_ip_config_remove_routing_rule),
-			),
-		),
+	    .describe_message =
+	        N_("Enter a list of IPv6 routing rules formatted as:\n"
+	           "  priority [prio] [from [src]] [to [dst]], ,...\n"
+	           "\n"),
+	    .property_type =                &_pt_objlist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (objlist,
+	            .get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingIPConfig, nm_setting_ip_config_get_num_routing_rules),
+	            .clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingIPConfig, nm_setting_ip_config_clear_routing_rules),
+	            .obj_to_str_fcn =       _objlist_obj_to_str_fcn_ip_config_routing_rules,
+	            .set_fcn =              _objlist_set_fcn_ip_config_routing_rules,
+	            .remove_by_idx_fcn_u =  OBJLIST_REMOVE_BY_IDX_FCN_U (NMSettingIPConfig, nm_setting_ip_config_remove_routing_rule),
+	        ),
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_NEVER_DEFAULT, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_NEVER_DEFAULT,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_MAY_FAIL, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_MAY_FAIL,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_IP6_CONFIG_IP6_PRIVACY,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-			.value_infos_get =          ENUM_VALUE_INFOS (
-				{
-					.value = NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR,
-					.nick = "enabled, prefer public IP",
-				},
-				{
-					.value = NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR,
-					.nick = "enabled, prefer temporary IP",
-				},
-			),
-		),
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	        .value_infos_get =          ENUM_VALUE_INFOS (
+	            {
+	                .value = NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR,
+	                .nick = "enabled, prefer public IP",
+	            },
+	            {
+	                .value = NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR,
+	                .nick = "enabled, prefer temporary IP",
+	            },
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.get_gtype =            nm_setting_ip6_config_addr_gen_mode_get_type,
-			),
-			.typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
-			                            | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
-		),
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .get_gtype =            nm_setting_ip6_config_addr_gen_mode_get_type,
+	        ),
+	        .typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
+	                                    | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_IP6_CONFIG_DHCP_DUID, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DUID,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
+	),
+	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_IAID, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_IAID,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_SEND_HOSTNAME,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
+	),
+	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME_FLAGS, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME_FLAGS,
+		.property_type =                &_pt_gobject_enum,
+		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+				.get_gtype =            nm_dhcp_hostname_flags_get_type,
+			),
+		)
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_IP6_CONFIG_TOKEN,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	NULL
 };
@@ -5883,71 +5922,71 @@ static const NMMetaPropertyInfo *const property_infos_IP6_CONFIG[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_IP_TUNNEL
 static const NMMetaPropertyInfo *const property_infos_IP_TUNNEL[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_IP_TUNNEL_MODE,
-		.is_cli_option =                TRUE,
-		.property_alias =               "mode",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       NM_META_TEXT_PROMPT_IP_TUNNEL_MODE,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.get_gtype =            nm_ip_tunnel_mode_get_type,
-				.min =                  NM_IP_TUNNEL_MODE_UNKNOWN + 1,
-				.max =                  G_MAXINT,
-			),
-			.typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
-			                            | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "mode",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	    .prompt =                       NM_META_TEXT_PROMPT_IP_TUNNEL_MODE,
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .get_gtype =            nm_ip_tunnel_mode_get_type,
+	            .min =                  NM_IP_TUNNEL_MODE_UNKNOWN + 1,
+	            .max =                  G_MAXINT,
+	        ),
+	        .typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
+	                                    | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_IP_TUNNEL_PARENT,
-		.is_cli_option =                TRUE,
-		.property_alias =               "dev",
-		.prompt =                       N_("Parent device [none]"),
-		.property_type =                &_pt_gobject_devices,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "dev",
+	    .prompt =                       N_("Parent device [none]"),
+	    .property_type =                &_pt_gobject_devices,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_IP_TUNNEL_LOCAL,
-		.is_cli_option =                TRUE,
-		.property_alias =               "local",
-		.prompt =                       N_("Local endpoint [none]"),
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "local",
+	    .prompt =                       N_("Local endpoint [none]"),
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_IP_TUNNEL_REMOTE,
-		.is_cli_option =                TRUE,
-		.property_alias =               "remote",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       N_("Remote"),
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "remote",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	    .prompt =                       N_("Remote"),
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_IP_TUNNEL_TTL,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_IP_TUNNEL_TOS,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_IP_TUNNEL_INPUT_KEY,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_IP_TUNNEL_OUTPUT_KEY,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_IP_TUNNEL_FLOW_LABEL,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_IP_TUNNEL_MTU,
-		.property_type =                &_pt_gobject_mtu,
+	    .property_type =                &_pt_gobject_mtu,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_IP_TUNNEL_FLAGS,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.get_gtype =            nm_ip_tunnel_flags_get_type,
-			),
-		),
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .get_gtype =            nm_ip_tunnel_flags_get_type,
+	        ),
+	    ),
 	),
 	NULL
 };
@@ -5956,67 +5995,67 @@ static const NMMetaPropertyInfo *const property_infos_IP_TUNNEL[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_MACSEC
 static const NMMetaPropertyInfo *const property_infos_MACSEC[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_MACSEC_PARENT,
-		.is_cli_option =                TRUE,
-		.property_alias =               "dev",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       N_("MACsec parent device or connection UUID"),
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "dev",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	    .prompt =                       N_("MACsec parent device or connection UUID"),
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_MACSEC_MODE,
-		.is_cli_option =                TRUE,
-		.property_alias =               "mode",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       NM_META_TEXT_PROMPT_MACSEC_MODE,
-		.def_hint =                     NM_META_TEXT_PROMPT_MACSEC_MODE_CHOICES,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.get_gtype =            nm_setting_macsec_mode_get_type,
-			),
-			.typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
-			                            | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "mode",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	    .prompt =                       NM_META_TEXT_PROMPT_MACSEC_MODE,
+	    .def_hint =                     NM_META_TEXT_PROMPT_MACSEC_MODE_CHOICES,
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .get_gtype =            nm_setting_macsec_mode_get_type,
+	        ),
+	        .typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
+	                                    | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_MACSEC_ENCRYPT,
-		.is_cli_option =                TRUE,
-		.property_alias =               "encrypt",
-		.prompt =                       N_("Enable encryption [yes]"),
-		.property_type =                &_pt_gobject_bool,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "encrypt",
+	    .prompt =                       N_("Enable encryption [yes]"),
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_MACSEC_MKA_CAK,
-		.is_cli_option =                TRUE,
-		.property_alias =               "cak",
-		.prompt =                       N_("MKA CAK"),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "cak",
+	    .prompt =                       N_("MKA CAK"),
+	    .is_secret =                    TRUE,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_MACSEC_MKA_CAK_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
+	    .property_type =                &_pt_gobject_secret_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_MACSEC_MKA_CKN,
-		.is_cli_option =                TRUE,
-		.property_alias =               "ckn",
-		.prompt =                       N_("MKA_CKN"),
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "ckn",
+	    .prompt =                       N_("MKA_CKN"),
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_MACSEC_PORT,
-		.is_cli_option =                TRUE,
-		.property_alias =               "port",
-		.prompt =                       N_("SCI port [1]"),
-		.property_type =                &_pt_gobject_int,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "port",
+	    .prompt =                       N_("SCI port [1]"),
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_MACSEC_VALIDATION,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.get_gtype =            nm_setting_macsec_validation_get_type,
-			),
-			.typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
-			                            | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
-		),
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .get_gtype =            nm_setting_macsec_validation_get_type,
+	        ),
+	        .typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
+	                                    | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_MACSEC_SEND_SCI,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	NULL
 };
@@ -6025,32 +6064,32 @@ static const NMMetaPropertyInfo *const property_infos_MACSEC[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_MACVLAN
 static const NMMetaPropertyInfo *const property_infos_MACVLAN[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_MACVLAN_PARENT,
-		.is_cli_option =                TRUE,
-		.property_alias =               "dev",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       N_("MACVLAN parent device or connection UUID"),
-		.property_type =                &_pt_gobject_devices,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "dev",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	    .prompt =                       N_("MACVLAN parent device or connection UUID"),
+	    .property_type =                &_pt_gobject_devices,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_MACVLAN_MODE,
-		.is_cli_option =                TRUE,
-		.property_alias =               "mode",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       NM_META_TEXT_PROMPT_MACVLAN_MODE,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-			.get_gtype =                nm_setting_macvlan_mode_get_type,
-			.min =                      NM_SETTING_MACVLAN_MODE_UNKNOWN + 1,
-			.max =                      G_MAXINT,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "mode",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	    .prompt =                       NM_META_TEXT_PROMPT_MACVLAN_MODE,
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	        .get_gtype =                nm_setting_macvlan_mode_get_type,
+	        .min =                      NM_SETTING_MACVLAN_MODE_UNKNOWN + 1,
+	        .max =                      G_MAXINT,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_MACVLAN_PROMISCUOUS,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_MACVLAN_TAP,
-		.is_cli_option =                TRUE,
-		.property_alias =               "tap",
-		.prompt =                       N_("Tap [no]"),
-		.property_type =                &_pt_gobject_bool,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "tap",
+	    .prompt =                       N_("Tap [no]"),
+	    .property_type =                &_pt_gobject_bool,
 	),
 	NULL
 };
@@ -6059,20 +6098,20 @@ static const NMMetaPropertyInfo *const property_infos_MACVLAN[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_MATCH
 static const NMMetaPropertyInfo *const property_infos_MATCH[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_MATCH_INTERFACE_NAME,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_match_interface_name,
-			.set_fcn =                  _set_fcn_multilist,
-			.set_supports_remove =      TRUE,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (multilist,
-				.get_num_fcn_u   =      MULTILIST_GET_NUM_FCN_U       (NMSettingMatch, nm_setting_match_get_num_interface_names),
-				.add2_fcn =             MULTILIST_ADD2_FCN            (NMSettingMatch, nm_setting_match_add_interface_name),
-				.remove_by_idx_fcn_s =  MULTILIST_REMOVE_BY_IDX_FCN_S (NMSettingMatch, nm_setting_match_remove_interface_name),
-				.remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingMatch, nm_setting_match_remove_interface_name_by_value),
-				.strsplit_with_spaces = TRUE,
-			),
-		),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_match_interface_name,
+	        .set_fcn =                  _set_fcn_multilist,
+	        .set_supports_remove =      TRUE,
+	    ),
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
+	            .get_num_fcn_u   =      MULTILIST_GET_NUM_FCN_U       (NMSettingMatch, nm_setting_match_get_num_interface_names),
+	            .add2_fcn =             MULTILIST_ADD2_FCN            (NMSettingMatch, nm_setting_match_add_interface_name),
+	            .remove_by_idx_fcn_s =  MULTILIST_REMOVE_BY_IDX_FCN_S (NMSettingMatch, nm_setting_match_remove_interface_name),
+	            .remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingMatch, nm_setting_match_remove_interface_name_by_value),
+	            .strsplit_with_spaces = TRUE,
+	        ),
+	    ),
 	),
 	NULL
 };
@@ -6081,29 +6120,29 @@ static const NMMetaPropertyInfo *const property_infos_MATCH[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_OLPC_MESH
 static const NMMetaPropertyInfo *const property_infos_OLPC_MESH[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OLPC_MESH_SSID,
-		.is_cli_option =                TRUE,
-		.property_alias =               "ssid",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       N_("SSID"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_olpc_mesh_ssid,
-			.set_fcn =                  _set_fcn_gobject_ssid,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "ssid",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	    .prompt =                       N_("SSID"),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_olpc_mesh_ssid,
+	        .set_fcn =                  _set_fcn_gobject_ssid,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OLPC_MESH_CHANNEL,
-		.is_cli_option =                TRUE,
-		.property_alias =               "channel",
-		.prompt =                       N_("OLPC Mesh channel [1]"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_olpc_mesh_channel,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "channel",
+	    .prompt =                       N_("OLPC Mesh channel [1]"),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_gobject,
+	        .set_fcn =                  _set_fcn_olpc_mesh_channel,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS,
-		.is_cli_option =                TRUE,
-		.property_alias =               "dhcp-anycast",
-		.prompt =                       N_("DHCP anycast MAC address [none]"),
-		.property_type =                &_pt_gobject_mac,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "dhcp-anycast",
+	    .prompt =                       N_("DHCP anycast MAC address [none]"),
+	    .property_type =                &_pt_gobject_mac,
 	),
 	NULL
 };
@@ -6112,25 +6151,25 @@ static const NMMetaPropertyInfo *const property_infos_OLPC_MESH[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_OVS_BRIDGE
 static const NMMetaPropertyInfo *const property_infos_OVS_BRIDGE[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_BRIDGE_FAIL_MODE,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV ("secure", "standalone"),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV ("secure", "standalone"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_BRIDGE_RSTP_ENABLE,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_BRIDGE_STP_ENABLE,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_BRIDGE_DATAPATH_TYPE,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV ("system", "netdev"),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV ("system", "netdev"),
+	    ),
 	),
 	NULL
 };
@@ -6139,7 +6178,7 @@ static const NMMetaPropertyInfo *const property_infos_OVS_BRIDGE[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_OVS_DPDK
 static const NMMetaPropertyInfo *const property_infos_OVS_DPDK[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_DPDK_DEVARGS,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	NULL
 };
@@ -6148,10 +6187,10 @@ static const NMMetaPropertyInfo *const property_infos_OVS_DPDK[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_OVS_INTERFACE
 static const NMMetaPropertyInfo *const property_infos_OVS_INTERFACE[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_INTERFACE_TYPE,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV ("internal", "system", "patch", "dpdk"),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV ("internal", "system", "patch", "dpdk"),
+	    ),
 	),
 	NULL
 };
@@ -6160,7 +6199,7 @@ static const NMMetaPropertyInfo *const property_infos_OVS_INTERFACE[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_OVS_PATCH
 static const NMMetaPropertyInfo *const property_infos_OVS_PATCH[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_PATCH_PEER,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	NULL
 };
@@ -6169,31 +6208,31 @@ static const NMMetaPropertyInfo *const property_infos_OVS_PATCH[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_OVS_PORT
 static const NMMetaPropertyInfo *const property_infos_OVS_PORT[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_PORT_VLAN_MODE,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV ("access", "native-tagged", "native-untagged", "trunk"),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV ("access", "native-tagged", "native-untagged", "trunk"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_PORT_TAG,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_PORT_LACP,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV ("active", "off", "passive"),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV ("active", "off", "passive"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_PORT_BOND_MODE,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV ("active-backup", "balance-slb", "balance-tcp"),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV ("active-backup", "balance-slb", "balance-tcp"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_PORT_BOND_UPDELAY,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_PORT_BOND_DOWNDELAY,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	NULL
 };
@@ -6202,61 +6241,61 @@ static const NMMetaPropertyInfo *const property_infos_OVS_PORT[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_PPP
 static const NMMetaPropertyInfo *const property_infos_PPP[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPP_NOAUTH,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPP_REFUSE_EAP,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPP_REFUSE_PAP,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPP_REFUSE_CHAP,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPP_REFUSE_MSCHAP,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPP_REFUSE_MSCHAPV2,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPP_NOBSDCOMP,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPP_NODEFLATE,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPP_NO_VJ_COMP,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPP_REQUIRE_MPPE,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPP_REQUIRE_MPPE_128,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPP_MPPE_STATEFUL,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPP_CRTSCTS,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPP_BAUD,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPP_MRU,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPP_MTU,
-		.property_type =                &_pt_gobject_mtu,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
-			.get_fcn =                  MTU_GET_FCN (NMSettingPpp, nm_setting_ppp_get_mtu),
-		),
+	    .property_type =                &_pt_gobject_mtu,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
+	        .get_fcn =                  MTU_GET_FCN (NMSettingPpp, nm_setting_ppp_get_mtu),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPP_LCP_ECHO_FAILURE,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPP_LCP_ECHO_INTERVAL,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	NULL
 };
@@ -6265,33 +6304,33 @@ static const NMMetaPropertyInfo *const property_infos_PPP[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_PPPOE
 static const NMMetaPropertyInfo *const property_infos_PPPOE[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PARENT,
-		.is_cli_option =                TRUE,
-		.property_alias =               "parent",
-		.prompt =                       N_("PPPoE parent device"),
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "parent",
+	    .prompt =                       N_("PPPoE parent device"),
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_SERVICE,
-		.is_cli_option =                TRUE,
-		.property_alias =               "service",
-		.prompt =                       N_("Service [none]"),
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "service",
+	    .prompt =                       N_("Service [none]"),
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_USERNAME,
-		.is_cli_option =                TRUE,
-		.property_alias =               "username",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       N_("PPPoE username"),
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "username",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	    .prompt =                       N_("PPPoE username"),
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PASSWORD,
-		.is_cli_option =                TRUE,
-		.property_alias =               "password",
-		.prompt =                       N_("Password [none]"),
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "password",
+	    .prompt =                       N_("Password [none]"),
+	    .is_secret =                    TRUE,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PPPOE_PASSWORD_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
+	    .property_type =                &_pt_gobject_secret_flags,
 	),
 	NULL
 };
@@ -6300,39 +6339,39 @@ static const NMMetaPropertyInfo *const property_infos_PPPOE[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_PROXY
 static const NMMetaPropertyInfo *const property_infos_PROXY[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PROXY_METHOD,
-		.is_cli_option =                TRUE,
-		.property_alias =               "method",
-		.prompt =                       NM_META_TEXT_PROMPT_PROXY_METHOD,
-		.def_hint =                     NM_META_TEXT_PROMPT_PROXY_METHOD_CHOICES,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.get_gtype =            nm_setting_proxy_method_get_type,
-			),
-			.typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
-			                            | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "method",
+	    .prompt =                       NM_META_TEXT_PROMPT_PROXY_METHOD,
+	    .def_hint =                     NM_META_TEXT_PROMPT_PROXY_METHOD_CHOICES,
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .get_gtype =            nm_setting_proxy_method_get_type,
+	        ),
+	        .typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
+	                                    | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PROXY_BROWSER_ONLY,
-		.is_cli_option =                TRUE,
-		.property_alias =               "browser-only",
-		.prompt =                       N_("Browser only [no]"),
-		.property_type =                &_pt_gobject_bool
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "browser-only",
+	    .prompt =                       N_("Browser only [no]"),
+	    .property_type =                &_pt_gobject_bool
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PROXY_PAC_URL,
-		.is_cli_option =                TRUE,
-		.property_alias =               "pac-url",
-		.prompt =                       N_("PAC URL"),
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "pac-url",
+	    .prompt =                       N_("PAC URL"),
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_PROXY_PAC_SCRIPT,
-		.is_cli_option =                TRUE,
-		.property_alias =               "pac-script",
-		.prompt =                       N_("PAC script"),
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_string,
-			.validate_fcn =             _validate_fcn_proxy_pac_script,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "pac-script",
+	    .prompt =                       N_("PAC script"),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_string,
+	        .validate_fcn =             _validate_fcn_proxy_pac_script,
+	    ),
 	),
 	NULL
 };
@@ -6341,51 +6380,51 @@ static const NMMetaPropertyInfo *const property_infos_PROXY[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_SERIAL
 static const NMMetaPropertyInfo *const property_infos_SERIAL[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_BAUD,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_BITS,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_PARITY,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.value_infos =          ENUM_VALUE_INFOS (
-					{
-						.value = NM_SETTING_SERIAL_PARITY_EVEN,
-						.nick = "E",
-					},
-					{
-						.value = NM_SETTING_SERIAL_PARITY_EVEN,
-						.nick = "e",
-					},
-					{
-						.value = NM_SETTING_SERIAL_PARITY_ODD,
-						.nick = "O",
-					},
-					{
-						.value = NM_SETTING_SERIAL_PARITY_ODD,
-						.nick = "o",
-					},
-					{
-						.value = NM_SETTING_SERIAL_PARITY_NONE,
-						.nick = "N",
-					},
-					{
-						.value = NM_SETTING_SERIAL_PARITY_NONE,
-						.nick = "n",
-					},
-				),
-			),
-			.typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
-			                            | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
-		),
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .value_infos =          ENUM_VALUE_INFOS (
+	                {
+	                    .value = NM_SETTING_SERIAL_PARITY_EVEN,
+	                    .nick = "E",
+	                },
+	                {
+	                    .value = NM_SETTING_SERIAL_PARITY_EVEN,
+	                    .nick = "e",
+	                },
+	                {
+	                    .value = NM_SETTING_SERIAL_PARITY_ODD,
+	                    .nick = "O",
+	                },
+	                {
+	                    .value = NM_SETTING_SERIAL_PARITY_ODD,
+	                    .nick = "o",
+	                },
+	                {
+	                    .value = NM_SETTING_SERIAL_PARITY_NONE,
+	                    .nick = "N",
+	                },
+	                {
+	                    .value = NM_SETTING_SERIAL_PARITY_NONE,
+	                    .nick = "n",
+	                },
+	            ),
+	        ),
+	        .typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
+	                                    | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_STOPBITS,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_SERIAL_SEND_DELAY,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	NULL
 };
@@ -6394,22 +6433,22 @@ static const NMMetaPropertyInfo *const property_infos_SERIAL[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_SRIOV
 static const NMMetaPropertyInfo *const property_infos_SRIOV[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_TOTAL_VFS,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_VFS,
-		.property_type =                &_pt_objlist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (objlist,
-				.get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingSriov, nm_setting_sriov_get_num_vfs),
-				.clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingSriov, nm_setting_sriov_clear_vfs),
-				.obj_to_str_fcn =       _objlist_obj_to_str_fcn_sriov_vfs,
-				.set_fcn =              _objlist_set_fcn_sriov_vfs,
-				.strsplit_plain =       TRUE,
-			),
-		),
+	    .property_type =                &_pt_objlist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (objlist,
+	            .get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingSriov, nm_setting_sriov_get_num_vfs),
+	            .clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingSriov, nm_setting_sriov_clear_vfs),
+	            .obj_to_str_fcn =       _objlist_obj_to_str_fcn_sriov_vfs,
+	            .set_fcn =              _objlist_set_fcn_sriov_vfs,
+	            .strsplit_plain =       TRUE,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_SRIOV_AUTOPROBE_DRIVERS,
-		.property_type =                &_pt_gobject_enum,
+	    .property_type =                &_pt_gobject_enum,
 	),
 	NULL
 };
@@ -6418,30 +6457,30 @@ static const NMMetaPropertyInfo *const property_infos_SRIOV[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_TC_CONFIG
 static const NMMetaPropertyInfo *const property_infos_TC_CONFIG[] = {
 	PROPERTY_INFO (NM_SETTING_TC_CONFIG_QDISCS, DESCRIBE_DOC_NM_SETTING_TC_CONFIG_QDISCS,
-		.property_type =                &_pt_objlist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (objlist,
-				.get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingTCConfig, nm_setting_tc_config_get_num_qdiscs),
-				.clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingTCConfig, nm_setting_tc_config_clear_qdiscs),
-				.obj_to_str_fcn =       _objlist_obj_to_str_fcn_tc_config_qdiscs,
-				.set_fcn =              _objlist_set_fcn_tc_config_qdiscs,
-				.remove_by_idx_fcn_u =  OBJLIST_REMOVE_BY_IDX_FCN_U (NMSettingTCConfig, nm_setting_tc_config_remove_qdisc),
-				.strsplit_plain =       TRUE,
-			),
-		),
+	    .property_type =                &_pt_objlist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (objlist,
+	            .get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingTCConfig, nm_setting_tc_config_get_num_qdiscs),
+	            .clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingTCConfig, nm_setting_tc_config_clear_qdiscs),
+	            .obj_to_str_fcn =       _objlist_obj_to_str_fcn_tc_config_qdiscs,
+	            .set_fcn =              _objlist_set_fcn_tc_config_qdiscs,
+	            .remove_by_idx_fcn_u =  OBJLIST_REMOVE_BY_IDX_FCN_U (NMSettingTCConfig, nm_setting_tc_config_remove_qdisc),
+	            .strsplit_plain =       TRUE,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO (NM_SETTING_TC_CONFIG_TFILTERS, DESCRIBE_DOC_NM_SETTING_TC_CONFIG_TFILTERS,
-		.property_type =                &_pt_objlist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (objlist,
-				.get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingTCConfig, nm_setting_tc_config_get_num_tfilters),
-				.clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingTCConfig, nm_setting_tc_config_clear_tfilters),
-				.obj_to_str_fcn =       _objlist_obj_to_str_fcn_tc_config_tfilters,
-				.set_fcn =              _objlist_set_fcn_tc_config_tfilters,
-				.remove_by_idx_fcn_u =  OBJLIST_REMOVE_BY_IDX_FCN_U (NMSettingTCConfig, nm_setting_tc_config_remove_tfilter),
-				.strsplit_plain =       TRUE,
-			),
-		),
+	    .property_type =                &_pt_objlist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (objlist,
+	            .get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingTCConfig, nm_setting_tc_config_get_num_tfilters),
+	            .clear_all_fcn =        OBJLIST_CLEAR_ALL_FCN       (NMSettingTCConfig, nm_setting_tc_config_clear_tfilters),
+	            .obj_to_str_fcn =       _objlist_obj_to_str_fcn_tc_config_tfilters,
+	            .set_fcn =              _objlist_set_fcn_tc_config_tfilters,
+	            .remove_by_idx_fcn_u =  OBJLIST_REMOVE_BY_IDX_FCN_U (NMSettingTCConfig, nm_setting_tc_config_remove_tfilter),
+	            .strsplit_plain =       TRUE,
+	        ),
+	    ),
 	),
 	NULL
 };
@@ -6450,186 +6489,186 @@ static const NMMetaPropertyInfo *const property_infos_TC_CONFIG[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_TEAM
 static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_CONFIG,
-		.is_cli_option =                TRUE,
-		.property_alias =               "config",
-		.prompt =                       N_("Team JSON configuration [none]"),
-		.describe_message =             TEAM_DESCRIBE_MESSAGE,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_string,
-			.validate_fcn =             _validate_fcn_team_config,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "config",
+	    .prompt =                       N_("Team JSON configuration [none]"),
+	    .describe_message =             TEAM_DESCRIBE_MESSAGE,
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_string,
+	        .validate_fcn =             _validate_fcn_team_config,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_NOTIFY_PEERS_COUNT,
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =              INT_VALUE_INFOS (
-				{
-					.value.i64 = -1,
-					.nick = "unset",
-				},
-				{
-					.value.i64 = 0,
-					.nick = "disabled",
-				},
-			),
-		),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+	        .value_infos =              INT_VALUE_INFOS (
+	            {
+	                .value.i64 = -1,
+	                .nick = "unset",
+	            },
+	            {
+	                .value.i64 = 0,
+	                .nick = "disabled",
+	            },
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_NOTIFY_PEERS_INTERVAL,
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =              INT_VALUE_INFOS (
-				{
-					.value.i64 = -1,
-					.nick = "unset",
-				},
-				{
-					.value.i64 = 0,
-					.nick = "default",
-				},
-			),
-		),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+	        .value_infos =              INT_VALUE_INFOS (
+	            {
+	                .value.i64 = -1,
+	                .nick = "unset",
+	            },
+	            {
+	                .value.i64 = 0,
+	                .nick = "default",
+	            },
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_MCAST_REJOIN_COUNT,
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =              INT_VALUE_INFOS (
-				{
-					.value.i64 = -1,
-					.nick = "unset",
-				},
-				{
-					.value.i64 = 0,
-					.nick = "disabled",
-				},
-			),
-		),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+	        .value_infos =              INT_VALUE_INFOS (
+	            {
+	                .value.i64 = -1,
+	                .nick = "unset",
+	            },
+	            {
+	                .value.i64 = 0,
+	                .nick = "disabled",
+	            },
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_MCAST_REJOIN_INTERVAL,
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =              INT_VALUE_INFOS (
-				{
-					.value.i64 = -1,
-					.nick = "unset",
-				},
-				{
-					.value.i64 = 0,
-					.nick = "default",
-				},
-			),
-		),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+	        .value_infos =              INT_VALUE_INFOS (
+	            {
+	                .value.i64 = -1,
+	                .nick = "unset",
+	            },
+	            {
+	                .value.i64 = 0,
+	                .nick = "default",
+	            },
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV (NM_SETTING_TEAM_RUNNER_BROADCAST,
-			                                          NM_SETTING_TEAM_RUNNER_ROUNDROBIN,
-			                                          NM_SETTING_TEAM_RUNNER_RANDOM,
-			                                          NM_SETTING_TEAM_RUNNER_ACTIVEBACKUP,
-			                                          NM_SETTING_TEAM_RUNNER_LOADBALANCE,
-			                                          NM_SETTING_TEAM_RUNNER_LACP),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV (NM_SETTING_TEAM_RUNNER_BROADCAST,
+	                                                  NM_SETTING_TEAM_RUNNER_ROUNDROBIN,
+	                                                  NM_SETTING_TEAM_RUNNER_RANDOM,
+	                                                  NM_SETTING_TEAM_RUNNER_ACTIVEBACKUP,
+	                                                  NM_SETTING_TEAM_RUNNER_LOADBALANCE,
+	                                                  NM_SETTING_TEAM_RUNNER_LACP),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_HWADDR_POLICY,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV (NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_SAME_ALL,
-			                                          NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_BY_ACTIVE,
-			                                          NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_ONLY_ACTIVE),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV (NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_SAME_ALL,
+	                                                  NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_BY_ACTIVE,
+	                                                  NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_ONLY_ACTIVE),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_TX_HASH,
-		.property_type =                &_pt_multilist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (multilist,
-				.get_num_fcn_u =        MULTILIST_GET_NUM_FCN_U       (NMSettingTeam, nm_setting_team_get_num_runner_tx_hash),
-				.add_fcn =              MULTILIST_ADD_FCN             (NMSettingTeam, nm_setting_team_add_runner_tx_hash),
-				.remove_by_idx_fcn_u =  MULTILIST_REMOVE_BY_IDX_FCN_U (NMSettingTeam, nm_setting_team_remove_runner_tx_hash),
-				.remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingTeam, nm_setting_team_remove_runner_tx_hash_by_value),
-				.strsplit_plain =       TRUE,
-			),
-			.values_static =            NM_MAKE_STRV ("eth", "vlan", "ipv4", "ipv6", "ip",
-			                                          "l3", "tcp", "udp", "sctp", "l4"),
-		),
+	    .property_type =                &_pt_multilist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
+	            .get_num_fcn_u =        MULTILIST_GET_NUM_FCN_U       (NMSettingTeam, nm_setting_team_get_num_runner_tx_hash),
+	            .add_fcn =              MULTILIST_ADD_FCN             (NMSettingTeam, nm_setting_team_add_runner_tx_hash),
+	            .remove_by_idx_fcn_u =  MULTILIST_REMOVE_BY_IDX_FCN_U (NMSettingTeam, nm_setting_team_remove_runner_tx_hash),
+	            .remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingTeam, nm_setting_team_remove_runner_tx_hash_by_value),
+	            .strsplit_plain =       TRUE,
+	        ),
+	        .values_static =            NM_MAKE_STRV ("eth", "vlan", "ipv4", "ipv6", "ip",
+	                                                  "l3", "tcp", "udp", "sctp", "l4"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_TX_BALANCER,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV ("basic"),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV ("basic"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL,
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =              INT_VALUE_INFOS (
-				{
-					.value.i64 = -1,
-					.nick = "unset",
-				},
-				{
-					.value.i64 = NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL_DEFAULT,
-					.nick = "default",
-				},
-			),
-		),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+	        .value_infos =              INT_VALUE_INFOS (
+	            {
+	                .value.i64 = -1,
+	                .nick = "unset",
+	            },
+	            {
+	                .value.i64 = NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL_DEFAULT,
+	                .nick = "default",
+	            },
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_ACTIVE,
-		.property_type =                & _pt_gobject_bool,
+	    .property_type =                & _pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_FAST_RATE,
-		.property_type =                & _pt_gobject_bool,
+	    .property_type =                & _pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_SYS_PRIO,
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =              INT_VALUE_INFOS (
-				{
-					.value.i64 = -1,
-					.nick = "unset",
-				},
-				{
-					.value.i64 = NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT,
-					.nick = "default",
-				},
-			),
-		),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+	        .value_infos =              INT_VALUE_INFOS (
+	            {
+	                .value.i64 = -1,
+	                .nick = "unset",
+	            },
+	            {
+	                .value.i64 = NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT,
+	                .nick = "default",
+	            },
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_MIN_PORTS,
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =              INT_VALUE_INFOS (
-				{
-					.value.i64 = -1,
-					.nick = "unset",
-				},
-				{
-					.value.i64 = 1,
-					.nick = "default",
-				},
-			),
-		),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+	        .value_infos =              INT_VALUE_INFOS (
+	            {
+	                .value.i64 = -1,
+	                .nick = "unset",
+	            },
+	            {
+	                .value.i64 = 1,
+	                .nick = "default",
+	            },
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV (NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_LACP_PRIO,
-			                                          NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_LACP_PRIO_STABLE,
-			                                          NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_BANDWIDTH,
-			                                          NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_COUNT,
-			                                          NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_PORT_CONFIG),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV (NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_LACP_PRIO,
+	                                                  NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_LACP_PRIO_STABLE,
+	                                                  NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_BANDWIDTH,
+	                                                  NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_COUNT,
+	                                                  NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_PORT_CONFIG),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_LINK_WATCHERS,
-		.describe_message =             TEAM_LINK_WATCHERS_DESCRIBE_MESSAGE,
-		.property_type =                &_pt_objlist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (objlist,
-				.get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingTeam, nm_setting_team_get_num_link_watchers),
-				.obj_to_str_fcn =       _objlist_obj_to_str_fcn_team_link_watchers,
-				.set_fcn =              _objlist_set_fcn_team_link_watchers,
-				.remove_by_idx_fcn_u =  OBJLIST_REMOVE_BY_IDX_FCN_U (NMSettingTeam, nm_setting_team_remove_link_watcher),
-			),
-		),
+	    .describe_message =             TEAM_LINK_WATCHERS_DESCRIBE_MESSAGE,
+	    .property_type =                &_pt_objlist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (objlist,
+	            .get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingTeam, nm_setting_team_get_num_link_watchers),
+	            .obj_to_str_fcn =       _objlist_obj_to_str_fcn_team_link_watchers,
+	            .set_fcn =              _objlist_set_fcn_team_link_watchers,
+	            .remove_by_idx_fcn_u =  OBJLIST_REMOVE_BY_IDX_FCN_U (NMSettingTeam, nm_setting_team_remove_link_watcher),
+	        ),
+	    ),
 	),
 	NULL
 };
@@ -6638,89 +6677,89 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_TEAM_PORT
 static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_CONFIG,
-		.is_cli_option =                TRUE,
-		.property_alias =               "config",
-		.prompt =                       N_("Team JSON configuration [none]"),
-		.describe_message =             TEAM_DESCRIBE_MESSAGE,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_string,
-			.validate_fcn =             _validate_fcn_team_config,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "config",
+	    .prompt =                       N_("Team JSON configuration [none]"),
+	    .describe_message =             TEAM_DESCRIBE_MESSAGE,
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_string,
+	        .validate_fcn =             _validate_fcn_team_config,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_QUEUE_ID,
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =              INT_VALUE_INFOS (
-				{
-					.value.i64 = -1,
-					.nick = "unset",
-				},
-				{
-					.value.i64 = 0,
-					.nick = "default",
-				},
-			),
-		),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+	        .value_infos =              INT_VALUE_INFOS (
+	            {
+	                .value.i64 = -1,
+	                .nick = "unset",
+	            },
+	            {
+	                .value.i64 = 0,
+	                .nick = "default",
+	            },
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_PRIO,
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =              INT_VALUE_INFOS (
-				{
-					.value.i64 = 0,
-					.nick = "unset",
-				},
-				{
-					.value.i64 = 0,
-					.nick = "default",
-				},
-			),
-		),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+	        .value_infos =              INT_VALUE_INFOS (
+	            {
+	                .value.i64 = 0,
+	                .nick = "unset",
+	            },
+	            {
+	                .value.i64 = 0,
+	                .nick = "default",
+	            },
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_STICKY,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_LACP_PRIO,
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =              INT_VALUE_INFOS (
-				{
-					.value.i64 = -1,
-					.nick = "unset",
-				},
-				{
-					.value.i64 = NM_SETTING_TEAM_PORT_LACP_PRIO_DEFAULT,
-					.nick = "default",
-				},
-			),
-		),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+	        .value_infos =              INT_VALUE_INFOS (
+	            {
+	                .value.i64 = -1,
+	                .nick = "unset",
+	            },
+	            {
+	                .value.i64 = NM_SETTING_TEAM_PORT_LACP_PRIO_DEFAULT,
+	                .nick = "default",
+	            },
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_LACP_KEY,
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
-			.value_infos =              INT_VALUE_INFOS (
-				{
-					.value.i64 = -1,
-					.nick = "unset",
-				},
-				{
-					.value.i64 = 0,
-					.nick = "default",
-				},
-			),
-		),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
+	        .value_infos =              INT_VALUE_INFOS (
+	            {
+	                .value.i64 = -1,
+	                .nick = "unset",
+	            },
+	            {
+	                .value.i64 = 0,
+	                .nick = "default",
+	            },
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TEAM_PORT_LINK_WATCHERS,
-		.describe_message =             TEAM_LINK_WATCHERS_DESCRIBE_MESSAGE,
-		.property_type =                &_pt_objlist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (objlist,
-				.get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingTeamPort, nm_setting_team_port_get_num_link_watchers),
-				.obj_to_str_fcn =       _objlist_obj_to_str_fcn_team_link_watchers,
-				.set_fcn =              _objlist_set_fcn_team_link_watchers,
-				.remove_by_idx_fcn_u =  OBJLIST_REMOVE_BY_IDX_FCN_U (NMSettingTeamPort, nm_setting_team_port_remove_link_watcher),
-			),
-		),
+	    .describe_message =             TEAM_LINK_WATCHERS_DESCRIBE_MESSAGE,
+	    .property_type =                &_pt_objlist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (objlist,
+	            .get_num_fcn =          OBJLIST_GET_NUM_FCN         (NMSettingTeamPort, nm_setting_team_port_get_num_link_watchers),
+	            .obj_to_str_fcn =       _objlist_obj_to_str_fcn_team_link_watchers,
+	            .set_fcn =              _objlist_set_fcn_team_link_watchers,
+	            .remove_by_idx_fcn_u =  OBJLIST_REMOVE_BY_IDX_FCN_U (NMSettingTeamPort, nm_setting_team_port_remove_link_watcher),
+	        ),
+	    ),
 	),
 	NULL
 };
@@ -6729,46 +6768,46 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_TUN
 static const NMMetaPropertyInfo *const property_infos_TUN[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TUN_MODE,
-		.is_cli_option =                TRUE,
-		.property_alias =               "mode",
-		.prompt =                       NM_META_TEXT_PROMPT_TUN_MODE,
-		.def_hint =                     NM_META_TEXT_PROMPT_TUN_MODE_CHOICES,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-			.get_gtype =                nm_setting_tun_mode_get_type,
-			.min =                      NM_SETTING_TUN_MODE_UNKNOWN + 1,
-			.max =                      G_MAXINT,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "mode",
+	    .prompt =                       NM_META_TEXT_PROMPT_TUN_MODE,
+	    .def_hint =                     NM_META_TEXT_PROMPT_TUN_MODE_CHOICES,
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	        .get_gtype =                nm_setting_tun_mode_get_type,
+	        .min =                      NM_SETTING_TUN_MODE_UNKNOWN + 1,
+	        .max =                      G_MAXINT,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TUN_OWNER,
-		.is_cli_option =                TRUE,
-		.property_alias =               "owner",
-		.prompt =                       N_("User ID [none]"),
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "owner",
+	    .prompt =                       N_("User ID [none]"),
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TUN_GROUP,
-		.is_cli_option =                TRUE,
-		.property_alias =               "group",
-		.prompt =                       N_("Group ID [none]"),
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "group",
+	    .prompt =                       N_("Group ID [none]"),
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TUN_PI,
-		.is_cli_option =                TRUE,
-		.property_alias =               "pi",
-		.prompt =                       N_("Enable PI [no]"),
-		.property_type =                &_pt_gobject_bool,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "pi",
+	    .prompt =                       N_("Enable PI [no]"),
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TUN_VNET_HDR,
-		.is_cli_option =                TRUE,
-		.property_alias =               "vnet-hdr",
-		.prompt =                       N_("Enable VNET header [no]"),
-		.property_type =                &_pt_gobject_bool,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "vnet-hdr",
+	    .prompt =                       N_("Enable VNET header [no]"),
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_TUN_MULTI_QUEUE,
-		.is_cli_option =                TRUE,
-		.property_alias =               "multi-queue",
-		.prompt =                       N_("Enable multi queue [no]"),
-		.property_type =                &_pt_gobject_bool,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "multi-queue",
+	    .prompt =                       N_("Enable multi queue [no]"),
+	    .property_type =                &_pt_gobject_bool,
 	),
 	NULL
 };
@@ -6777,47 +6816,47 @@ static const NMMetaPropertyInfo *const property_infos_TUN[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_VLAN
 static const NMMetaPropertyInfo *const property_infos_VLAN[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VLAN_PARENT,
-		.is_cli_option =                TRUE,
-		.property_alias =               "dev",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       N_("VLAN parent device or connection UUID"),
-		.property_type =                &_pt_gobject_devices,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "dev",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	    .prompt =                       N_("VLAN parent device or connection UUID"),
+	    .property_type =                &_pt_gobject_devices,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VLAN_ID,
-		.is_cli_option =                TRUE,
-		.property_alias =               "id",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       N_("VLAN ID (<0-4094>)"),
-		.property_type =                &_pt_gobject_int,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "id",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	    .prompt =                       N_("VLAN ID (<0-4094>)"),
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VLAN_FLAGS,
-		.is_cli_option =                TRUE,
-		.property_alias =               "flags",
-		.prompt =                       N_("VLAN flags (<0-7>) [none]"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_vlan_flags,
-			.set_fcn =                  _set_fcn_gobject_flags,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "flags",
+	    .prompt =                       N_("VLAN flags (<0-7>) [none]"),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_vlan_flags,
+	        .set_fcn =                  _set_fcn_gobject_flags,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VLAN_INGRESS_PRIORITY_MAP,
-		.is_cli_option =                TRUE,
-		.property_alias =               "ingress",
-		.prompt =                       N_("Ingress priority maps [none]"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_vlan_xgress_priority_map,
-			.set_fcn =                  _set_fcn_vlan_xgress_priority_map,
-			.set_supports_remove =      TRUE,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "ingress",
+	    .prompt =                       N_("Ingress priority maps [none]"),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_vlan_xgress_priority_map,
+	        .set_fcn =                  _set_fcn_vlan_xgress_priority_map,
+	        .set_supports_remove =      TRUE,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VLAN_EGRESS_PRIORITY_MAP,
-		.is_cli_option =                TRUE,
-		.property_alias =               "egress",
-		.prompt =                       N_("Egress priority maps [none]"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_vlan_xgress_priority_map,
-			.set_fcn =                  _set_fcn_vlan_xgress_priority_map,
-			.set_supports_remove =      TRUE,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "egress",
+	    .prompt =                       N_("Egress priority maps [none]"),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_vlan_xgress_priority_map,
+	        .set_fcn =                  _set_fcn_vlan_xgress_priority_map,
+	        .set_supports_remove =      TRUE,
+	    ),
 	),
 	NULL
 };
@@ -6827,50 +6866,50 @@ static const NMMetaPropertyInfo *const property_infos_VLAN[] = {
 static const NMMetaPropertyInfo *const property_infos_VPN[] = {
 [_NM_META_PROPERTY_TYPE_VPN_SERVICE_TYPE] =
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VPN_SERVICE_TYPE,
-		.is_cli_option =                TRUE,
-		.property_alias =               "vpn-type",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       NM_META_TEXT_PROMPT_VPN_TYPE,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_vpn_service_type,
-			.complete_fcn =             _complete_fcn_vpn_service_type,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "vpn-type",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	    .prompt =                       NM_META_TEXT_PROMPT_VPN_TYPE,
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_gobject,
+	        .set_fcn =                  _set_fcn_vpn_service_type,
+	        .complete_fcn =             _complete_fcn_vpn_service_type,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VPN_USER_NAME,
-		.is_cli_option =                TRUE,
-		.property_alias =               "user",
-		.prompt =                       N_("Username [none]"),
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "user",
+	    .prompt =                       N_("Username [none]"),
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VPN_DATA,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_vpn_data,
-			.set_fcn =                  _set_fcn_optionlist,
-			.set_supports_remove =      TRUE,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (optionlist,
-			.set_fcn =                  _optionlist_set_fcn_vpn_data,
-			.no_empty_value =           TRUE,
-		),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_vpn_data,
+	        .set_fcn =                  _set_fcn_optionlist,
+	        .set_supports_remove =      TRUE,
+	    ),
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (optionlist,
+	        .set_fcn =                  _optionlist_set_fcn_vpn_data,
+	        .no_empty_value =           TRUE,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VPN_SECRETS,
-		.is_secret =                    TRUE,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_vpn_secrets,
-			.set_fcn =                  _set_fcn_optionlist,
-			.set_supports_remove =      TRUE,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (optionlist,
-			.set_fcn =                  _optionlist_set_fcn_vpn_secrets,
-			.no_empty_value =           TRUE,
-		),
+	    .is_secret =                    TRUE,
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_vpn_secrets,
+	        .set_fcn =                  _set_fcn_optionlist,
+	        .set_supports_remove =      TRUE,
+	    ),
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (optionlist,
+	        .set_fcn =                  _optionlist_set_fcn_vpn_secrets,
+	        .no_empty_value =           TRUE,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VPN_PERSISTENT,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VPN_TIMEOUT,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	NULL
 };
@@ -6879,75 +6918,75 @@ static const NMMetaPropertyInfo *const property_infos_VPN[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_VXLAN
 static const NMMetaPropertyInfo *const property_infos_VXLAN[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VXLAN_PARENT,
-		.is_cli_option =                TRUE,
-		.property_alias =               "dev",
-		.prompt =                       N_("Parent device [none]"),
-		.property_type =                &_pt_gobject_devices,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "dev",
+	    .prompt =                       N_("Parent device [none]"),
+	    .property_type =                &_pt_gobject_devices,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VXLAN_ID,
-		.is_cli_option =                TRUE,
-		.property_alias =               "id",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       N_("VXLAN ID"),
-		.property_type =                &_pt_gobject_int,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "id",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	    .prompt =                       N_("VXLAN ID"),
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VXLAN_LOCAL,
-		.is_cli_option =                TRUE,
-		.property_alias =               "local",
-		.prompt =                       N_("Local address [none]"),
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "local",
+	    .prompt =                       N_("Local address [none]"),
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VXLAN_REMOTE,
-		.is_cli_option =                TRUE,
-		.property_alias =               "remote",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       N_("Remote"),
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "remote",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	    .prompt =                       N_("Remote"),
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VXLAN_SOURCE_PORT_MIN,
-		.is_cli_option =                TRUE,
-		.property_alias =               "source-port-min",
-		.prompt =                       N_("Minimum source port [0]"),
-		.property_type =                &_pt_gobject_int,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "source-port-min",
+	    .prompt =                       N_("Minimum source port [0]"),
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VXLAN_SOURCE_PORT_MAX,
-		.is_cli_option =                TRUE,
-		.property_alias =               "source-port-max",
-		.prompt =                       N_("Maximum source port [0]"),
-		.property_type =                &_pt_gobject_int,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "source-port-max",
+	    .prompt =                       N_("Maximum source port [0]"),
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VXLAN_DESTINATION_PORT,
-		.is_cli_option =                TRUE,
-		.property_alias =               "destination-port",
-		.prompt =                       N_("Destination port [8472]"),
-		.property_type =                &_pt_gobject_int,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "destination-port",
+	    .prompt =                       N_("Destination port [8472]"),
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VXLAN_TOS,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VXLAN_TTL,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VXLAN_AGEING,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VXLAN_LIMIT,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VXLAN_LEARNING,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VXLAN_PROXY,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VXLAN_RSC,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VXLAN_L2_MISS,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_VXLAN_L3_MISS,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	NULL
 };
@@ -6956,22 +6995,22 @@ static const NMMetaPropertyInfo *const property_infos_VXLAN[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_WIFI_P2P
 static const NMMetaPropertyInfo *const property_infos_WIFI_P2P[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIFI_P2P_PEER,
-		.is_cli_option =                TRUE,
-		.property_alias =               "peer",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       N_("Peer"),
-		.property_type =                &_pt_gobject_mac,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "peer",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	    .prompt =                       N_("Peer"),
+	    .property_type =                &_pt_gobject_mac,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIFI_P2P_WPS_METHOD,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.get_gtype =            nm_setting_wireless_security_wps_method_get_type,
-			),
-		),
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .get_gtype =            nm_setting_wireless_security_wps_method_get_type,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIFI_P2P_WFD_IES,
-		.property_type =                &_pt_gobject_bytes,
+	    .property_type =                &_pt_gobject_bytes,
 	),
 	NULL
 };
@@ -6980,17 +7019,17 @@ static const NMMetaPropertyInfo *const property_infos_WIFI_P2P[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_WIMAX
 static const NMMetaPropertyInfo *const property_infos_WIMAX[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIMAX_MAC_ADDRESS,
-		.is_cli_option =                TRUE,
-		.property_alias =               "mac",
-		.prompt =                       N_("MAC [none]"),
-		.property_type =                &_pt_gobject_string,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "mac",
+	    .prompt =                       N_("MAC [none]"),
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIMAX_NETWORK_NAME,
-		.is_cli_option =                TRUE,
-		.property_alias =               "nsp",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       N_("WiMAX NSP name"),
-		.property_type =                &_pt_gobject_mac,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "nsp",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	    .prompt =                       N_("WiMAX NSP name"),
+	    .property_type =                &_pt_gobject_mac,
 	),
 	NULL
 };
@@ -6999,118 +7038,118 @@ static const NMMetaPropertyInfo *const property_infos_WIMAX[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_WIRED
 static const NMMetaPropertyInfo *const property_infos_WIRED[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRED_PORT,
-		/* Do not allow setting 'port' for now. It is not implemented in
-		 * NM core, nor in ifcfg-rh plugin. Enable this when it gets done.
-		 * wired_valid_ports[] = { "tp", "aui", "bnc", "mii", NULL };
-		 */
-		.property_type =                &_pt_gobject_readonly,
+	    /* Do not allow setting 'port' for now. It is not implemented in
+	     * NM core, nor in ifcfg-rh plugin. Enable this when it gets done.
+	     * wired_valid_ports[] = { "tp", "aui", "bnc", "mii", NULL };
+	     */
+	    .property_type =                &_pt_gobject_readonly,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRED_SPEED,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRED_DUPLEX,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV ("half", "full"),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV ("half", "full"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRED_AUTO_NEGOTIATE,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRED_MAC_ADDRESS,
-		.is_cli_option =                TRUE,
-		.property_alias =               "mac",
-		.prompt =                       N_("MAC [none]"),
-		.property_type =                &_pt_gobject_mac,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "mac",
+	    .prompt =                       N_("MAC [none]"),
+	    .property_type =                &_pt_gobject_mac,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRED_CLONED_MAC_ADDRESS,
-		.is_cli_option =                TRUE,
-		.property_alias =               "cloned-mac",
-		.prompt =                       N_("Cloned MAC [none]"),
-		.property_type =                &_pt_gobject_mac,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mac,
-			.mode =                     NM_META_PROPERTY_TYPE_MAC_MODE_CLONED,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "cloned-mac",
+	    .prompt =                       N_("Cloned MAC [none]"),
+	    .property_type =                &_pt_gobject_mac,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mac,
+	        .mode =                     NM_META_PROPERTY_TYPE_MAC_MODE_CLONED,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST,
-		.property_type =                &_pt_multilist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (multilist,
-				.get_num_fcn_u32 =      MULTILIST_GET_NUM_FCN_U32     (NMSettingWired, nm_setting_wired_get_num_mac_blacklist_items),
-				.add_fcn =              MULTILIST_ADD_FCN             (NMSettingWired, nm_setting_wired_add_mac_blacklist_item),
-				.remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSettingWired, nm_setting_wired_remove_mac_blacklist_item),
-				.remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingWired, nm_setting_wired_remove_mac_blacklist_item_by_value),
-				.validate2_fcn =        _multilist_validate2_fcn_mac_addr,
-				.strsplit_plain =       TRUE,
-			),
-		),
+	    .property_type =                &_pt_multilist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
+	            .get_num_fcn_u32 =      MULTILIST_GET_NUM_FCN_U32     (NMSettingWired, nm_setting_wired_get_num_mac_blacklist_items),
+	            .add_fcn =              MULTILIST_ADD_FCN             (NMSettingWired, nm_setting_wired_add_mac_blacklist_item),
+	            .remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSettingWired, nm_setting_wired_remove_mac_blacklist_item),
+	            .remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingWired, nm_setting_wired_remove_mac_blacklist_item_by_value),
+	            .validate2_fcn =        _multilist_validate2_fcn_mac_addr,
+	            .strsplit_plain =       TRUE,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRED_MTU,
-		.is_cli_option =                TRUE,
-		.property_alias =               "mtu",
-		.prompt =                       N_("MTU [auto]"),
-		.property_type =                &_pt_gobject_mtu,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
-			.get_fcn =                  MTU_GET_FCN (NMSettingWired, nm_setting_wired_get_mtu),
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "mtu",
+	    .prompt =                       N_("MTU [auto]"),
+	    .property_type =                &_pt_gobject_mtu,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
+	        .get_fcn =                  MTU_GET_FCN (NMSettingWired, nm_setting_wired_get_mtu),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRED_S390_SUBCHANNELS,
-		.describe_message =
-		    N_("Enter a list of subchannels (comma or space separated).\n\n"
-		       "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_wired_s390_subchannels,
-		),
+	    .describe_message =
+	        N_("Enter a list of subchannels (comma or space separated).\n\n"
+	           "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_gobject,
+	        .set_fcn =                  _set_fcn_wired_s390_subchannels,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRED_S390_NETTYPE,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV ("qeth", "lcs", "ctc"),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV ("qeth", "lcs", "ctc"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRED_S390_OPTIONS,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.describe_fcn =             _describe_fcn_wired_s390_options,
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_optionlist,
-			.set_supports_remove =      TRUE,
-			.values_fcn =               _values_fcn_wired_s390_options,
-		),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (optionlist,
-			.set_fcn =                  _optionlist_set_fcn_wired_s390_options,
-			.no_empty_value =           TRUE,
-		),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .describe_fcn =             _describe_fcn_wired_s390_options,
+	        .get_fcn =                  _get_fcn_gobject,
+	        .set_fcn =                  _set_fcn_optionlist,
+	        .set_supports_remove =      TRUE,
+	        .values_fcn =               _values_fcn_wired_s390_options,
+	    ),
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (optionlist,
+	        .set_fcn =                  _optionlist_set_fcn_wired_s390_options,
+	        .no_empty_value =           TRUE,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRED_WAKE_ON_LAN,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.get_gtype =            nm_setting_wired_wake_on_lan_get_type,
-				.value_infos =          ENUM_VALUE_INFOS (
-					{
-						.value = NM_SETTING_WIRED_WAKE_ON_LAN_NONE,
-						.nick = "none",
-					},
-					{
-						.value = NM_SETTING_WIRED_WAKE_ON_LAN_NONE,
-						.nick = "disable",
-					},
-					{
-						.value = NM_SETTING_WIRED_WAKE_ON_LAN_NONE,
-						.nick = "disabled",
-					},
-				),
-			),
-			.typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
-			                            | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
-		),
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .get_gtype =            nm_setting_wired_wake_on_lan_get_type,
+	            .value_infos =          ENUM_VALUE_INFOS (
+	                {
+	                    .value = NM_SETTING_WIRED_WAKE_ON_LAN_NONE,
+	                    .nick = "none",
+	                },
+	                {
+	                    .value = NM_SETTING_WIRED_WAKE_ON_LAN_NONE,
+	                    .nick = "disable",
+	                },
+	                {
+	                    .value = NM_SETTING_WIRED_WAKE_ON_LAN_NONE,
+	                    .nick = "disabled",
+	                },
+	            ),
+	        ),
+	        .typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
+	                                    | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD,
-		.property_type =                &_pt_gobject_mac,
+	    .property_type =                &_pt_gobject_mac,
 	),
 	NULL
 };
@@ -7119,32 +7158,32 @@ static const NMMetaPropertyInfo *const property_infos_WIRED[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_WIREGUARD
 static const NMMetaPropertyInfo *const property_infos_WIREGUARD[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_PRIVATE_KEY,
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
+	    .is_secret =                    TRUE,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_PRIVATE_KEY_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
+	    .property_type =                &_pt_gobject_secret_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_LISTEN_PORT,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_FWMARK,
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
-			.base =                     16,
-		),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
+	        .base =                     16,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_PEER_ROUTES,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_MTU,
-		.property_type =                &_pt_gobject_mtu,
+	    .property_type =                &_pt_gobject_mtu,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_IP4_AUTO_DEFAULT_ROUTE,
-		.property_type =                &_pt_gobject_enum,
+	    .property_type =                &_pt_gobject_enum,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_IP6_AUTO_DEFAULT_ROUTE,
-		.property_type =                &_pt_gobject_enum,
+	    .property_type =                &_pt_gobject_enum,
 	),
 	NULL
 };
@@ -7153,129 +7192,129 @@ static const NMMetaPropertyInfo *const property_infos_WIREGUARD[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_WIRELESS
 static const NMMetaPropertyInfo *const property_infos_WIRELESS[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SSID,
-		.is_cli_option =                TRUE,
-		.property_alias =               "ssid",
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.prompt =                       N_("SSID"),
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_wireless_ssid,
-			.set_fcn =                  _set_fcn_gobject_ssid,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "ssid",
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	    .prompt =                       N_("SSID"),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_wireless_ssid,
+	        .set_fcn =                  _set_fcn_gobject_ssid,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_MODE,
-		.is_cli_option =                TRUE,
-		.property_alias =               "mode",
-		.prompt =                       NM_META_TEXT_PROMPT_WIFI_MODE,
-		.def_hint =                     NM_META_TEXT_PROMPT_WIFI_MODE_CHOICES,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV (NM_SETTING_WIRELESS_MODE_INFRA,
-			                                          NM_SETTING_WIRELESS_MODE_ADHOC,
-			                                          NM_SETTING_WIRELESS_MODE_AP,
-			                                          NM_SETTING_WIRELESS_MODE_MESH),
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "mode",
+	    .prompt =                       NM_META_TEXT_PROMPT_WIFI_MODE,
+	    .def_hint =                     NM_META_TEXT_PROMPT_WIFI_MODE_CHOICES,
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV (NM_SETTING_WIRELESS_MODE_INFRA,
+	                                                  NM_SETTING_WIRELESS_MODE_ADHOC,
+	                                                  NM_SETTING_WIRELESS_MODE_AP,
+	                                                  NM_SETTING_WIRELESS_MODE_MESH),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_BAND,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV ("a", "bg"),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV ("a", "bg"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_CHANNEL,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_gobject,
-			.set_fcn =                  _set_fcn_wireless_channel,
-		),
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_gobject,
+	        .set_fcn =                  _set_fcn_wireless_channel,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_BSSID,
-		.property_type =                &_pt_gobject_mac,
+	    .property_type =                &_pt_gobject_mac,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_RATE,
-		/* Do not allow setting 'rate'. It is not implemented in NM core. */
-		.property_type =                &_pt_gobject_readonly,
+	    /* Do not allow setting 'rate'. It is not implemented in NM core. */
+	    .property_type =                &_pt_gobject_readonly,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_TX_POWER,
-		/* Do not allow setting 'tx-power'. It is not implemented in NM core. */
-		.property_type =                &_pt_gobject_readonly,
+	    /* Do not allow setting 'tx-power'. It is not implemented in NM core. */
+	    .property_type =                &_pt_gobject_readonly,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_MAC_ADDRESS,
-		.property_type =                &_pt_gobject_mac,
-		.is_cli_option =                TRUE,
-		.property_alias =               "mac",
-		.prompt =                       N_("MAC [none]"),
+	    .property_type =                &_pt_gobject_mac,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "mac",
+	    .prompt =                       N_("MAC [none]"),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS,
-		.is_cli_option =                TRUE,
-		.property_alias =               "cloned-mac",
-		.prompt =                       N_("Cloned MAC [none]"),
-		.property_type =                &_pt_gobject_mac,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mac,
-			.mode =                     NM_META_PROPERTY_TYPE_MAC_MODE_CLONED,
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "cloned-mac",
+	    .prompt =                       N_("Cloned MAC [none]"),
+	    .property_type =                &_pt_gobject_mac,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mac,
+	        .mode =                     NM_META_PROPERTY_TYPE_MAC_MODE_CLONED,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST,
-		.property_type =                &_pt_multilist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (multilist,
-				.get_num_fcn_u32 =      MULTILIST_GET_NUM_FCN_U32     (NMSettingWireless, nm_setting_wireless_get_num_mac_blacklist_items),
-				.add_fcn =              MULTILIST_ADD_FCN             (NMSettingWireless, nm_setting_wireless_add_mac_blacklist_item),
-				.remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSettingWireless, nm_setting_wireless_remove_mac_blacklist_item),
-				.remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingWireless, nm_setting_wireless_remove_mac_blacklist_item_by_value),
-				.validate2_fcn =        _multilist_validate2_fcn_mac_addr,
-				.strsplit_plain =       TRUE,
-			),
-		),
+	    .property_type =                &_pt_multilist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
+	            .get_num_fcn_u32 =      MULTILIST_GET_NUM_FCN_U32     (NMSettingWireless, nm_setting_wireless_get_num_mac_blacklist_items),
+	            .add_fcn =              MULTILIST_ADD_FCN             (NMSettingWireless, nm_setting_wireless_add_mac_blacklist_item),
+	            .remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSettingWireless, nm_setting_wireless_remove_mac_blacklist_item),
+	            .remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingWireless, nm_setting_wireless_remove_mac_blacklist_item_by_value),
+	            .validate2_fcn =        _multilist_validate2_fcn_mac_addr,
+	            .strsplit_plain =       TRUE,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.get_gtype =            nm_setting_mac_randomization_get_type,
-			),
-			.typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
-			                            | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
-		),
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .get_gtype =            nm_setting_mac_randomization_get_type,
+	        ),
+	        .typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
+	                                    | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_MTU,
-		.is_cli_option =                TRUE,
-		.property_alias =               "mtu",
-		.prompt =                       N_("MTU [auto]"),
-		.property_type =                &_pt_gobject_mtu,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
-			.get_fcn =                  MTU_GET_FCN (NMSettingWireless, nm_setting_wireless_get_mtu),
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "mtu",
+	    .prompt =                       N_("MTU [auto]"),
+	    .property_type =                &_pt_gobject_mtu,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
+	        .get_fcn =                  MTU_GET_FCN (NMSettingWireless, nm_setting_wireless_get_mtu),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SEEN_BSSIDS,
-		.property_type =                &_pt_gobject_readonly,
+	    .property_type =                &_pt_gobject_readonly,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_HIDDEN,
-		.property_type =                &_pt_gobject_bool,
+	    .property_type =                &_pt_gobject_bool,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_POWERSAVE,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.get_gtype =            nm_setting_wireless_powersave_get_type,
-			),
-			.typ_flags =                NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT,
-		),
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .get_gtype =            nm_setting_wireless_powersave_get_type,
+	        ),
+	        .typ_flags =                NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_WAKE_ON_WLAN,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.get_gtype =            nm_setting_wireless_wake_on_wlan_get_type,
-				.value_infos =          ENUM_VALUE_INFOS (
-					{
-						.value = NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE,
-						.nick = "disabled",
-					},
-				),
-			),
-		),
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .get_gtype =            nm_setting_wireless_wake_on_wlan_get_type,
+	            .value_infos =          ENUM_VALUE_INFOS (
+	                {
+	                    .value = NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE,
+	                    .nick = "disabled",
+	                },
+	            ),
+	        ),
+	    ),
 	),
 	NULL
 };
@@ -7284,143 +7323,143 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_WIRELESS_SECURITY
 static const NMMetaPropertyInfo *const property_infos_WIRELESS_SECURITY[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_KEY_MGMT,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV ("none", "ieee8021x", "wpa-none", "wpa-psk", "wpa-eap", "sae"),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV ("none", "ieee8021x", "wpa-psk", "wpa-eap", "sae"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX,
-		.property_type =                &_pt_gobject_int,
+	    .property_type =                &_pt_gobject_int,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_AUTH_ALG,
-		.property_type =                &_pt_gobject_string,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			.values_static =            NM_MAKE_STRV ("open", "shared", "leap"),
-		),
+	    .property_type =                &_pt_gobject_string,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        .values_static =            NM_MAKE_STRV ("open", "shared", "leap"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_PROTO,
-		.property_type =                &_pt_multilist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (multilist,
-				.get_num_fcn_u32 =      MULTILIST_GET_NUM_FCN_U32     (NMSettingWirelessSecurity, nm_setting_wireless_security_get_num_protos),
-				.add_fcn =              MULTILIST_ADD_FCN             (NMSettingWirelessSecurity, nm_setting_wireless_security_add_proto),
-				.remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSettingWirelessSecurity, nm_setting_wireless_security_remove_proto),
-				.remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingWirelessSecurity, nm_setting_wireless_security_remove_proto_by_value),
-				.strsplit_plain =       TRUE,
-			),
-			.values_static =            NM_MAKE_STRV ("wpa", "rsn"),
-		),
+	    .property_type =                &_pt_multilist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
+	            .get_num_fcn_u32 =      MULTILIST_GET_NUM_FCN_U32     (NMSettingWirelessSecurity, nm_setting_wireless_security_get_num_protos),
+	            .add_fcn =              MULTILIST_ADD_FCN             (NMSettingWirelessSecurity, nm_setting_wireless_security_add_proto),
+	            .remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSettingWirelessSecurity, nm_setting_wireless_security_remove_proto),
+	            .remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingWirelessSecurity, nm_setting_wireless_security_remove_proto_by_value),
+	            .strsplit_plain =       TRUE,
+	        ),
+	        .values_static =            NM_MAKE_STRV ("wpa", "rsn"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_PAIRWISE,
-		.property_type =                &_pt_multilist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (multilist,
-				.get_num_fcn_u32 =      MULTILIST_GET_NUM_FCN_U32     (NMSettingWirelessSecurity, nm_setting_wireless_security_get_num_pairwise),
-				.add_fcn =              MULTILIST_ADD_FCN             (NMSettingWirelessSecurity, nm_setting_wireless_security_add_pairwise),
-				.remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSettingWirelessSecurity, nm_setting_wireless_security_remove_pairwise),
-				.remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingWirelessSecurity, nm_setting_wireless_security_remove_pairwise_by_value),
-				.strsplit_plain =       TRUE,
-			),
-			.values_static =            NM_MAKE_STRV ("tkip", "ccmp"),
-		),
+	    .property_type =                &_pt_multilist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
+	            .get_num_fcn_u32 =      MULTILIST_GET_NUM_FCN_U32     (NMSettingWirelessSecurity, nm_setting_wireless_security_get_num_pairwise),
+	            .add_fcn =              MULTILIST_ADD_FCN             (NMSettingWirelessSecurity, nm_setting_wireless_security_add_pairwise),
+	            .remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSettingWirelessSecurity, nm_setting_wireless_security_remove_pairwise),
+	            .remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingWirelessSecurity, nm_setting_wireless_security_remove_pairwise_by_value),
+	            .strsplit_plain =       TRUE,
+	        ),
+	        .values_static =            NM_MAKE_STRV ("tkip", "ccmp"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_GROUP,
-		.property_type =                &_pt_multilist,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (multilist,
-				.get_num_fcn_u32 =      MULTILIST_GET_NUM_FCN_U32     (NMSettingWirelessSecurity, nm_setting_wireless_security_get_num_groups),
-				.add_fcn =              MULTILIST_ADD_FCN             (NMSettingWirelessSecurity, nm_setting_wireless_security_add_group),
-				.remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSettingWirelessSecurity, nm_setting_wireless_security_remove_group),
-				.remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingWirelessSecurity, nm_setting_wireless_security_remove_group_by_value),
-				.strsplit_plain =       TRUE,
-			),
-			.values_static =            NM_MAKE_STRV ("wep40", "wep104", "tkip", "ccmp"),
-		),
+	    .property_type =                &_pt_multilist,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (multilist,
+	            .get_num_fcn_u32 =      MULTILIST_GET_NUM_FCN_U32     (NMSettingWirelessSecurity, nm_setting_wireless_security_get_num_groups),
+	            .add_fcn =              MULTILIST_ADD_FCN             (NMSettingWirelessSecurity, nm_setting_wireless_security_add_group),
+	            .remove_by_idx_fcn_u32 = MULTILIST_REMOVE_BY_IDX_FCN_U32 (NMSettingWirelessSecurity, nm_setting_wireless_security_remove_group),
+	            .remove_by_value_fcn =  MULTILIST_REMOVE_BY_VALUE_FCN (NMSettingWirelessSecurity, nm_setting_wireless_security_remove_group_by_value),
+	            .strsplit_plain =       TRUE,
+	        ),
+	        .values_static =            NM_MAKE_STRV ("wep40", "wep104", "tkip", "ccmp"),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_PMF,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.get_gtype =            nm_setting_wireless_security_pmf_get_type,
-			),
-		),
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .get_gtype =            nm_setting_wireless_security_pmf_get_type,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME,
-		.property_type =                &_pt_gobject_string,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_WEP_KEY0,
-		.is_secret =                    TRUE,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_wireless_security_wep_key,
-			.set_fcn =                  _set_fcn_wireless_wep_key,
-		),
+	    .is_secret =                    TRUE,
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_wireless_security_wep_key,
+	        .set_fcn =                  _set_fcn_wireless_wep_key,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_WEP_KEY1,
-		.is_secret =                    TRUE,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_wireless_security_wep_key,
-			.set_fcn =                  _set_fcn_wireless_wep_key,
-		),
+	    .is_secret =                    TRUE,
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_wireless_security_wep_key,
+	        .set_fcn =                  _set_fcn_wireless_wep_key,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_WEP_KEY2,
-		.is_secret =                    TRUE,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_wireless_security_wep_key,
-			.set_fcn =                  _set_fcn_wireless_wep_key,
-		),
+	    .is_secret =                    TRUE,
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_wireless_security_wep_key,
+	        .set_fcn =                  _set_fcn_wireless_wep_key,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_WEP_KEY3,
-		.is_secret =                    TRUE,
-		.property_type = DEFINE_PROPERTY_TYPE (
-			.get_fcn =                  _get_fcn_wireless_security_wep_key,
-			.set_fcn =                  _set_fcn_wireless_wep_key,
-		),
+	    .is_secret =                    TRUE,
+	    .property_type = DEFINE_PROPERTY_TYPE (
+	        .get_fcn =                  _get_fcn_wireless_security_wep_key,
+	        .set_fcn =                  _set_fcn_wireless_wep_key,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
+	    .property_type =                &_pt_gobject_secret_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE,
-		.describe_message =
-		    N_("Enter the type of WEP keys. The accepted values are: "
-		       "0 or unknown, 1 or key, and 2 or passphrase.\n"),
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.pre_set_notify =       _gobject_enum_pre_set_notify_fcn_wireless_security_wep_key_type,
-			),
-			.typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
-			                            | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
-		),
+	    .describe_message =
+	        N_("Enter the type of WEP keys. The accepted values are: "
+	           "0 or unknown, 1 or key, and 2 or passphrase.\n"),
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .pre_set_notify =       _gobject_enum_pre_set_notify_fcn_wireless_security_wep_key_type,
+	        ),
+	        .typ_flags =                  NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PARSABLE_TEXT
+	                                    | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_PSK,
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
+	    .is_secret =                    TRUE,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
+	    .property_type =                &_pt_gobject_secret_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD,
-		.is_secret =                    TRUE,
-		.property_type =                &_pt_gobject_string,
+	    .is_secret =                    TRUE,
+	    .property_type =                &_pt_gobject_string,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS,
-		.property_type =                &_pt_gobject_secret_flags,
+	    .property_type =                &_pt_gobject_secret_flags,
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_WPS_METHOD,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.get_gtype =            nm_setting_wireless_security_wps_method_get_type,
-			),
-		),
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .get_gtype =            nm_setting_wireless_security_wps_method_get_type,
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_SECURITY_FILS,
-		.property_type =                &_pt_gobject_enum,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-			PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
-				.get_gtype =            nm_setting_wireless_security_fils_get_type,
-			),
-		),
+	    .property_type =                &_pt_gobject_enum,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
+	        PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
+	            .get_gtype =            nm_setting_wireless_security_fils_get_type,
+	        ),
+	    ),
 	),
 	NULL
 };
@@ -7429,72 +7468,72 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS_SECURITY[] = {
 #define _CURRENT_NM_META_SETTING_TYPE NM_META_SETTING_TYPE_WPAN
 static const NMMetaPropertyInfo *const property_infos_WPAN[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WPAN_MAC_ADDRESS,
-		.property_type =                &_pt_gobject_mac,
-		.is_cli_option =                TRUE,
-		.property_alias =               "mac",
-		.prompt =                       N_("MAC [none]"),
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mac,
-			.mode =                     NM_META_PROPERTY_TYPE_MAC_MODE_WPAN,
-		),
+	    .property_type =                &_pt_gobject_mac,
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "mac",
+	    .prompt =                       N_("MAC [none]"),
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mac,
+	        .mode =                     NM_META_PROPERTY_TYPE_MAC_MODE_WPAN,
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WPAN_SHORT_ADDRESS,
-		.is_cli_option =                TRUE,
-		.property_alias =               "short-addr",
-		.prompt =                       N_("Short address (<0x0000-0xffff>)"),
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
-			.base =                     16,
-			.value_infos =              INT_VALUE_INFOS (
-				{
-					.value.i64 = G_MAXUINT16,
-					.nick = "unset",
-				},
-			),
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "short-addr",
+	    .prompt =                       N_("Short address (<0x0000-0xffff>)"),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
+	        .base =                     16,
+	        .value_infos =              INT_VALUE_INFOS (
+	            {
+	                .value.i64 = G_MAXUINT16,
+	                .nick = "unset",
+	            },
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WPAN_PAN_ID,
-		.is_cli_option =                TRUE,
-		.inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
-		.property_alias =               "pan-id",
-		.prompt =                       N_("PAN Identifier (<0x0000-0xffff>)"),
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
-			.base =                     16,
-			.value_infos =              INT_VALUE_INFOS (
-				{
-					.value.i64 = G_MAXUINT16,
-					.nick = "unset",
-				},
-			),
-		),
+	    .is_cli_option =                TRUE,
+	    .inf_flags =                    NM_META_PROPERTY_INF_FLAG_REQD,
+	    .property_alias =               "pan-id",
+	    .prompt =                       N_("PAN Identifier (<0x0000-0xffff>)"),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
+	        .base =                     16,
+	        .value_infos =              INT_VALUE_INFOS (
+	            {
+	                .value.i64 = G_MAXUINT16,
+	                .nick = "unset",
+	            },
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WPAN_PAGE,
-		.is_cli_option =                TRUE,
-		.property_alias =               "page",
-		.prompt =                       N_("Page (<default|0-31>)"),
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
-			.value_infos =              INT_VALUE_INFOS (
-				{
-					.value.i64 = NM_SETTING_WPAN_PAGE_DEFAULT,
-					.nick = "default",
-				},
-			),
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "page",
+	    .prompt =                       N_("Page (<default|0-31>)"),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
+	        .value_infos =              INT_VALUE_INFOS (
+	            {
+	                .value.i64 = NM_SETTING_WPAN_PAGE_DEFAULT,
+	                .nick = "default",
+	            },
+	        ),
+	    ),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WPAN_CHANNEL,
-		.is_cli_option =                TRUE,
-		.property_alias =               "channel",
-		.prompt =                       N_("Channel (<default|0-26>)"),
-		.property_type =                &_pt_gobject_int,
-		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
-			.value_infos =              INT_VALUE_INFOS (
-				{
-					.value.i64 = NM_SETTING_WPAN_CHANNEL_DEFAULT,
-					.nick = "default",
-				},
-			),
-		),
+	    .is_cli_option =                TRUE,
+	    .property_alias =               "channel",
+	    .prompt =                       N_("Channel (<default|0-26>)"),
+	    .property_type =                &_pt_gobject_int,
+	    .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, \
+	        .value_infos =              INT_VALUE_INFOS (
+	            {
+	                .value.i64 = NM_SETTING_WPAN_CHANNEL_DEFAULT,
+	                .nick = "default",
+	            },
+	        ),
+	    ),
 	),
 	NULL
 };
@@ -7505,10 +7544,10 @@ static void
 _setting_init_fcn_adsl (ARGS_SETTING_INIT_FCN)
 {
 	if (init_type == NM_META_ACCESSOR_SETTING_INIT_TYPE_CLI) {
-		/* Initialize a protocol */
-		g_object_set (NM_SETTING_ADSL (setting),
-		              NM_SETTING_ADSL_PROTOCOL, NM_SETTING_ADSL_PROTOCOL_PPPOE,
-		              NULL);
+	    /* Initialize a protocol */
+	    g_object_set (NM_SETTING_ADSL (setting),
+	                  NM_SETTING_ADSL_PROTOCOL, NM_SETTING_ADSL_PROTOCOL_PPPOE,
+	                  NULL);
 	}
 }
 
@@ -7516,10 +7555,10 @@ static void
 _setting_init_fcn_cdma (ARGS_SETTING_INIT_FCN)
 {
 	if (init_type == NM_META_ACCESSOR_SETTING_INIT_TYPE_CLI) {
-		/* Initialize 'number' so that 'cdma' is valid */
-		g_object_set (NM_SETTING_CDMA (setting),
-		              NM_SETTING_CDMA_NUMBER, "#777",
-		              NULL);
+	    /* Initialize 'number' so that 'cdma' is valid */
+	    g_object_set (NM_SETTING_CDMA (setting),
+	                  NM_SETTING_CDMA_NUMBER, "#777",
+	                  NULL);
 	}
 }
 
@@ -7527,10 +7566,10 @@ static void
 _setting_init_fcn_gsm (ARGS_SETTING_INIT_FCN)
 {
 	if (init_type == NM_META_ACCESSOR_SETTING_INIT_TYPE_CLI) {
-		/* Initialize 'apn' so that 'gsm' is valid */
-		g_object_set (NM_SETTING_GSM (setting),
-		              NM_SETTING_GSM_APN, "internet",
-		              NULL);
+	    /* Initialize 'apn' so that 'gsm' is valid */
+	    g_object_set (NM_SETTING_GSM (setting),
+	                  NM_SETTING_GSM_APN, "internet",
+	                  NULL);
 	}
 }
 
@@ -7538,10 +7577,10 @@ static void
 _setting_init_fcn_infiniband (ARGS_SETTING_INIT_FCN)
 {
 	if (init_type == NM_META_ACCESSOR_SETTING_INIT_TYPE_CLI) {
-		/* Initialize 'transport-mode' so that 'infiniband' is valid */
-		g_object_set (NM_SETTING_INFINIBAND (setting),
-		              NM_SETTING_INFINIBAND_TRANSPORT_MODE, "datagram",
-		              NULL);
+	    /* Initialize 'transport-mode' so that 'infiniband' is valid */
+	    g_object_set (NM_SETTING_INFINIBAND (setting),
+	                  NM_SETTING_INFINIBAND_TRANSPORT_MODE, "datagram",
+	                  NULL);
 	}
 }
 
@@ -7549,9 +7588,9 @@ static void
 _setting_init_fcn_ip4_config (ARGS_SETTING_INIT_FCN)
 {
 	if (init_type == NM_META_ACCESSOR_SETTING_INIT_TYPE_CLI) {
-		g_object_set (NM_SETTING_IP_CONFIG (setting),
-		              NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
-		              NULL);
+	    g_object_set (NM_SETTING_IP_CONFIG (setting),
+	                  NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
+	                  NULL);
 	}
 }
 
@@ -7559,9 +7598,9 @@ static void
 _setting_init_fcn_ip6_config (ARGS_SETTING_INIT_FCN)
 {
 	if (init_type == NM_META_ACCESSOR_SETTING_INIT_TYPE_CLI) {
-		g_object_set (NM_SETTING_IP_CONFIG (setting),
-		              NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_AUTO,
-		              NULL);
+	    g_object_set (NM_SETTING_IP_CONFIG (setting),
+	                  NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_AUTO,
+	                  NULL);
 	}
 }
 
@@ -7569,9 +7608,9 @@ static void
 _setting_init_fcn_olpc_mesh (ARGS_SETTING_INIT_FCN)
 {
 	if (init_type == NM_META_ACCESSOR_SETTING_INIT_TYPE_CLI) {
-		g_object_set (NM_SETTING_OLPC_MESH (setting),
-		              NM_SETTING_OLPC_MESH_CHANNEL, 1,
-		              NULL);
+	    g_object_set (NM_SETTING_OLPC_MESH (setting),
+	                  NM_SETTING_OLPC_MESH_CHANNEL, 1,
+	                  NULL);
 	}
 }
 
@@ -7579,9 +7618,9 @@ static void
 _setting_init_fcn_proxy (ARGS_SETTING_INIT_FCN)
 {
 	if (init_type == NM_META_ACCESSOR_SETTING_INIT_TYPE_CLI) {
-		g_object_set (NM_SETTING_PROXY (setting),
-		              NM_SETTING_PROXY_METHOD, (int) NM_SETTING_PROXY_METHOD_NONE,
-		              NULL);
+	    g_object_set (NM_SETTING_PROXY (setting),
+	                  NM_SETTING_PROXY_METHOD, (int) NM_SETTING_PROXY_METHOD_NONE,
+	                  NULL);
 	}
 }
 
@@ -7589,9 +7628,9 @@ static void
 _setting_init_fcn_tun (ARGS_SETTING_INIT_FCN)
 {
 	if (init_type == NM_META_ACCESSOR_SETTING_INIT_TYPE_CLI) {
-		g_object_set (NM_SETTING_TUN (setting),
-		              NM_SETTING_TUN_MODE, NM_SETTING_TUN_MODE_TUN,
-		              NULL);
+	    g_object_set (NM_SETTING_TUN (setting),
+	                  NM_SETTING_TUN_MODE, NM_SETTING_TUN_MODE_TUN,
+	                  NULL);
 	}
 }
 
@@ -7599,9 +7638,9 @@ static void
 _setting_init_fcn_vlan (ARGS_SETTING_INIT_FCN)
 {
 	if (init_type == NM_META_ACCESSOR_SETTING_INIT_TYPE_CLI) {
-		g_object_set (setting,
-		              NM_SETTING_VLAN_ID, 1,
-		              NULL);
+	    g_object_set (setting,
+	                  NM_SETTING_VLAN_ID, 1,
+	                  NULL);
 	}
 }
 
@@ -7609,12 +7648,12 @@ static void
 _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN)
 {
 	if (init_type == NM_META_ACCESSOR_SETTING_INIT_TYPE_CLI) {
-		/* For Wi-Fi set mode to "infrastructure". Even though mode == NULL
-		 * is regarded as "infrastructure", explicit value makes no doubts.
-		 */
-		g_object_set (NM_SETTING_WIRELESS (setting),
-		              NM_SETTING_WIRELESS_MODE, NM_SETTING_WIRELESS_MODE_INFRA,
-		              NULL);
+	    /* For Wi-Fi set mode to "infrastructure". Even though mode == NULL
+	     * is regarded as "infrastructure", explicit value makes no doubts.
+	     */
+	    g_object_set (NM_SETTING_WIRELESS (setting),
+	                  NM_SETTING_WIRELESS_MODE, NM_SETTING_WIRELESS_MODE_INFRA,
+	                  NULL);
 	}
 }
 
@@ -7673,288 +7712,288 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN)
 
 #define NM_META_SETTING_VALID_PART_ITEM(type, mand) \
 	(&((const NMMetaSettingValidPartItem) { \
-		.setting_info =                     &nm_meta_setting_infos_editor[NM_META_SETTING_TYPE_##type], \
-		.mandatory =                        mand, \
+	    .setting_info =                     &nm_meta_setting_infos_editor[NM_META_SETTING_TYPE_##type], \
+	    .mandatory =                        mand, \
 	}))
 
 const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = {
 #define SETTING_INFO_EMPTY(type, ...) \
 	[NM_META_SETTING_TYPE_##type] = { \
-		.meta_type =                        &nm_meta_type_setting_info_editor, \
-		.general =                          &nm_meta_setting_infos[NM_META_SETTING_TYPE_##type], \
-		.pretty_name =                      SETTING_PRETTY_NAME_##type, \
-		__VA_ARGS__ \
+	    .meta_type =                        &nm_meta_type_setting_info_editor, \
+	    .general =                          &nm_meta_setting_infos[NM_META_SETTING_TYPE_##type], \
+	    .pretty_name =                      SETTING_PRETTY_NAME_##type, \
+	    __VA_ARGS__ \
 	}
 #define SETTING_INFO(type, ...) \
 	[NM_META_SETTING_TYPE_##type] = { \
-		.meta_type =                        &nm_meta_type_setting_info_editor, \
-		.general =                          &nm_meta_setting_infos[NM_META_SETTING_TYPE_##type], \
-		.properties =                       property_infos_##type, \
-		.properties_num =                   G_N_ELEMENTS (property_infos_##type) - 1, \
-		.pretty_name =                      SETTING_PRETTY_NAME_##type, \
-		__VA_ARGS__ \
+	    .meta_type =                        &nm_meta_type_setting_info_editor, \
+	    .general =                          &nm_meta_setting_infos[NM_META_SETTING_TYPE_##type], \
+	    .properties =                       property_infos_##type, \
+	    .properties_num =                   G_N_ELEMENTS (property_infos_##type) - 1, \
+	    .pretty_name =                      SETTING_PRETTY_NAME_##type, \
+	    __VA_ARGS__ \
 	}
 	SETTING_INFO (6LOWPAN,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (6LOWPAN,               TRUE),
-		),
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (6LOWPAN,               TRUE),
+	    ),
 	),
 	SETTING_INFO (802_1X),
 	SETTING_INFO (ADSL,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (ADSL,                  TRUE),
-		),
-		.setting_init_fcn =             _setting_init_fcn_adsl,
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (ADSL,                  TRUE),
+	    ),
+	    .setting_init_fcn =             _setting_init_fcn_adsl,
 	),
 	SETTING_INFO (BLUETOOTH,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (BLUETOOTH,             TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (BRIDGE,                FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (GSM,                   FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (CDMA,                  FALSE),
-		),
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (BLUETOOTH,             TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (BRIDGE,                FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (GSM,                   FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (CDMA,                  FALSE),
+	    ),
 	),
 	SETTING_INFO (BOND,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (BOND,                  TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
-		),
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (BOND,                  TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
+	    ),
 	),
 	SETTING_INFO (BRIDGE,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (BRIDGE,                TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
-		),
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (BRIDGE,                TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
+	    ),
 	),
 	SETTING_INFO (BRIDGE_PORT),
 	SETTING_INFO (CDMA,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (CDMA,                  TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (SERIAL,                FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (PPP,                   FALSE),
-		),
-		.setting_init_fcn =             _setting_init_fcn_cdma,
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (CDMA,                  TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (SERIAL,                FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (PPP,                   FALSE),
+	    ),
+	    .setting_init_fcn =             _setting_init_fcn_cdma,
 	),
 	SETTING_INFO (CONNECTION),
 	SETTING_INFO (DCB),
 	SETTING_INFO (ETHTOOL),
 	SETTING_INFO_EMPTY (DUMMY,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (DUMMY,                 TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
-		),
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (DUMMY,                 TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
+	    ),
 	),
 	SETTING_INFO_EMPTY (GENERIC,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (GENERIC,               TRUE),
-		),
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (GENERIC,               TRUE),
+	    ),
 	),
 	SETTING_INFO (GSM,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (GSM,                   TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (SERIAL,                FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (PPP,                   FALSE),
-		),
-		.setting_init_fcn =             _setting_init_fcn_gsm,
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (GSM,                   TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (SERIAL,                FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (PPP,                   FALSE),
+	    ),
+	    .setting_init_fcn =             _setting_init_fcn_gsm,
 	),
 	SETTING_INFO (INFINIBAND,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (INFINIBAND,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (SRIOV,                 FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
-		),
-		.setting_init_fcn =             _setting_init_fcn_infiniband,
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (INFINIBAND,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (SRIOV,                 FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
+	    ),
+	    .setting_init_fcn =             _setting_init_fcn_infiniband,
 	),
 	SETTING_INFO (IP4_CONFIG,
-		.setting_init_fcn =             _setting_init_fcn_ip4_config,
+	    .setting_init_fcn =             _setting_init_fcn_ip4_config,
 	),
 	SETTING_INFO (IP6_CONFIG,
-		.setting_init_fcn =             _setting_init_fcn_ip6_config,
+	    .setting_init_fcn =             _setting_init_fcn_ip6_config,
 	),
 	SETTING_INFO (IP_TUNNEL,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (IP_TUNNEL,             TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
-		),
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (IP_TUNNEL,             TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
+	    ),
 	),
 	SETTING_INFO (MACSEC,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (MACSEC,                TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (802_1X,                FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
-		),
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (MACSEC,                TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (802_1X,                FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
+	    ),
 	),
 	SETTING_INFO (MACVLAN,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (MACVLAN,               TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
-		),
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (MACVLAN,               TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
+	    ),
 	),
 	SETTING_INFO (MATCH),
 	SETTING_INFO (OLPC_MESH,
-		.alias =                            "olpc-mesh",
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (OLPC_MESH,             TRUE),
-		),
-		.setting_init_fcn =             _setting_init_fcn_olpc_mesh,
+	    .alias =                            "olpc-mesh",
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (OLPC_MESH,             TRUE),
+	    ),
+	    .setting_init_fcn =             _setting_init_fcn_olpc_mesh,
 	),
 	SETTING_INFO (OVS_BRIDGE,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (OVS_BRIDGE,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
-		),
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (OVS_BRIDGE,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
+	    ),
 	),
 	SETTING_INFO (OVS_DPDK),
 	SETTING_INFO (OVS_INTERFACE,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (OVS_INTERFACE,         TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (OVS_DPDK,              FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (OVS_PATCH,             FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (IP4_CONFIG,            FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (IP6_CONFIG,            FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
-		),
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (OVS_INTERFACE,         TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (OVS_DPDK,              FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (OVS_PATCH,             FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (IP4_CONFIG,            FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (IP6_CONFIG,            FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
+	    ),
 	),
 	SETTING_INFO (OVS_PATCH),
 	SETTING_INFO (OVS_PORT,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (OVS_PORT,              TRUE),
-		),
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (OVS_PORT,              TRUE),
+	    ),
 	),
 	SETTING_INFO (PPPOE,
-		/* PPPoE is a base connection type from historical reasons.
-		 * See libnm-core/nm-setting.c:_nm_setting_is_base_type()
-		 */
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (PPPOE,                 TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (WIRED,                 TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (PPP,                   FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (802_1X,                FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
-		),
+	    /* PPPoE is a base connection type from historical reasons.
+	     * See libnm-core/nm-setting.c:_nm_setting_is_base_type()
+	     */
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (PPPOE,                 TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (WIRED,                 TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (PPP,                   FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (802_1X,                FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
+	    ),
 	),
 	SETTING_INFO (PPP),
 	SETTING_INFO (PROXY,
-		.setting_init_fcn =             _setting_init_fcn_proxy,
+	    .setting_init_fcn =             _setting_init_fcn_proxy,
 	),
 	SETTING_INFO (SERIAL),
 	SETTING_INFO (SRIOV),
 	SETTING_INFO (TC_CONFIG),
 	SETTING_INFO (TEAM,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (TEAM,                  TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
-		),
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (TEAM,                  TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
+	    ),
 	),
 	SETTING_INFO (TEAM_PORT),
 	SETTING_INFO (TUN,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (TUN,                   TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
-		),
-		.setting_init_fcn =             _setting_init_fcn_tun,
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (TUN,                   TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
+	    ),
+	    .setting_init_fcn =             _setting_init_fcn_tun,
 	),
 	SETTING_INFO_EMPTY (USER),
 	SETTING_INFO (VLAN,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (VLAN,                  TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
-		),
-		.setting_init_fcn =             _setting_init_fcn_vlan,
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (VLAN,                  TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
+	    ),
+	    .setting_init_fcn =             _setting_init_fcn_vlan,
 	),
 	SETTING_INFO (VPN,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (VPN,                   TRUE),
-		),
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (VPN,                   TRUE),
+	    ),
 	),
 	SETTING_INFO (VXLAN,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (VXLAN,                 TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
-		),
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (VXLAN,                 TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (WIRED,                 FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
+	    ),
 	),
 	SETTING_INFO (WIFI_P2P,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (WIFI_P2P,              TRUE),
-		),
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (WIFI_P2P,              TRUE),
+	    ),
 	),
 	SETTING_INFO (WIMAX,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (WIMAX,                 TRUE),
-		),
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (WIMAX,                 TRUE),
+	    ),
 	),
 	SETTING_INFO (WIRED,
-		.alias =                            "ethernet",
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (WIRED,                 TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (802_1X,                FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (DCB,                   FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (SRIOV,                 FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
-		),
+	    .alias =                            "ethernet",
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (WIRED,                 TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (802_1X,                FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (DCB,                   FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (SRIOV,                 FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
+	    ),
 	),
 	SETTING_INFO (WIREGUARD,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (WIREGUARD,             TRUE),
-		),
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (WIREGUARD,             TRUE),
+	    ),
 	),
 	SETTING_INFO (WIRELESS,
-		.alias =                            "wifi",
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (WIRELESS,              TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (WIRELESS_SECURITY,     FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (802_1X,                FALSE),
-			NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
-		),
-		.setting_init_fcn =             _setting_init_fcn_wireless,
+	    .alias =                            "wifi",
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (WIRELESS,              TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (WIRELESS_SECURITY,     FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (802_1X,                FALSE),
+	        NM_META_SETTING_VALID_PART_ITEM (ETHTOOL,               FALSE),
+	    ),
+	    .setting_init_fcn =             _setting_init_fcn_wireless,
 	),
 	SETTING_INFO (WIRELESS_SECURITY,
-		.alias =                            "wifi-sec",
+	    .alias =                            "wifi-sec",
 	),
 	SETTING_INFO (WPAN,
-		.valid_parts = NM_META_SETTING_VALID_PARTS (
-			NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
-			NM_META_SETTING_VALID_PART_ITEM (WPAN,                  TRUE),
-		),
+	    .valid_parts = NM_META_SETTING_VALID_PARTS (
+	        NM_META_SETTING_VALID_PART_ITEM (CONNECTION,            TRUE),
+	        NM_META_SETTING_VALID_PART_ITEM (WPAN,                  TRUE),
+	    ),
 	),
 };
 
diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h
index 27ae4254..f06dd3db 100644
--- a/clients/common/nm-meta-setting-desc.h
+++ b/clients/common/nm-meta-setting-desc.h
@@ -1,20 +1,6 @@
-/* nmcli - command-line tool to control NetworkManager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2010 - 2018 Red Hat, Inc.
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2010 - 2018 Red Hat, Inc.
  */
 
 #ifndef __NM_META_SETTING_DESC_H__
@@ -102,6 +88,7 @@ typedef enum {
 	NM_META_COLOR_DEVICE_FIRMWARE_MISSING,
 	NM_META_COLOR_DEVICE_PLUGIN_MISSING,
 	NM_META_COLOR_DEVICE_UNAVAILABLE,
+	NM_META_COLOR_DEVICE_DISABLED,
 	NM_META_COLOR_DEVICE_UNKNOWN,
 	NM_META_COLOR_MANAGER_RUNNING,
 	NM_META_COLOR_MANAGER_STARTING,
@@ -130,6 +117,12 @@ typedef enum {
 } NMMetaColor;
 
 typedef enum {
+	NM_META_ACCESSOR_MODIFIER_SET,
+	NM_META_ACCESSOR_MODIFIER_ADD,
+	NM_META_ACCESSOR_MODIFIER_DEL,
+} NMMetaAccessorModifier;
+
+typedef enum {
 	NM_META_ACCESSOR_GET_TYPE_PRETTY,
 	NM_META_ACCESSOR_GET_TYPE_PARSABLE,
 	NM_META_ACCESSOR_GET_TYPE_COLOR,
@@ -210,7 +203,7 @@ struct _NMMetaPropertyType {
 	                     const NMMetaEnvironment *environment,
 	                     gpointer environment_user_data,
 	                     NMSetting *setting,
-	                     char modifier,
+	                     NMMetaAccessorModifier modifier,
 	                     const char *value,
 	                     GError **error);
 
diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c
index 139bb35a..b2941652 100644
--- a/clients/common/nm-polkit-listener.c
+++ b/clients/common/nm-polkit-listener.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2014 Red Hat, Inc.
+ * Copyright (C) 2014 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/common/nm-polkit-listener.h b/clients/common/nm-polkit-listener.h
index 63939053..42da1bc1 100644
--- a/clients/common/nm-polkit-listener.h
+++ b/clients/common/nm-polkit-listener.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2014 Red Hat, Inc.
+ * Copyright (C) 2014 Red Hat, Inc.
  */
 
 #ifndef __NM_POLKIT_LISTENER_H__
diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c
index 52059f95..2bf69b20 100644
--- a/clients/common/nm-secret-agent-simple.c
+++ b/clients/common/nm-secret-agent-simple.c
@@ -1,19 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2011-2015 Red Hat, Inc.
- * Copyright 2011 Giovanni Campagna <scampa.giovanni@gmail.com>
+ * Copyright (C) 2011 - 2015 Red Hat, Inc.
+ * Copyright (C) 2011 Giovanni Campagna <scampa.giovanni@gmail.com>
  */
 
 /**
@@ -317,7 +305,7 @@ add_wireless_secrets (RequestData *request,
 	if (!key_mgmt)
 		return FALSE;
 
-	if (NM_IN_STRSET (key_mgmt, "wpa-none", "wpa-psk", "sae")) {
+	if (NM_IN_STRSET (key_mgmt, "wpa-psk", "sae")) {
 		secret = _secret_real_new_plain (NM_SECRET_AGENT_SECRET_TYPE_SECRET,
 		                                 _("Password"),
 		                                 NM_SETTING (s_wsec),
diff --git a/clients/common/nm-secret-agent-simple.h b/clients/common/nm-secret-agent-simple.h
index 650b9713..7214203d 100644
--- a/clients/common/nm-secret-agent-simple.h
+++ b/clients/common/nm-secret-agent-simple.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 - 2015 Red Hat, Inc.
+ * Copyright (C) 2013 - 2015 Red Hat, Inc.
  */
 
 #ifndef __NM_SECRET_AGENT_SIMPLE_H__
diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
index 204b7c28..ffae5f55 100644
--- a/clients/common/nm-vpn-helpers.c
+++ b/clients/common/nm-vpn-helpers.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 - 2015 Red Hat, Inc.
+ * Copyright (C) 2013 - 2015 Red Hat, Inc.
  */
 
 /**
@@ -390,13 +378,14 @@ nm_vpn_wireguard_import (const char *filename,
 		return FALSE;
 	}
 
-	if (nm_utils_file_get_contents (-1,
-	                                filename,
-	                                10*1024*1024,
-	                                NM_UTILS_FILE_GET_CONTENTS_FLAG_SECRET,
-	                                &file_content.str,
-	                                &file_content.len,
-	                                error) < 0)
+	if (!nm_utils_file_get_contents (-1,
+	                                 filename,
+	                                 10*1024*1024,
+	                                 NM_UTILS_FILE_GET_CONTENTS_FLAG_SECRET,
+	                                 &file_content.str,
+	                                 &file_content.len,
+	                                 NULL,
+	                                 error))
 		return NULL;
 
 	/* We interpret the file like `wg-quick up` and `wg setconf` do.
diff --git a/clients/common/nm-vpn-helpers.h b/clients/common/nm-vpn-helpers.h
index 90017534..611f09dd 100644
--- a/clients/common/nm-vpn-helpers.h
+++ b/clients/common/nm-vpn-helpers.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 - 2015 Red Hat, Inc.
+ * Copyright (C) 2013 - 2015 Red Hat, Inc.
  */
 
 #ifndef __NM_VPN_HELPERS_H__
diff --git a/clients/common/qrcodegen.c b/clients/common/qrcodegen.c
new file mode 100644
index 00000000..7cda9659
--- /dev/null
+++ b/clients/common/qrcodegen.c
@@ -0,0 +1,1009 @@
+/*
+ * QR Code generator library (C)
+ *
+ * Copyright (c) Project Nayuki. (MIT License)
+ * https://www.nayuki.io/page/qr-code-generator-library
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ * - The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ * - The Software is provided "as is", without warranty of any kind, express or
+ *   implied, including but not limited to the warranties of merchantability,
+ *   fitness for a particular purpose and noninfringement. In no event shall the
+ *   authors or copyright holders be liable for any claim, damages or other
+ *   liability, whether in an action of contract, tort or otherwise, arising from,
+ *   out of or in connection with the Software or the use or other dealings in the
+ *   Software.
+ */
+
+#include <assert.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+#include "qrcodegen.h"
+
+#ifndef QRCODEGEN_TEST
+	#define testable static  // Keep functions private
+#else
+	#define testable  // Expose private functions
+#endif
+
+
+/*---- Forward declarations for private functions ----*/
+
+// Regarding all public and private functions defined in this source file:
+// - They require all pointer/array arguments to be not null unless the array length is zero.
+// - They only read input scalar/array arguments, write to output pointer/array
+//   arguments, and return scalar values; they are "pure" functions.
+// - They don't read mutable global variables or write to any global variables.
+// - They don't perform I/O, read the clock, print to console, etc.
+// - They allocate a small and constant amount of stack memory.
+// - They don't allocate or free any memory on the heap.
+// - They don't recurse or mutually recurse. All the code
+//   could be inlined into the top-level public functions.
+// - They run in at most quadratic time with respect to input arguments.
+//   Most functions run in linear time, and some in constant time.
+//   There are no unbounded loops or non-obvious termination conditions.
+// - They are completely thread-safe if the caller does not give the
+//   same writable buffer to concurrent calls to these functions.
+
+testable void appendBitsToBuffer(unsigned int val, int numBits, uint8_t buffer[], int *bitLen);
+
+testable void addEccAndInterleave(uint8_t data[], int version, enum qrcodegen_Ecc ecl, uint8_t result[]);
+testable int getNumDataCodewords(int version, enum qrcodegen_Ecc ecl);
+testable int getNumRawDataModules(int ver);
+
+testable void calcReedSolomonGenerator(int degree, uint8_t result[]);
+testable void calcReedSolomonRemainder(const uint8_t data[], int dataLen,
+	const uint8_t generator[], int degree, uint8_t result[]);
+testable uint8_t finiteFieldMultiply(uint8_t x, uint8_t y);
+
+testable void initializeFunctionModules(int version, uint8_t qrcode[]);
+static void drawWhiteFunctionModules(uint8_t qrcode[], int version);
+static void drawFormatBits(enum qrcodegen_Ecc ecl, enum qrcodegen_Mask mask, uint8_t qrcode[]);
+testable int getAlignmentPatternPositions(int version, uint8_t result[7]);
+static void fillRectangle(int left, int top, int width, int height, uint8_t qrcode[]);
+
+static void drawCodewords(const uint8_t data[], int dataLen, uint8_t qrcode[]);
+static void applyMask(const uint8_t functionModules[], uint8_t qrcode[], enum qrcodegen_Mask mask);
+static long getPenaltyScore(const uint8_t qrcode[]);
+static void addRunToHistory(unsigned char run, unsigned char history[7]);
+static bool hasFinderLikePattern(unsigned char runHistory[7]);
+
+testable bool getModule(const uint8_t qrcode[], int x, int y);
+testable void setModule(uint8_t qrcode[], int x, int y, bool isBlack);
+testable void setModuleBounded(uint8_t qrcode[], int x, int y, bool isBlack);
+static bool getBit(int x, int i);
+
+testable int calcSegmentBitLength(enum qrcodegen_Mode mode, size_t numChars);
+testable int getTotalBits(const struct qrcodegen_Segment segs[], size_t len, int version);
+static int numCharCountBits(enum qrcodegen_Mode mode, int version);
+
+
+
+/*---- Private tables of constants ----*/
+
+// The set of all legal characters in alphanumeric mode, where each character
+// value maps to the index in the string. For checking text and encoding segments.
+static const char *ALPHANUMERIC_CHARSET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:";
+
+// For generating error correction codes.
+testable const int8_t ECC_CODEWORDS_PER_BLOCK[4][41] = {
+	// Version: (note that index 0 is for padding, and is set to an illegal value)
+	//0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40    Error correction level
+	{-1,  7, 10, 15, 20, 26, 18, 20, 24, 30, 18, 20, 24, 26, 30, 22, 24, 28, 30, 28, 28, 28, 28, 30, 30, 26, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30},  // Low
+	{-1, 10, 16, 26, 18, 24, 16, 18, 22, 22, 26, 30, 22, 22, 24, 24, 28, 28, 26, 26, 26, 26, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28},  // Medium
+	{-1, 13, 22, 18, 26, 18, 24, 18, 22, 20, 24, 28, 26, 24, 20, 30, 24, 28, 28, 26, 30, 28, 30, 30, 30, 30, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30},  // Quartile
+	{-1, 17, 28, 22, 16, 22, 28, 26, 26, 24, 28, 24, 28, 22, 24, 24, 30, 28, 28, 26, 28, 30, 24, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30},  // High
+};
+
+#define qrcodegen_REED_SOLOMON_DEGREE_MAX 30  // Based on the table above
+
+// For generating error correction codes.
+testable const int8_t NUM_ERROR_CORRECTION_BLOCKS[4][41] = {
+	// Version: (note that index 0 is for padding, and is set to an illegal value)
+	//0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40    Error correction level
+	{-1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4,  4,  4,  4,  4,  6,  6,  6,  6,  7,  8,  8,  9,  9, 10, 12, 12, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 24, 25},  // Low
+	{-1, 1, 1, 1, 2, 2, 4, 4, 4, 5, 5,  5,  8,  9,  9, 10, 10, 11, 13, 14, 16, 17, 17, 18, 20, 21, 23, 25, 26, 28, 29, 31, 33, 35, 37, 38, 40, 43, 45, 47, 49},  // Medium
+	{-1, 1, 1, 2, 2, 4, 4, 6, 6, 8, 8,  8, 10, 12, 16, 12, 17, 16, 18, 21, 20, 23, 23, 25, 27, 29, 34, 34, 35, 38, 40, 43, 45, 48, 51, 53, 56, 59, 62, 65, 68},  // Quartile
+	{-1, 1, 1, 2, 4, 4, 4, 5, 6, 8, 8, 11, 11, 16, 16, 18, 16, 19, 21, 25, 25, 25, 34, 30, 32, 35, 37, 40, 42, 45, 48, 51, 54, 57, 60, 63, 66, 70, 74, 77, 81},  // High
+};
+
+// For automatic mask pattern selection.
+static const int PENALTY_N1 =  3;
+static const int PENALTY_N2 =  3;
+static const int PENALTY_N3 = 40;
+static const int PENALTY_N4 = 10;
+
+
+
+/*---- High-level QR Code encoding functions ----*/
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_encodeText(const char *text, uint8_t tempBuffer[], uint8_t qrcode[],
+		enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl) {
+
+	size_t textLen = strlen(text);
+	if (textLen == 0)
+		return qrcodegen_encodeSegmentsAdvanced(NULL, 0, ecl, minVersion, maxVersion, mask, boostEcl, tempBuffer, qrcode);
+	size_t bufLen = qrcodegen_BUFFER_LEN_FOR_VERSION(maxVersion);
+
+	struct qrcodegen_Segment seg;
+	if (qrcodegen_isNumeric(text)) {
+		if (qrcodegen_calcSegmentBufferSize(qrcodegen_Mode_NUMERIC, textLen) > bufLen)
+			goto fail;
+		seg = qrcodegen_makeNumeric(text, tempBuffer);
+	} else if (qrcodegen_isAlphanumeric(text)) {
+		if (qrcodegen_calcSegmentBufferSize(qrcodegen_Mode_ALPHANUMERIC, textLen) > bufLen)
+			goto fail;
+		seg = qrcodegen_makeAlphanumeric(text, tempBuffer);
+	} else {
+		if (textLen > bufLen)
+			goto fail;
+		for (size_t i = 0; i < textLen; i++)
+			tempBuffer[i] = (uint8_t)text[i];
+		seg.mode = qrcodegen_Mode_BYTE;
+		seg.bitLength = calcSegmentBitLength(seg.mode, textLen);
+		if (seg.bitLength == -1)
+			goto fail;
+		seg.numChars = (int)textLen;
+		seg.data = tempBuffer;
+	}
+	return qrcodegen_encodeSegmentsAdvanced(&seg, 1, ecl, minVersion, maxVersion, mask, boostEcl, tempBuffer, qrcode);
+
+fail:
+	qrcode[0] = 0;  // Set size to invalid value for safety
+	return false;
+}
+
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_encodeBinary(uint8_t dataAndTemp[], size_t dataLen, uint8_t qrcode[],
+		enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl) {
+
+	struct qrcodegen_Segment seg;
+	seg.mode = qrcodegen_Mode_BYTE;
+	seg.bitLength = calcSegmentBitLength(seg.mode, dataLen);
+	if (seg.bitLength == -1) {
+		qrcode[0] = 0;  // Set size to invalid value for safety
+		return false;
+	}
+	seg.numChars = (int)dataLen;
+	seg.data = dataAndTemp;
+	return qrcodegen_encodeSegmentsAdvanced(&seg, 1, ecl, minVersion, maxVersion, mask, boostEcl, dataAndTemp, qrcode);
+}
+
+
+// Appends the given number of low-order bits of the given value to the given byte-based
+// bit buffer, increasing the bit length. Requires 0 <= numBits <= 16 and val < 2^numBits.
+testable void appendBitsToBuffer(unsigned int val, int numBits, uint8_t buffer[], int *bitLen) {
+	assert(0 <= numBits && numBits <= 16 && (unsigned long)val >> numBits == 0);
+	for (int i = numBits - 1; i >= 0; i--, (*bitLen)++)
+		buffer[*bitLen >> 3] |= ((val >> i) & 1) << (7 - (*bitLen & 7));
+}
+
+
+
+/*---- Low-level QR Code encoding functions ----*/
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_encodeSegments(const struct qrcodegen_Segment segs[], size_t len,
+		enum qrcodegen_Ecc ecl, uint8_t tempBuffer[], uint8_t qrcode[]) {
+	return qrcodegen_encodeSegmentsAdvanced(segs, len, ecl,
+		qrcodegen_VERSION_MIN, qrcodegen_VERSION_MAX, -1, true, tempBuffer, qrcode);
+}
+
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], size_t len, enum qrcodegen_Ecc ecl,
+		int minVersion, int maxVersion, int mask, bool boostEcl, uint8_t tempBuffer[], uint8_t qrcode[]) {
+	assert(segs != NULL || len == 0);
+	assert(qrcodegen_VERSION_MIN <= minVersion && minVersion <= maxVersion && maxVersion <= qrcodegen_VERSION_MAX);
+	assert(0 <= (int)ecl && (int)ecl <= 3 && -1 <= (int)mask && (int)mask <= 7);
+
+	// Find the minimal version number to use
+	int version, dataUsedBits;
+	for (version = minVersion; ; version++) {
+		int dataCapacityBits = getNumDataCodewords(version, ecl) * 8;  // Number of data bits available
+		dataUsedBits = getTotalBits(segs, len, version);
+		if (dataUsedBits != -1 && dataUsedBits <= dataCapacityBits)
+			break;  // This version number is found to be suitable
+		if (version >= maxVersion) {  // All versions in the range could not fit the given data
+			qrcode[0] = 0;  // Set size to invalid value for safety
+			return false;
+		}
+	}
+	assert(dataUsedBits != -1);
+
+	// Increase the error correction level while the data still fits in the current version number
+	for (int i = (int)qrcodegen_Ecc_MEDIUM; i <= (int)qrcodegen_Ecc_HIGH; i++) {  // From low to high
+		if (boostEcl && dataUsedBits <= getNumDataCodewords(version, (enum qrcodegen_Ecc)i) * 8)
+			ecl = (enum qrcodegen_Ecc)i;
+	}
+
+	// Concatenate all segments to create the data bit string
+	memset(qrcode, 0, qrcodegen_BUFFER_LEN_FOR_VERSION(version) * sizeof(qrcode[0]));
+	int bitLen = 0;
+	for (size_t i = 0; i < len; i++) {
+		const struct qrcodegen_Segment *seg = &segs[i];
+		appendBitsToBuffer((int)seg->mode, 4, qrcode, &bitLen);
+		appendBitsToBuffer(seg->numChars, numCharCountBits(seg->mode, version), qrcode, &bitLen);
+		for (int j = 0; j < seg->bitLength; j++)
+			appendBitsToBuffer((seg->data[j >> 3] >> (7 - (j & 7))) & 1, 1, qrcode, &bitLen);
+	}
+	assert(bitLen == dataUsedBits);
+
+	// Add terminator and pad up to a byte if applicable
+	int dataCapacityBits = getNumDataCodewords(version, ecl) * 8;
+	assert(bitLen <= dataCapacityBits);
+	int terminatorBits = dataCapacityBits - bitLen;
+	if (terminatorBits > 4)
+		terminatorBits = 4;
+	appendBitsToBuffer(0, terminatorBits, qrcode, &bitLen);
+	appendBitsToBuffer(0, (8 - bitLen % 8) % 8, qrcode, &bitLen);
+	assert(bitLen % 8 == 0);
+
+	// Pad with alternating bytes until data capacity is reached
+	for (uint8_t padByte = 0xEC; bitLen < dataCapacityBits; padByte ^= 0xEC ^ 0x11)
+		appendBitsToBuffer(padByte, 8, qrcode, &bitLen);
+
+	// Draw function and data codeword modules
+	addEccAndInterleave(qrcode, version, ecl, tempBuffer);
+	initializeFunctionModules(version, qrcode);
+	drawCodewords(tempBuffer, getNumRawDataModules(version) / 8, qrcode);
+	drawWhiteFunctionModules(qrcode, version);
+	initializeFunctionModules(version, tempBuffer);
+
+	// Handle masking
+	if (mask == qrcodegen_Mask_AUTO) {  // Automatically choose best mask
+		long minPenalty = LONG_MAX;
+		for (int i = 0; i < 8; i++) {
+			enum qrcodegen_Mask msk = (enum qrcodegen_Mask)i;
+			drawFormatBits(ecl, msk, qrcode);
+			applyMask(tempBuffer, qrcode, msk);
+			long penalty = getPenaltyScore(qrcode);
+			if (penalty < minPenalty) {
+				mask = msk;
+				minPenalty = penalty;
+			}
+			applyMask(tempBuffer, qrcode, msk);  // Undoes the mask due to XOR
+		}
+	}
+	assert(0 <= (int)mask && (int)mask <= 7);
+	drawFormatBits(ecl, mask, qrcode);
+	applyMask(tempBuffer, qrcode, mask);
+	return true;
+}
+
+
+
+/*---- Error correction code generation functions ----*/
+
+// Appends error correction bytes to each block of the given data array, then interleaves
+// bytes from the blocks and stores them in the result array. data[0 : dataLen] contains
+// the input data. data[dataLen : rawCodewords] is used as a temporary work area and will
+// be clobbered by this function. The final answer is stored in result[0 : rawCodewords].
+testable void addEccAndInterleave(uint8_t data[], int version, enum qrcodegen_Ecc ecl, uint8_t result[]) {
+	// Calculate parameter numbers
+	assert(0 <= (int)ecl && (int)ecl < 4 && qrcodegen_VERSION_MIN <= version && version <= qrcodegen_VERSION_MAX);
+	int numBlocks = NUM_ERROR_CORRECTION_BLOCKS[(int)ecl][version];
+	int blockEccLen = ECC_CODEWORDS_PER_BLOCK  [(int)ecl][version];
+	int rawCodewords = getNumRawDataModules(version) / 8;
+	int dataLen = getNumDataCodewords(version, ecl);
+	int numShortBlocks = numBlocks - rawCodewords % numBlocks;
+	int shortBlockDataLen = rawCodewords / numBlocks - blockEccLen;
+
+	// Split data into blocks, calculate ECC, and interleave
+	// (not concatenate) the bytes into a single sequence
+	uint8_t generator[qrcodegen_REED_SOLOMON_DEGREE_MAX];
+	calcReedSolomonGenerator(blockEccLen, generator);
+	const uint8_t *dat = data;
+	for (int i = 0; i < numBlocks; i++) {
+		int datLen = shortBlockDataLen + (i < numShortBlocks ? 0 : 1);
+		uint8_t *ecc = &data[dataLen];  // Temporary storage
+		calcReedSolomonRemainder(dat, datLen, generator, blockEccLen, ecc);
+		for (int j = 0, k = i; j < datLen; j++, k += numBlocks) {  // Copy data
+			if (j == shortBlockDataLen)
+				k -= numShortBlocks;
+			result[k] = dat[j];
+		}
+		for (int j = 0, k = dataLen + i; j < blockEccLen; j++, k += numBlocks)  // Copy ECC
+			result[k] = ecc[j];
+		dat += datLen;
+	}
+}
+
+
+// Returns the number of 8-bit codewords that can be used for storing data (not ECC),
+// for the given version number and error correction level. The result is in the range [9, 2956].
+testable int getNumDataCodewords(int version, enum qrcodegen_Ecc ecl) {
+	int v = version, e = (int)ecl;
+	assert(0 <= e && e < 4);
+	return getNumRawDataModules(v) / 8
+		- ECC_CODEWORDS_PER_BLOCK    [e][v]
+		* NUM_ERROR_CORRECTION_BLOCKS[e][v];
+}
+
+
+// Returns the number of data bits that can be stored in a QR Code of the given version number, after
+// all function modules are excluded. This includes remainder bits, so it might not be a multiple of 8.
+// The result is in the range [208, 29648]. This could be implemented as a 40-entry lookup table.
+testable int getNumRawDataModules(int ver) {
+	assert(qrcodegen_VERSION_MIN <= ver && ver <= qrcodegen_VERSION_MAX);
+	int result = (16 * ver + 128) * ver + 64;
+	if (ver >= 2) {
+		int numAlign = ver / 7 + 2;
+		result -= (25 * numAlign - 10) * numAlign - 55;
+		if (ver >= 7)
+			result -= 36;
+	}
+	return result;
+}
+
+
+
+/*---- Reed-Solomon ECC generator functions ----*/
+
+// Calculates the Reed-Solomon generator polynomial of the given degree, storing in result[0 : degree].
+testable void calcReedSolomonGenerator(int degree, uint8_t result[]) {
+	// Start with the monomial x^0
+	assert(1 <= degree && degree <= qrcodegen_REED_SOLOMON_DEGREE_MAX);
+	memset(result, 0, degree * sizeof(result[0]));
+	result[degree - 1] = 1;
+
+	// Compute the product polynomial (x - r^0) * (x - r^1) * (x - r^2) * ... * (x - r^{degree-1}),
+	// drop the highest term, and store the rest of the coefficients in order of descending powers.
+	// Note that r = 0x02, which is a generator element of this field GF(2^8/0x11D).
+	uint8_t root = 1;
+	for (int i = 0; i < degree; i++) {
+		// Multiply the current product by (x - r^i)
+		for (int j = 0; j < degree; j++) {
+			result[j] = finiteFieldMultiply(result[j], root);
+			if (j + 1 < degree)
+				result[j] ^= result[j + 1];
+		}
+		root = finiteFieldMultiply(root, 0x02);
+	}
+}
+
+
+// Calculates the remainder of the polynomial data[0 : dataLen] when divided by the generator[0 : degree], where all
+// polynomials are in big endian and the generator has an implicit leading 1 term, storing the result in result[0 : degree].
+testable void calcReedSolomonRemainder(const uint8_t data[], int dataLen,
+		const uint8_t generator[], int degree, uint8_t result[]) {
+
+	// Perform polynomial division
+	assert(1 <= degree && degree <= qrcodegen_REED_SOLOMON_DEGREE_MAX);
+	memset(result, 0, degree * sizeof(result[0]));
+	for (int i = 0; i < dataLen; i++) {
+		uint8_t factor = data[i] ^ result[0];
+		memmove(&result[0], &result[1], (degree - 1) * sizeof(result[0]));
+		result[degree - 1] = 0;
+		for (int j = 0; j < degree; j++)
+			result[j] ^= finiteFieldMultiply(generator[j], factor);
+	}
+}
+
+#undef qrcodegen_REED_SOLOMON_DEGREE_MAX
+
+
+// Returns the product of the two given field elements modulo GF(2^8/0x11D).
+// All inputs are valid. This could be implemented as a 256*256 lookup table.
+testable uint8_t finiteFieldMultiply(uint8_t x, uint8_t y) {
+	// Russian peasant multiplication
+	uint8_t z = 0;
+	for (int i = 7; i >= 0; i--) {
+		z = (z << 1) ^ ((z >> 7) * 0x11D);
+		z ^= ((y >> i) & 1) * x;
+	}
+	return z;
+}
+
+
+
+/*---- Drawing function modules ----*/
+
+// Clears the given QR Code grid with white modules for the given
+// version's size, then marks every function module as black.
+testable void initializeFunctionModules(int version, uint8_t qrcode[]) {
+	// Initialize QR Code
+	int qrsize = version * 4 + 17;
+	memset(qrcode, 0, ((qrsize * qrsize + 7) / 8 + 1) * sizeof(qrcode[0]));
+	qrcode[0] = (uint8_t)qrsize;
+
+	// Fill horizontal and vertical timing patterns
+	fillRectangle(6, 0, 1, qrsize, qrcode);
+	fillRectangle(0, 6, qrsize, 1, qrcode);
+
+	// Fill 3 finder patterns (all corners except bottom right) and format bits
+	fillRectangle(0, 0, 9, 9, qrcode);
+	fillRectangle(qrsize - 8, 0, 8, 9, qrcode);
+	fillRectangle(0, qrsize - 8, 9, 8, qrcode);
+
+	// Fill numerous alignment patterns
+	uint8_t alignPatPos[7];
+	int numAlign = getAlignmentPatternPositions(version, alignPatPos);
+	for (int i = 0; i < numAlign; i++) {
+		for (int j = 0; j < numAlign; j++) {
+			// Don't draw on the three finder corners
+			if (!((i == 0 && j == 0) || (i == 0 && j == numAlign - 1) || (i == numAlign - 1 && j == 0)))
+				fillRectangle(alignPatPos[i] - 2, alignPatPos[j] - 2, 5, 5, qrcode);
+		}
+	}
+
+	// Fill version blocks
+	if (version >= 7) {
+		fillRectangle(qrsize - 11, 0, 3, 6, qrcode);
+		fillRectangle(0, qrsize - 11, 6, 3, qrcode);
+	}
+}
+
+
+// Draws white function modules and possibly some black modules onto the given QR Code, without changing
+// non-function modules. This does not draw the format bits. This requires all function modules to be previously
+// marked black (namely by initializeFunctionModules()), because this may skip redrawing black function modules.
+static void drawWhiteFunctionModules(uint8_t qrcode[], int version) {
+	// Draw horizontal and vertical timing patterns
+	int qrsize = qrcodegen_getSize(qrcode);
+	for (int i = 7; i < qrsize - 7; i += 2) {
+		setModule(qrcode, 6, i, false);
+		setModule(qrcode, i, 6, false);
+	}
+
+	// Draw 3 finder patterns (all corners except bottom right; overwrites some timing modules)
+	for (int dy = -4; dy <= 4; dy++) {
+		for (int dx = -4; dx <= 4; dx++) {
+			int dist = abs(dx);
+			if (abs(dy) > dist)
+				dist = abs(dy);
+			if (dist == 2 || dist == 4) {
+				setModuleBounded(qrcode, 3 + dx, 3 + dy, false);
+				setModuleBounded(qrcode, qrsize - 4 + dx, 3 + dy, false);
+				setModuleBounded(qrcode, 3 + dx, qrsize - 4 + dy, false);
+			}
+		}
+	}
+
+	// Draw numerous alignment patterns
+	uint8_t alignPatPos[7];
+	int numAlign = getAlignmentPatternPositions(version, alignPatPos);
+	for (int i = 0; i < numAlign; i++) {
+		for (int j = 0; j < numAlign; j++) {
+			if ((i == 0 && j == 0) || (i == 0 && j == numAlign - 1) || (i == numAlign - 1 && j == 0))
+				continue;  // Don't draw on the three finder corners
+			for (int dy = -1; dy <= 1; dy++) {
+				for (int dx = -1; dx <= 1; dx++)
+					setModule(qrcode, alignPatPos[i] + dx, alignPatPos[j] + dy, dx == 0 && dy == 0);
+			}
+		}
+	}
+
+	// Draw version blocks
+	if (version >= 7) {
+		// Calculate error correction code and pack bits
+		int rem = version;  // version is uint6, in the range [7, 40]
+		for (int i = 0; i < 12; i++)
+			rem = (rem << 1) ^ ((rem >> 11) * 0x1F25);
+		long bits = (long)version << 12 | rem;  // uint18
+		assert(bits >> 18 == 0);
+
+		// Draw two copies
+		for (int i = 0; i < 6; i++) {
+			for (int j = 0; j < 3; j++) {
+				int k = qrsize - 11 + j;
+				setModule(qrcode, k, i, (bits & 1) != 0);
+				setModule(qrcode, i, k, (bits & 1) != 0);
+				bits >>= 1;
+			}
+		}
+	}
+}
+
+
+// Draws two copies of the format bits (with its own error correction code) based
+// on the given mask and error correction level. This always draws all modules of
+// the format bits, unlike drawWhiteFunctionModules() which might skip black modules.
+static void drawFormatBits(enum qrcodegen_Ecc ecl, enum qrcodegen_Mask mask, uint8_t qrcode[]) {
+	// Calculate error correction code and pack bits
+	assert(0 <= (int)mask && (int)mask <= 7);
+	static const int table[] = {1, 0, 3, 2};
+	int data = table[(int)ecl] << 3 | (int)mask;  // errCorrLvl is uint2, mask is uint3
+	int rem = data;
+	for (int i = 0; i < 10; i++)
+		rem = (rem << 1) ^ ((rem >> 9) * 0x537);
+	int bits = (data << 10 | rem) ^ 0x5412;  // uint15
+	assert(bits >> 15 == 0);
+
+	// Draw first copy
+	for (int i = 0; i <= 5; i++)
+		setModule(qrcode, 8, i, getBit(bits, i));
+	setModule(qrcode, 8, 7, getBit(bits, 6));
+	setModule(qrcode, 8, 8, getBit(bits, 7));
+	setModule(qrcode, 7, 8, getBit(bits, 8));
+	for (int i = 9; i < 15; i++)
+		setModule(qrcode, 14 - i, 8, getBit(bits, i));
+
+	// Draw second copy
+	int qrsize = qrcodegen_getSize(qrcode);
+	for (int i = 0; i < 8; i++)
+		setModule(qrcode, qrsize - 1 - i, 8, getBit(bits, i));
+	for (int i = 8; i < 15; i++)
+		setModule(qrcode, 8, qrsize - 15 + i, getBit(bits, i));
+	setModule(qrcode, 8, qrsize - 8, true);  // Always black
+}
+
+
+// Calculates and stores an ascending list of positions of alignment patterns
+// for this version number, returning the length of the list (in the range [0,7]).
+// Each position is in the range [0,177), and are used on both the x and y axes.
+// This could be implemented as lookup table of 40 variable-length lists of unsigned bytes.
+testable int getAlignmentPatternPositions(int version, uint8_t result[7]) {
+	if (version == 1)
+		return 0;
+	int numAlign = version / 7 + 2;
+	int step = (version == 32) ? 26 :
+		(version*4 + numAlign*2 + 1) / (numAlign*2 - 2) * 2;
+	for (int i = numAlign - 1, pos = version * 4 + 10; i >= 1; i--, pos -= step)
+		result[i] = pos;
+	result[0] = 6;
+	return numAlign;
+}
+
+
+// Sets every pixel in the range [left : left + width] * [top : top + height] to black.
+static void fillRectangle(int left, int top, int width, int height, uint8_t qrcode[]) {
+	for (int dy = 0; dy < height; dy++) {
+		for (int dx = 0; dx < width; dx++)
+			setModule(qrcode, left + dx, top + dy, true);
+	}
+}
+
+
+
+/*---- Drawing data modules and masking ----*/
+
+// Draws the raw codewords (including data and ECC) onto the given QR Code. This requires the initial state of
+// the QR Code to be black at function modules and white at codeword modules (including unused remainder bits).
+static void drawCodewords(const uint8_t data[], int dataLen, uint8_t qrcode[]) {
+	int qrsize = qrcodegen_getSize(qrcode);
+	int i = 0;  // Bit index into the data
+	// Do the funny zigzag scan
+	for (int right = qrsize - 1; right >= 1; right -= 2) {  // Index of right column in each column pair
+		if (right == 6)
+			right = 5;
+		for (int vert = 0; vert < qrsize; vert++) {  // Vertical counter
+			for (int j = 0; j < 2; j++) {
+				int x = right - j;  // Actual x coordinate
+				bool upward = ((right + 1) & 2) == 0;
+				int y = upward ? qrsize - 1 - vert : vert;  // Actual y coordinate
+				if (!getModule(qrcode, x, y) && i < dataLen * 8) {
+					bool black = getBit(data[i >> 3], 7 - (i & 7));
+					setModule(qrcode, x, y, black);
+					i++;
+				}
+				// If this QR Code has any remainder bits (0 to 7), they were assigned as
+				// 0/false/white by the constructor and are left unchanged by this method
+			}
+		}
+	}
+	assert(i == dataLen * 8);
+}
+
+
+// XORs the codeword modules in this QR Code with the given mask pattern.
+// The function modules must be marked and the codeword bits must be drawn
+// before masking. Due to the arithmetic of XOR, calling applyMask() with
+// the same mask value a second time will undo the mask. A final well-formed
+// QR Code needs exactly one (not zero, two, etc.) mask applied.
+static void applyMask(const uint8_t functionModules[], uint8_t qrcode[], enum qrcodegen_Mask mask) {
+	assert(0 <= (int)mask && (int)mask <= 7);  // Disallows qrcodegen_Mask_AUTO
+	int qrsize = qrcodegen_getSize(qrcode);
+	for (int y = 0; y < qrsize; y++) {
+		for (int x = 0; x < qrsize; x++) {
+			if (getModule(functionModules, x, y))
+				continue;
+			bool invert;
+			switch ((int)mask) {
+				case 0:  invert = (x + y) % 2 == 0;                    break;
+				case 1:  invert = y % 2 == 0;                          break;
+				case 2:  invert = x % 3 == 0;                          break;
+				case 3:  invert = (x + y) % 3 == 0;                    break;
+				case 4:  invert = (x / 3 + y / 2) % 2 == 0;            break;
+				case 5:  invert = x * y % 2 + x * y % 3 == 0;          break;
+				case 6:  invert = (x * y % 2 + x * y % 3) % 2 == 0;    break;
+				case 7:  invert = ((x + y) % 2 + x * y % 3) % 2 == 0;  break;
+				default:  assert(false);  return;
+			}
+			bool val = getModule(qrcode, x, y);
+			setModule(qrcode, x, y, val ^ invert);
+		}
+	}
+}
+
+
+// Calculates and returns the penalty score based on state of the given QR Code's current modules.
+// This is used by the automatic mask choice algorithm to find the mask pattern that yields the lowest score.
+static long getPenaltyScore(const uint8_t qrcode[]) {
+	int qrsize = qrcodegen_getSize(qrcode);
+	long result = 0;
+
+	// Adjacent modules in row having same color, and finder-like patterns
+	for (int y = 0; y < qrsize; y++) {
+		unsigned char runHistory[7] = {0};
+		bool color = false;
+		unsigned char runX = 0;
+		for (int x = 0; x < qrsize; x++) {
+			if (getModule(qrcode, x, y) == color) {
+				runX++;
+				if (runX == 5)
+					result += PENALTY_N1;
+				else if (runX > 5)
+					result++;
+			} else {
+				addRunToHistory(runX, runHistory);
+				if (!color && hasFinderLikePattern(runHistory))
+					result += PENALTY_N3;
+				color = getModule(qrcode, x, y);
+				runX = 1;
+			}
+		}
+		addRunToHistory(runX, runHistory);
+		if (color)
+			addRunToHistory(0, runHistory);  // Dummy run of white
+		if (hasFinderLikePattern(runHistory))
+			result += PENALTY_N3;
+	}
+	// Adjacent modules in column having same color, and finder-like patterns
+	for (int x = 0; x < qrsize; x++) {
+		unsigned char runHistory[7] = {0};
+		bool color = false;
+		unsigned char runY = 0;
+		for (int y = 0; y < qrsize; y++) {
+			if (getModule(qrcode, x, y) == color) {
+				runY++;
+				if (runY == 5)
+					result += PENALTY_N1;
+				else if (runY > 5)
+					result++;
+			} else {
+				addRunToHistory(runY, runHistory);
+				if (!color && hasFinderLikePattern(runHistory))
+					result += PENALTY_N3;
+				color = getModule(qrcode, x, y);
+				runY = 1;
+			}
+		}
+		addRunToHistory(runY, runHistory);
+		if (color)
+			addRunToHistory(0, runHistory);  // Dummy run of white
+		if (hasFinderLikePattern(runHistory))
+			result += PENALTY_N3;
+	}
+
+	// 2*2 blocks of modules having same color
+	for (int y = 0; y < qrsize - 1; y++) {
+		for (int x = 0; x < qrsize - 1; x++) {
+			bool  color = getModule(qrcode, x, y);
+			if (  color == getModule(qrcode, x + 1, y) &&
+			      color == getModule(qrcode, x, y + 1) &&
+			      color == getModule(qrcode, x + 1, y + 1))
+				result += PENALTY_N2;
+		}
+	}
+
+	// Balance of black and white modules
+	int black = 0;
+	for (int y = 0; y < qrsize; y++) {
+		for (int x = 0; x < qrsize; x++) {
+			if (getModule(qrcode, x, y))
+				black++;
+		}
+	}
+	int total = qrsize * qrsize;  // Note that size is odd, so black/total != 1/2
+	// Compute the smallest integer k >= 0 such that (45-5k)% <= black/total <= (55+5k)%
+	int k = (int)((labs(black * 20L - total * 10L) + total - 1) / total) - 1;
+	result += k * PENALTY_N4;
+	return result;
+}
+
+
+// Inserts the given value to the front of the given array, which shifts over the
+// existing values and deletes the last value. A helper function for getPenaltyScore().
+static void addRunToHistory(unsigned char run, unsigned char history[7]) {
+	memmove(&history[1], &history[0], 6 * sizeof(history[0]));
+	history[0] = run;
+}
+
+
+// Tests whether the given run history has the pattern of ratio 1:1:3:1:1 in the middle, and
+// surrounded by at least 4 on either or both ends. A helper function for getPenaltyScore().
+// Must only be called immediately after a run of white modules has ended.
+static bool hasFinderLikePattern(unsigned char runHistory[7]) {
+	unsigned char n = runHistory[1];
+	// The maximum QR Code size is 177, hence the run length n <= 177.
+	// Arithmetic is promoted to int, so n*4 will not overflow.
+	return n > 0 && runHistory[2] == n && runHistory[4] == n && runHistory[5] == n
+		&& runHistory[3] == n * 3 && (runHistory[0] >= n * 4 || runHistory[6] >= n * 4);
+}
+
+
+
+/*---- Basic QR Code information ----*/
+
+// Public function - see documentation comment in header file.
+int qrcodegen_getSize(const uint8_t qrcode[]) {
+	assert(qrcode != NULL);
+	int result = qrcode[0];
+	assert((qrcodegen_VERSION_MIN * 4 + 17) <= result
+		&& result <= (qrcodegen_VERSION_MAX * 4 + 17));
+	return result;
+}
+
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_getModule(const uint8_t qrcode[], int x, int y) {
+	assert(qrcode != NULL);
+	int qrsize = qrcode[0];
+	return (0 <= x && x < qrsize && 0 <= y && y < qrsize) && getModule(qrcode, x, y);
+}
+
+
+// Gets the module at the given coordinates, which must be in bounds.
+testable bool getModule(const uint8_t qrcode[], int x, int y) {
+	int qrsize = qrcode[0];
+	assert(21 <= qrsize && qrsize <= 177 && 0 <= x && x < qrsize && 0 <= y && y < qrsize);
+	int index = y * qrsize + x;
+	return getBit(qrcode[(index >> 3) + 1], index & 7);
+}
+
+
+// Sets the module at the given coordinates, which must be in bounds.
+testable void setModule(uint8_t qrcode[], int x, int y, bool isBlack) {
+	int qrsize = qrcode[0];
+	assert(21 <= qrsize && qrsize <= 177 && 0 <= x && x < qrsize && 0 <= y && y < qrsize);
+	int index = y * qrsize + x;
+	int bitIndex = index & 7;
+	int byteIndex = (index >> 3) + 1;
+	if (isBlack)
+		qrcode[byteIndex] |= 1 << bitIndex;
+	else
+		qrcode[byteIndex] &= (1 << bitIndex) ^ 0xFF;
+}
+
+
+// Sets the module at the given coordinates, doing nothing if out of bounds.
+testable void setModuleBounded(uint8_t qrcode[], int x, int y, bool isBlack) {
+	int qrsize = qrcode[0];
+	if (0 <= x && x < qrsize && 0 <= y && y < qrsize)
+		setModule(qrcode, x, y, isBlack);
+}
+
+
+// Returns true iff the i'th bit of x is set to 1. Requires x >= 0 and 0 <= i <= 14.
+static bool getBit(int x, int i) {
+	return ((x >> i) & 1) != 0;
+}
+
+
+
+/*---- Segment handling ----*/
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_isAlphanumeric(const char *text) {
+	assert(text != NULL);
+	for (; *text != '\0'; text++) {
+		if (strchr(ALPHANUMERIC_CHARSET, *text) == NULL)
+			return false;
+	}
+	return true;
+}
+
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_isNumeric(const char *text) {
+	assert(text != NULL);
+	for (; *text != '\0'; text++) {
+		if (*text < '0' || *text > '9')
+			return false;
+	}
+	return true;
+}
+
+
+// Public function - see documentation comment in header file.
+size_t qrcodegen_calcSegmentBufferSize(enum qrcodegen_Mode mode, size_t numChars) {
+	int temp = calcSegmentBitLength(mode, numChars);
+	if (temp == -1)
+		return SIZE_MAX;
+	assert(0 <= temp && temp <= INT16_MAX);
+	return ((size_t)temp + 7) / 8;
+}
+
+
+// Returns the number of data bits needed to represent a segment
+// containing the given number of characters using the given mode. Notes:
+// - Returns -1 on failure, i.e. numChars > INT16_MAX or
+//   the number of needed bits exceeds INT16_MAX (i.e. 32767).
+// - Otherwise, all valid results are in the range [0, INT16_MAX].
+// - For byte mode, numChars measures the number of bytes, not Unicode code points.
+// - For ECI mode, numChars must be 0, and the worst-case number of bits is returned.
+//   An actual ECI segment can have shorter data. For non-ECI modes, the result is exact.
+testable int calcSegmentBitLength(enum qrcodegen_Mode mode, size_t numChars) {
+	// All calculations are designed to avoid overflow on all platforms
+	if (numChars > (unsigned int)INT16_MAX)
+		return -1;
+	long result = (long)numChars;
+	if (mode == qrcodegen_Mode_NUMERIC)
+		result = (result * 10 + 2) / 3;  // ceil(10/3 * n)
+	else if (mode == qrcodegen_Mode_ALPHANUMERIC)
+		result = (result * 11 + 1) / 2;  // ceil(11/2 * n)
+	else if (mode == qrcodegen_Mode_BYTE)
+		result *= 8;
+	else if (mode == qrcodegen_Mode_KANJI)
+		result *= 13;
+	else if (mode == qrcodegen_Mode_ECI && numChars == 0)
+		result = 3 * 8;
+	else {  // Invalid argument
+		assert(false);
+		return -1;
+	}
+	assert(result >= 0);
+	if (result > (unsigned int)INT16_MAX)
+		return -1;
+	return (int)result;
+}
+
+
+// Public function - see documentation comment in header file.
+struct qrcodegen_Segment qrcodegen_makeBytes(const uint8_t data[], size_t len, uint8_t buf[]) {
+	assert(data != NULL || len == 0);
+	struct qrcodegen_Segment result;
+	result.mode = qrcodegen_Mode_BYTE;
+	result.bitLength = calcSegmentBitLength(result.mode, len);
+	assert(result.bitLength != -1);
+	result.numChars = (int)len;
+	if (len > 0)
+		memcpy(buf, data, len * sizeof(buf[0]));
+	result.data = buf;
+	return result;
+}
+
+
+// Public function - see documentation comment in header file.
+struct qrcodegen_Segment qrcodegen_makeNumeric(const char *digits, uint8_t buf[]) {
+	assert(digits != NULL);
+	struct qrcodegen_Segment result;
+	size_t len = strlen(digits);
+	result.mode = qrcodegen_Mode_NUMERIC;
+	int bitLen = calcSegmentBitLength(result.mode, len);
+	assert(bitLen != -1);
+	result.numChars = (int)len;
+	if (bitLen > 0)
+		memset(buf, 0, ((size_t)bitLen + 7) / 8 * sizeof(buf[0]));
+	result.bitLength = 0;
+
+	unsigned int accumData = 0;
+	int accumCount = 0;
+	for (; *digits != '\0'; digits++) {
+		char c = *digits;
+		assert('0' <= c && c <= '9');
+		accumData = accumData * 10 + (unsigned int)(c - '0');
+		accumCount++;
+		if (accumCount == 3) {
+			appendBitsToBuffer(accumData, 10, buf, &result.bitLength);
+			accumData = 0;
+			accumCount = 0;
+		}
+	}
+	if (accumCount > 0)  // 1 or 2 digits remaining
+		appendBitsToBuffer(accumData, accumCount * 3 + 1, buf, &result.bitLength);
+	assert(result.bitLength == bitLen);
+	result.data = buf;
+	return result;
+}
+
+
+// Public function - see documentation comment in header file.
+struct qrcodegen_Segment qrcodegen_makeAlphanumeric(const char *text, uint8_t buf[]) {
+	assert(text != NULL);
+	struct qrcodegen_Segment result;
+	size_t len = strlen(text);
+	result.mode = qrcodegen_Mode_ALPHANUMERIC;
+	int bitLen = calcSegmentBitLength(result.mode, len);
+	assert(bitLen != -1);
+	result.numChars = (int)len;
+	if (bitLen > 0)
+		memset(buf, 0, ((size_t)bitLen + 7) / 8 * sizeof(buf[0]));
+	result.bitLength = 0;
+
+	unsigned int accumData = 0;
+	int accumCount = 0;
+	for (; *text != '\0'; text++) {
+		const char *temp = strchr(ALPHANUMERIC_CHARSET, *text);
+		assert(temp != NULL);
+		accumData = accumData * 45 + (unsigned int)(temp - ALPHANUMERIC_CHARSET);
+		accumCount++;
+		if (accumCount == 2) {
+			appendBitsToBuffer(accumData, 11, buf, &result.bitLength);
+			accumData = 0;
+			accumCount = 0;
+		}
+	}
+	if (accumCount > 0)  // 1 character remaining
+		appendBitsToBuffer(accumData, 6, buf, &result.bitLength);
+	assert(result.bitLength == bitLen);
+	result.data = buf;
+	return result;
+}
+
+
+// Public function - see documentation comment in header file.
+struct qrcodegen_Segment qrcodegen_makeEci(long assignVal, uint8_t buf[]) {
+	struct qrcodegen_Segment result;
+	result.mode = qrcodegen_Mode_ECI;
+	result.numChars = 0;
+	result.bitLength = 0;
+	if (assignVal < 0)
+		assert(false);
+	else if (assignVal < (1 << 7)) {
+		memset(buf, 0, 1 * sizeof(buf[0]));
+		appendBitsToBuffer(assignVal, 8, buf, &result.bitLength);
+	} else if (assignVal < (1 << 14)) {
+		memset(buf, 0, 2 * sizeof(buf[0]));
+		appendBitsToBuffer(2, 2, buf, &result.bitLength);
+		appendBitsToBuffer(assignVal, 14, buf, &result.bitLength);
+	} else if (assignVal < 1000000L) {
+		memset(buf, 0, 3 * sizeof(buf[0]));
+		appendBitsToBuffer(6, 3, buf, &result.bitLength);
+		appendBitsToBuffer(assignVal >> 10, 11, buf, &result.bitLength);
+		appendBitsToBuffer(assignVal & 0x3FF, 10, buf, &result.bitLength);
+	} else
+		assert(false);
+	result.data = buf;
+	return result;
+}
+
+
+// Calculates the number of bits needed to encode the given segments at the given version.
+// Returns a non-negative number if successful. Otherwise returns -1 if a segment has too
+// many characters to fit its length field, or the total bits exceeds INT16_MAX.
+testable int getTotalBits(const struct qrcodegen_Segment segs[], size_t len, int version) {
+	assert(segs != NULL || len == 0);
+	long result = 0;
+	for (size_t i = 0; i < len; i++) {
+		int numChars  = segs[i].numChars;
+		int bitLength = segs[i].bitLength;
+		assert(0 <= numChars  && numChars  <= INT16_MAX);
+		assert(0 <= bitLength && bitLength <= INT16_MAX);
+		int ccbits = numCharCountBits(segs[i].mode, version);
+		assert(0 <= ccbits && ccbits <= 16);
+		if (numChars >= (1L << ccbits))
+			return -1;  // The segment's length doesn't fit the field's bit width
+		result += 4L + ccbits + bitLength;
+		if (result > INT16_MAX)
+			return -1;  // The sum might overflow an int type
+	}
+	assert(0 <= result && result <= INT16_MAX);
+	return (int)result;
+}
+
+
+// Returns the bit width of the character count field for a segment in the given mode
+// in a QR Code at the given version number. The result is in the range [0, 16].
+static int numCharCountBits(enum qrcodegen_Mode mode, int version) {
+	assert(qrcodegen_VERSION_MIN <= version && version <= qrcodegen_VERSION_MAX);
+	int i = (version + 7) / 17;
+	switch (mode) {
+		case qrcodegen_Mode_NUMERIC     : { static const int temp[] = {10, 12, 14}; return temp[i]; }
+		case qrcodegen_Mode_ALPHANUMERIC: { static const int temp[] = { 9, 11, 13}; return temp[i]; }
+		case qrcodegen_Mode_BYTE        : { static const int temp[] = { 8, 16, 16}; return temp[i]; }
+		case qrcodegen_Mode_KANJI       : { static const int temp[] = { 8, 10, 12}; return temp[i]; }
+		case qrcodegen_Mode_ECI         : return 0;
+		default:  assert(false);  return -1;  // Dummy value
+	}
+}
diff --git a/clients/common/qrcodegen.h b/clients/common/qrcodegen.h
new file mode 100644
index 00000000..55e2bfec
--- /dev/null
+++ b/clients/common/qrcodegen.h
@@ -0,0 +1,311 @@
+/*
+ * QR Code generator library (C)
+ *
+ * Copyright (c) Project Nayuki. (MIT License)
+ * https://www.nayuki.io/page/qr-code-generator-library
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ * - The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ * - The Software is provided "as is", without warranty of any kind, express or
+ *   implied, including but not limited to the warranties of merchantability,
+ *   fitness for a particular purpose and noninfringement. In no event shall the
+ *   authors or copyright holders be liable for any claim, damages or other
+ *   liability, whether in an action of contract, tort or otherwise, arising from,
+ *   out of or in connection with the Software or the use or other dealings in the
+ *   Software.
+ */
+
+#pragma once
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*
+ * This library creates QR Code symbols, which is a type of two-dimension barcode.
+ * Invented by Denso Wave and described in the ISO/IEC 18004 standard.
+ * A QR Code structure is an immutable square grid of black and white cells.
+ * The library provides functions to create a QR Code from text or binary data.
+ * The library covers the QR Code Model 2 specification, supporting all versions (sizes)
+ * from 1 to 40, all 4 error correction levels, and 4 character encoding modes.
+ *
+ * Ways to create a QR Code object:
+ * - High level: Take the payload data and call qrcodegen_encodeText() or qrcodegen_encodeBinary().
+ * - Low level: Custom-make the list of segments and call
+ *   qrcodegen_encodeSegments() or qrcodegen_encodeSegmentsAdvanced().
+ * (Note that all ways require supplying the desired error correction level and various byte buffers.)
+ */
+
+
+/*---- Enum and struct types----*/
+
+/*
+ * The error correction level in a QR Code symbol.
+ */
+enum qrcodegen_Ecc {
+	// Must be declared in ascending order of error protection
+	// so that an internal qrcodegen function works properly
+	qrcodegen_Ecc_LOW = 0 ,  // The QR Code can tolerate about  7% erroneous codewords
+	qrcodegen_Ecc_MEDIUM  ,  // The QR Code can tolerate about 15% erroneous codewords
+	qrcodegen_Ecc_QUARTILE,  // The QR Code can tolerate about 25% erroneous codewords
+	qrcodegen_Ecc_HIGH    ,  // The QR Code can tolerate about 30% erroneous codewords
+};
+
+
+/*
+ * The mask pattern used in a QR Code symbol.
+ */
+enum qrcodegen_Mask {
+	// A special value to tell the QR Code encoder to
+	// automatically select an appropriate mask pattern
+	qrcodegen_Mask_AUTO = -1,
+	// The eight actual mask patterns
+	qrcodegen_Mask_0 = 0,
+	qrcodegen_Mask_1,
+	qrcodegen_Mask_2,
+	qrcodegen_Mask_3,
+	qrcodegen_Mask_4,
+	qrcodegen_Mask_5,
+	qrcodegen_Mask_6,
+	qrcodegen_Mask_7,
+};
+
+
+/*
+ * Describes how a segment's data bits are interpreted.
+ */
+enum qrcodegen_Mode {
+	qrcodegen_Mode_NUMERIC      = 0x1,
+	qrcodegen_Mode_ALPHANUMERIC = 0x2,
+	qrcodegen_Mode_BYTE         = 0x4,
+	qrcodegen_Mode_KANJI        = 0x8,
+	qrcodegen_Mode_ECI          = 0x7,
+};
+
+
+/*
+ * A segment of character/binary/control data in a QR Code symbol.
+ * The mid-level way to create a segment is to take the payload data
+ * and call a factory function such as qrcodegen_makeNumeric().
+ * The low-level way to create a segment is to custom-make the bit buffer
+ * and initialize a qrcodegen_Segment struct with appropriate values.
+ * Even in the most favorable conditions, a QR Code can only hold 7089 characters of data.
+ * Any segment longer than this is meaningless for the purpose of generating QR Codes.
+ * Moreover, the maximum allowed bit length is 32767 because
+ * the largest QR Code (version 40) has 31329 modules.
+ */
+struct qrcodegen_Segment {
+	// The mode indicator of this segment.
+	enum qrcodegen_Mode mode;
+
+	// The length of this segment's unencoded data. Measured in characters for
+	// numeric/alphanumeric/kanji mode, bytes for byte mode, and 0 for ECI mode.
+	// Always zero or positive. Not the same as the data's bit length.
+	int numChars;
+
+	// The data bits of this segment, packed in bitwise big endian.
+	// Can be null if the bit length is zero.
+	uint8_t *data;
+
+	// The number of valid data bits used in the buffer. Requires
+	// 0 <= bitLength <= 32767, and bitLength <= (capacity of data array) * 8.
+	// The character count (numChars) must agree with the mode and the bit buffer length.
+	int bitLength;
+};
+
+
+
+/*---- Macro constants and functions ----*/
+
+#define qrcodegen_VERSION_MIN   1  // The minimum version number supported in the QR Code Model 2 standard
+#define qrcodegen_VERSION_MAX  40  // The maximum version number supported in the QR Code Model 2 standard
+
+// Calculates the number of bytes needed to store any QR Code up to and including the given version number,
+// as a compile-time constant. For example, 'uint8_t buffer[qrcodegen_BUFFER_LEN_FOR_VERSION(25)];'
+// can store any single QR Code from version 1 to 25 (inclusive). The result fits in an int (or int16).
+// Requires qrcodegen_VERSION_MIN <= n <= qrcodegen_VERSION_MAX.
+#define qrcodegen_BUFFER_LEN_FOR_VERSION(n)  ((((n) * 4 + 17) * ((n) * 4 + 17) + 7) / 8 + 1)
+
+// The worst-case number of bytes needed to store one QR Code, up to and including
+// version 40. This value equals 3918, which is just under 4 kilobytes.
+// Use this more convenient value to avoid calculating tighter memory bounds for buffers.
+#define qrcodegen_BUFFER_LEN_MAX  qrcodegen_BUFFER_LEN_FOR_VERSION(qrcodegen_VERSION_MAX)
+
+
+
+/*---- Functions (high level) to generate QR Codes ----*/
+
+/*
+ * Encodes the given text string to a QR Code, returning true if encoding succeeded.
+ * If the data is too long to fit in any version in the given range
+ * at the given ECC level, then false is returned.
+ * - The input text must be encoded in UTF-8 and contain no NULs.
+ * - The variables ecl and mask must correspond to enum constant values.
+ * - Requires 1 <= minVersion <= maxVersion <= 40.
+ * - The arrays tempBuffer and qrcode must each have a length
+ *   of at least qrcodegen_BUFFER_LEN_FOR_VERSION(maxVersion).
+ * - After the function returns, tempBuffer contains no useful data.
+ * - If successful, the resulting QR Code may use numeric,
+ *   alphanumeric, or byte mode to encode the text.
+ * - In the most optimistic case, a QR Code at version 40 with low ECC
+ *   can hold any UTF-8 string up to 2953 bytes, or any alphanumeric string
+ *   up to 4296 characters, or any digit string up to 7089 characters.
+ *   These numbers represent the hard upper limit of the QR Code standard.
+ * - Please consult the QR Code specification for information on
+ *   data capacities per version, ECC level, and text encoding mode.
+ */
+bool qrcodegen_encodeText(const char *text, uint8_t tempBuffer[], uint8_t qrcode[],
+	enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl);
+
+
+/*
+ * Encodes the given binary data to a QR Code, returning true if encoding succeeded.
+ * If the data is too long to fit in any version in the given range
+ * at the given ECC level, then false is returned.
+ * - The input array range dataAndTemp[0 : dataLen] should normally be
+ *   valid UTF-8 text, but is not required by the QR Code standard.
+ * - The variables ecl and mask must correspond to enum constant values.
+ * - Requires 1 <= minVersion <= maxVersion <= 40.
+ * - The arrays dataAndTemp and qrcode must each have a length
+ *   of at least qrcodegen_BUFFER_LEN_FOR_VERSION(maxVersion).
+ * - After the function returns, the contents of dataAndTemp may have changed,
+ *   and does not represent useful data anymore.
+ * - If successful, the resulting QR Code will use byte mode to encode the data.
+ * - In the most optimistic case, a QR Code at version 40 with low ECC can hold any byte
+ *   sequence up to length 2953. This is the hard upper limit of the QR Code standard.
+ * - Please consult the QR Code specification for information on
+ *   data capacities per version, ECC level, and text encoding mode.
+ */
+bool qrcodegen_encodeBinary(uint8_t dataAndTemp[], size_t dataLen, uint8_t qrcode[],
+	enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl);
+
+
+/*---- Functions (low level) to generate QR Codes ----*/
+
+/*
+ * Renders a QR Code representing the given segments at the given error correction level.
+ * The smallest possible QR Code version is automatically chosen for the output. Returns true if
+ * QR Code creation succeeded, or false if the data is too long to fit in any version. The ECC level
+ * of the result may be higher than the ecl argument if it can be done without increasing the version.
+ * This function allows the user to create a custom sequence of segments that switches
+ * between modes (such as alphanumeric and byte) to encode text in less space.
+ * This is a low-level API; the high-level API is qrcodegen_encodeText() and qrcodegen_encodeBinary().
+ * To save memory, the segments' data buffers can alias/overlap tempBuffer, and will
+ * result in them being clobbered, but the QR Code output will still be correct.
+ * But the qrcode array must not overlap tempBuffer or any segment's data buffer.
+ */
+bool qrcodegen_encodeSegments(const struct qrcodegen_Segment segs[], size_t len,
+	enum qrcodegen_Ecc ecl, uint8_t tempBuffer[], uint8_t qrcode[]);
+
+
+/*
+ * Renders a QR Code representing the given segments with the given encoding parameters.
+ * Returns true if QR Code creation succeeded, or false if the data is too long to fit in the range of versions.
+ * The smallest possible QR Code version within the given range is automatically
+ * chosen for the output. Iff boostEcl is true, then the ECC level of the result
+ * may be higher than the ecl argument if it can be done without increasing the
+ * version. The mask number is either between 0 to 7 (inclusive) to force that
+ * mask, or -1 to automatically choose an appropriate mask (which may be slow).
+ * This function allows the user to create a custom sequence of segments that switches
+ * between modes (such as alphanumeric and byte) to encode text in less space.
+ * This is a low-level API; the high-level API is qrcodegen_encodeText() and qrcodegen_encodeBinary().
+ * To save memory, the segments' data buffers can alias/overlap tempBuffer, and will
+ * result in them being clobbered, but the QR Code output will still be correct.
+ * But the qrcode array must not overlap tempBuffer or any segment's data buffer.
+ */
+bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], size_t len, enum qrcodegen_Ecc ecl,
+	int minVersion, int maxVersion, int mask, bool boostEcl, uint8_t tempBuffer[], uint8_t qrcode[]);
+
+
+/*
+ * Tests whether the given string can be encoded as a segment in alphanumeric mode.
+ * A string is encodable iff each character is in the following set: 0 to 9, A to Z
+ * (uppercase only), space, dollar, percent, asterisk, plus, hyphen, period, slash, colon.
+ */
+bool qrcodegen_isAlphanumeric(const char *text);
+
+
+/*
+ * Tests whether the given string can be encoded as a segment in numeric mode.
+ * A string is encodable iff each character is in the range 0 to 9.
+ */
+bool qrcodegen_isNumeric(const char *text);
+
+
+/*
+ * Returns the number of bytes (uint8_t) needed for the data buffer of a segment
+ * containing the given number of characters using the given mode. Notes:
+ * - Returns SIZE_MAX on failure, i.e. numChars > INT16_MAX or
+ *   the number of needed bits exceeds INT16_MAX (i.e. 32767).
+ * - Otherwise, all valid results are in the range [0, ceil(INT16_MAX / 8)], i.e. at most 4096.
+ * - It is okay for the user to allocate more bytes for the buffer than needed.
+ * - For byte mode, numChars measures the number of bytes, not Unicode code points.
+ * - For ECI mode, numChars must be 0, and the worst-case number of bytes is returned.
+ *   An actual ECI segment can have shorter data. For non-ECI modes, the result is exact.
+ */
+size_t qrcodegen_calcSegmentBufferSize(enum qrcodegen_Mode mode, size_t numChars);
+
+
+/*
+ * Returns a segment representing the given binary data encoded in
+ * byte mode. All input byte arrays are acceptable. Any text string
+ * can be converted to UTF-8 bytes and encoded as a byte mode segment.
+ */
+struct qrcodegen_Segment qrcodegen_makeBytes(const uint8_t data[], size_t len, uint8_t buf[]);
+
+
+/*
+ * Returns a segment representing the given string of decimal digits encoded in numeric mode.
+ */
+struct qrcodegen_Segment qrcodegen_makeNumeric(const char *digits, uint8_t buf[]);
+
+
+/*
+ * Returns a segment representing the given text string encoded in alphanumeric mode.
+ * The characters allowed are: 0 to 9, A to Z (uppercase only), space,
+ * dollar, percent, asterisk, plus, hyphen, period, slash, colon.
+ */
+struct qrcodegen_Segment qrcodegen_makeAlphanumeric(const char *text, uint8_t buf[]);
+
+
+/*
+ * Returns a segment representing an Extended Channel Interpretation
+ * (ECI) designator with the given assignment value.
+ */
+struct qrcodegen_Segment qrcodegen_makeEci(long assignVal, uint8_t buf[]);
+
+
+/*---- Functions to extract raw data from QR Codes ----*/
+
+/*
+ * Returns the side length of the given QR Code, assuming that encoding succeeded.
+ * The result is in the range [21, 177]. Note that the length of the array buffer
+ * is related to the side length - every 'uint8_t qrcode[]' must have length at least
+ * qrcodegen_BUFFER_LEN_FOR_VERSION(version), which equals ceil(size^2 / 8 + 1).
+ */
+int qrcodegen_getSize(const uint8_t qrcode[]);
+
+
+/*
+ * Returns the color of the module (pixel) at the given coordinates, which is false
+ * for white or true for black. The top left corner has the coordinates (x=0, y=0).
+ * If the given coordinates are out of bounds, then false (white) is returned.
+ */
+bool qrcodegen_getModule(const uint8_t qrcode[], int x, int y);
+
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/clients/common/settings-docs.h b/clients/common/settings-docs.h
index b81cee71..f696ca82 100644
--- a/clients/common/settings-docs.h
+++ b/clients/common/settings-docs.h
@@ -24,7 +24,7 @@
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_AUTH_ALG N_("When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the 802.11 authentication algorithm required by the AP here.  One of \"open\" for Open System, \"shared\" for Shared Key, or \"leap\" for Cisco LEAP.  When using Cisco LEAP (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\") the \"leap-username\" and \"leap-password\" properties must be specified.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_FILS N_("Indicates whether Fast Initial Link Setup (802.11ai) must be enabled for the connection.  One of NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (use global default value), NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) (disable FILS), NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (enable FILS if the supplicant and the access point support it) or NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (enable FILS and fail if not supported).  When set to NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) and no global default is set, FILS will be optionally enabled.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_GROUP N_("A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list.  For maximum compatibility leave this property empty.  Each list element may be one of \"wep40\", \"wep104\", \"tkip\", or \"ccmp\".")
-#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_KEY_MGMT N_("Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure WPA-PSK), \"sae\" (SAE) or \"wpa-eap\" (WPA-Enterprise). This property must be set for any Wi-Fi connection that uses security.")
+#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_KEY_MGMT N_("Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x\" (Dynamic WEP), \"wpa-psk\" (infrastructure WPA-PSK), \"sae\" (SAE) or \"wpa-eap\" (WPA-Enterprise).  This property must be set for any Wi-Fi connection that uses security.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD N_("The login password for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\").")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS N_("Flags indicating how to handle the \"leap-password\" property.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME N_("The login username for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\").")
@@ -65,8 +65,8 @@
 #define DESCRIBE_DOC_NM_SETTING_802_1X_PHASE1_PEAPLABEL N_("Forces use of the new PEAP label during key derivation.  Some RADIUS servers may require forcing the new PEAP label to interoperate with PEAPv1.  Set to \"1\" to force use of the new PEAP label.  See the wpa_supplicant documentation for more details.")
 #define DESCRIBE_DOC_NM_SETTING_802_1X_PHASE1_PEAPVER N_("Forces which PEAP version is used when PEAP is set as the EAP method in the \"eap\" property.  When unset, the version reported by the server will be used.  Sometimes when using older RADIUS servers, it is necessary to force the client to use a particular PEAP version.  To do so, this property may be set to \"0\" or \"1\" to force that specific PEAP version.")
 #define DESCRIBE_DOC_NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES N_("List of strings to be matched against the altSubjectName of the certificate presented by the authentication server during the inner \"phase 2\" authentication. If the list is empty, no verification of the server certificate's altSubjectName is performed.")
-#define DESCRIBE_DOC_NM_SETTING_802_1X_PHASE2_AUTH N_("Specifies the allowed \"phase 2\" inner non-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the \"eap\" property.  Recognized non-EAP \"phase 2\" methods are \"pap\", \"chap\", \"mschap\", \"mschapv2\", \"gtc\", \"otp\", \"md5\", and \"tls\". Each \"phase 2\" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.")
-#define DESCRIBE_DOC_NM_SETTING_802_1X_PHASE2_AUTHEAP N_("Specifies the allowed \"phase 2\" inner EAP-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the \"eap\" property.  Recognized EAP-based \"phase 2\" methods are \"md5\", \"mschapv2\", \"otp\", \"gtc\", and \"tls\". Each \"phase 2\" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.")
+#define DESCRIBE_DOC_NM_SETTING_802_1X_PHASE2_AUTH N_("Specifies the allowed \"phase 2\" inner non-EAP authentication method when an EAP method that uses an inner TLS tunnel is specified in the \"eap\" property.  Recognized non-EAP \"phase 2\" methods are \"pap\", \"chap\", \"mschap\", \"mschapv2\", \"gtc\", \"otp\", \"md5\", and \"tls\". Each \"phase 2\" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.")
+#define DESCRIBE_DOC_NM_SETTING_802_1X_PHASE2_AUTHEAP N_("Specifies the allowed \"phase 2\" inner EAP-based authentication method when an EAP method that uses an inner TLS tunnel is specified in the \"eap\" property.  Recognized EAP-based \"phase 2\" methods are \"md5\", \"mschapv2\", \"otp\", \"gtc\", and \"tls\". Each \"phase 2\" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.")
 #define DESCRIBE_DOC_NM_SETTING_802_1X_PHASE2_CA_CERT N_("Contains the \"phase 2\" CA certificate if used by the EAP method specified in the \"phase2-auth\" or \"phase2-autheap\" properties. Certificate data is specified using a \"scheme\"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string \"file://\" and ending with a terminating NUL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.")
 #define DESCRIBE_DOC_NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD N_("The password used to access the \"phase2\" CA certificate stored in \"phase2-ca-cert\" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.")
 #define DESCRIBE_DOC_NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS N_("Flags indicating how to handle the \"phase2-ca-cert-password\" property.")
@@ -171,6 +171,7 @@
 #define DESCRIBE_DOC_NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH N_("An array of 8 boolean values, where the array index corresponds to the User Priority (0 - 7) and the value indicates whether or not the priority may use all of the bandwidth allocated to its assigned group.")
 #define DESCRIBE_DOC_NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS N_("An array of 8 uint values, where the array index corresponds to the User Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which the priority is mapped.")
 #define DESCRIBE_DOC_NM_SETTING_GSM_APN N_("The GPRS Access Point Name specifying the APN used when establishing a data session with the GSM-based network.  The APN often determines how the user will be billed for their network usage and whether the user has access to the Internet or just a provider-specific walled-garden, so it is important to use the correct APN for the user's mobile broadband plan. The APN may only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section 14.9.")
+#define DESCRIBE_DOC_NM_SETTING_GSM_AUTO_CONFIG N_("When TRUE, the settings such as APN, username, or password will default to values that match the network the modem will register to in the Mobile Broadband Provider database.")
 #define DESCRIBE_DOC_NM_SETTING_GSM_DEVICE_ID N_("The device unique identifier (as given by the WWAN management service) which this connection applies to.  If given, the connection will only apply to the specified device.")
 #define DESCRIBE_DOC_NM_SETTING_GSM_HOME_ONLY N_("When TRUE, only connections to the home network will be allowed. Connections to roaming networks will not be made.")
 #define DESCRIBE_DOC_NM_SETTING_GSM_MTU N_("If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.")
@@ -206,6 +207,8 @@
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value \"duid\" generates a RFC4361-compliant client identifier based on a hash of the interface name as IAID and /etc/machine-id. The special value \"stable\" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the \"${DEVICE}\" or \"${MAC}\" specifier to get a per-device key. If unset, a globally configured default is used. If still unset, the default depends on the DHCP plugin.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_FQDN N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-hostname\" are mutually exclusive and cannot be set at the same time.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME_FLAGS N_("Flags for the DHCP hostname and FQDN. Currently this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4).  When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_IAID N_("A string containing the \"Identity Association Identifier\" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among \"mac\", \"perm-mac\", \"ifname\" and \"stable\". When set to \"mac\" (or \"perm-mac\"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to \"ifname\", the IAID is computed by hashing the interface name. The special value \"stable\" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be \"ifname\". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS N_("Array of IP addresses of DNS servers.")
@@ -226,6 +229,8 @@
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DAD_TIMEOUT N_("Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero).  A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DUID N_("A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value \"lease\" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and \"dhclient\" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values \"llt\" and \"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values \"stable-llt\", \"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. You may want to include the \"${DEVICE}\" or \"${MAC}\" specifier in the stable-id, in case this profile gets activated on multiple devices. So, the link-layer address of \"stable-ll\" and \"stable-llt\" will be a generated address derived from the stable id. The DUID-LLT time value in the \"stable-llt\" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in \"llt\"). When the property is unset, the global value provided for \"ipv6.dhcp-duid\" is used. If no global value is provided, the default \"lease\" value is assumed.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME_FLAGS N_("Flags for the DHCP hostname and FQDN. Currently this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4).  When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_IAID N_("A string containing the \"Identity Association Identifier\" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among \"mac\", \"perm-mac\", \"ifname\" and \"stable\". When set to \"mac\" (or \"perm-mac\"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to \"ifname\", the IAID is computed by hashing the interface name. The special value \"stable\" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be \"ifname\". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS N_("Array of IP addresses of DNS servers.")
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index b81cee71..f696ca82 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -24,7 +24,7 @@
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_AUTH_ALG N_("When WEP is used (ie, key-mgmt = \"none\" or \"ieee8021x\") indicate the 802.11 authentication algorithm required by the AP here.  One of \"open\" for Open System, \"shared\" for Shared Key, or \"leap\" for Cisco LEAP.  When using Cisco LEAP (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\") the \"leap-username\" and \"leap-password\" properties must be specified.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_FILS N_("Indicates whether Fast Initial Link Setup (802.11ai) must be enabled for the connection.  One of NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) (use global default value), NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE (1) (disable FILS), NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (2) (enable FILS if the supplicant and the access point support it) or NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (3) (enable FILS and fail if not supported).  When set to NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (0) and no global default is set, FILS will be optionally enabled.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_GROUP N_("A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list.  For maximum compatibility leave this property empty.  Each list element may be one of \"wep40\", \"wep104\", \"tkip\", or \"ccmp\".")
-#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_KEY_MGMT N_("Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x\" (Dynamic WEP), \"wpa-none\" (Ad-Hoc WPA-PSK), \"wpa-psk\" (infrastructure WPA-PSK), \"sae\" (SAE) or \"wpa-eap\" (WPA-Enterprise). This property must be set for any Wi-Fi connection that uses security.")
+#define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_KEY_MGMT N_("Key management used for the connection.  One of \"none\" (WEP), \"ieee8021x\" (Dynamic WEP), \"wpa-psk\" (infrastructure WPA-PSK), \"sae\" (SAE) or \"wpa-eap\" (WPA-Enterprise).  This property must be set for any Wi-Fi connection that uses security.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD N_("The login password for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\").")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS N_("Flags indicating how to handle the \"leap-password\" property.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME N_("The login username for legacy LEAP connections (ie, key-mgmt = \"ieee8021x\" and auth-alg = \"leap\").")
@@ -65,8 +65,8 @@
 #define DESCRIBE_DOC_NM_SETTING_802_1X_PHASE1_PEAPLABEL N_("Forces use of the new PEAP label during key derivation.  Some RADIUS servers may require forcing the new PEAP label to interoperate with PEAPv1.  Set to \"1\" to force use of the new PEAP label.  See the wpa_supplicant documentation for more details.")
 #define DESCRIBE_DOC_NM_SETTING_802_1X_PHASE1_PEAPVER N_("Forces which PEAP version is used when PEAP is set as the EAP method in the \"eap\" property.  When unset, the version reported by the server will be used.  Sometimes when using older RADIUS servers, it is necessary to force the client to use a particular PEAP version.  To do so, this property may be set to \"0\" or \"1\" to force that specific PEAP version.")
 #define DESCRIBE_DOC_NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES N_("List of strings to be matched against the altSubjectName of the certificate presented by the authentication server during the inner \"phase 2\" authentication. If the list is empty, no verification of the server certificate's altSubjectName is performed.")
-#define DESCRIBE_DOC_NM_SETTING_802_1X_PHASE2_AUTH N_("Specifies the allowed \"phase 2\" inner non-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the \"eap\" property.  Recognized non-EAP \"phase 2\" methods are \"pap\", \"chap\", \"mschap\", \"mschapv2\", \"gtc\", \"otp\", \"md5\", and \"tls\". Each \"phase 2\" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.")
-#define DESCRIBE_DOC_NM_SETTING_802_1X_PHASE2_AUTHEAP N_("Specifies the allowed \"phase 2\" inner EAP-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the \"eap\" property.  Recognized EAP-based \"phase 2\" methods are \"md5\", \"mschapv2\", \"otp\", \"gtc\", and \"tls\". Each \"phase 2\" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.")
+#define DESCRIBE_DOC_NM_SETTING_802_1X_PHASE2_AUTH N_("Specifies the allowed \"phase 2\" inner non-EAP authentication method when an EAP method that uses an inner TLS tunnel is specified in the \"eap\" property.  Recognized non-EAP \"phase 2\" methods are \"pap\", \"chap\", \"mschap\", \"mschapv2\", \"gtc\", \"otp\", \"md5\", and \"tls\". Each \"phase 2\" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.")
+#define DESCRIBE_DOC_NM_SETTING_802_1X_PHASE2_AUTHEAP N_("Specifies the allowed \"phase 2\" inner EAP-based authentication method when an EAP method that uses an inner TLS tunnel is specified in the \"eap\" property.  Recognized EAP-based \"phase 2\" methods are \"md5\", \"mschapv2\", \"otp\", \"gtc\", and \"tls\". Each \"phase 2\" inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.")
 #define DESCRIBE_DOC_NM_SETTING_802_1X_PHASE2_CA_CERT N_("Contains the \"phase 2\" CA certificate if used by the EAP method specified in the \"phase2-auth\" or \"phase2-autheap\" properties. Certificate data is specified using a \"scheme\"; two are currently supported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string \"file://\" and ending with a terminating NUL byte. This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.")
 #define DESCRIBE_DOC_NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD N_("The password used to access the \"phase2\" CA certificate stored in \"phase2-ca-cert\" property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.")
 #define DESCRIBE_DOC_NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS N_("Flags indicating how to handle the \"phase2-ca-cert-password\" property.")
@@ -171,6 +171,7 @@
 #define DESCRIBE_DOC_NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH N_("An array of 8 boolean values, where the array index corresponds to the User Priority (0 - 7) and the value indicates whether or not the priority may use all of the bandwidth allocated to its assigned group.")
 #define DESCRIBE_DOC_NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS N_("An array of 8 uint values, where the array index corresponds to the User Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which the priority is mapped.")
 #define DESCRIBE_DOC_NM_SETTING_GSM_APN N_("The GPRS Access Point Name specifying the APN used when establishing a data session with the GSM-based network.  The APN often determines how the user will be billed for their network usage and whether the user has access to the Internet or just a provider-specific walled-garden, so it is important to use the correct APN for the user's mobile broadband plan. The APN may only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section 14.9.")
+#define DESCRIBE_DOC_NM_SETTING_GSM_AUTO_CONFIG N_("When TRUE, the settings such as APN, username, or password will default to values that match the network the modem will register to in the Mobile Broadband Provider database.")
 #define DESCRIBE_DOC_NM_SETTING_GSM_DEVICE_ID N_("The device unique identifier (as given by the WWAN management service) which this connection applies to.  If given, the connection will only apply to the specified device.")
 #define DESCRIBE_DOC_NM_SETTING_GSM_HOME_ONLY N_("When TRUE, only connections to the home network will be allowed. Connections to roaming networks will not be made.")
 #define DESCRIBE_DOC_NM_SETTING_GSM_MTU N_("If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.")
@@ -206,6 +207,8 @@
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value \"duid\" generates a RFC4361-compliant client identifier based on a hash of the interface name as IAID and /etc/machine-id. The special value \"stable\" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the \"${DEVICE}\" or \"${MAC}\" specifier to get a per-device key. If unset, a globally configured default is used. If still unset, the default depends on the DHCP plugin.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_FQDN N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-hostname\" are mutually exclusive and cannot be set at the same time.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME_FLAGS N_("Flags for the DHCP hostname and FQDN. Currently this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4).  When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_IAID N_("A string containing the \"Identity Association Identifier\" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among \"mac\", \"perm-mac\", \"ifname\" and \"stable\". When set to \"mac\" (or \"perm-mac\"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to \"ifname\", the IAID is computed by hashing the interface name. The special value \"stable\" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be \"ifname\". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS N_("Array of IP addresses of DNS servers.")
@@ -226,6 +229,8 @@
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DAD_TIMEOUT N_("Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail.  A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero).  A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DUID N_("A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value \"lease\" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and \"dhclient\" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values \"llt\" and \"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values \"stable-llt\", \"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. You may want to include the \"${DEVICE}\" or \"${MAC}\" specifier in the stable-id, in case this profile gets activated on multiple devices. So, the link-layer address of \"stable-ll\" and \"stable-llt\" will be a generated address derived from the stable id. The DUID-LLT time value in the \"stable-llt\" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in \"llt\"). When the property is unset, the global value provided for \"ipv6.dhcp-duid\" is used. If no global value is provided, the default \"lease\" value is assumed.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME_FLAGS N_("Flags for the DHCP hostname and FQDN. Currently this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4).  When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_IAID N_("A string containing the \"Identity Association Identifier\" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among \"mac\", \"perm-mac\", \"ifname\" and \"stable\". When set to \"mac\" (or \"perm-mac\"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to \"ifname\", the IAID is computed by hashing the interface name. The special value \"stable\" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be \"ifname\". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS N_("Array of IP addresses of DNS servers.")
diff --git a/clients/common/tests/meson.build b/clients/common/tests/meson.build
index 624dd89c..479cb781 100644
--- a/clients/common/tests/meson.build
+++ b/clients/common/tests/meson.build
@@ -1,43 +1,43 @@
+common_c_flags = clients_c_flags + ['-DNETWORKMANAGER_COMPILATION_TEST']
+
 test_name = 'test-clients-common'
 
+deps = [
+  libnmc_base_dep,
+  libnmc_dep,
+]
+
 exe = executable(
   test_name,
   test_name + '.c',
-  dependencies: [
-    libnm_dep,
-    libnmc_dep,
-    libnmc_base_dep,
-    libnm_core_dep,
-  ],
-  c_args: clients_cflags + [
-    '-DNETWORKMANAGER_COMPILATION_TEST',
-  ],
+  dependencies: deps,
+  c_args: common_c_flags,
 )
 
 test(
-  test_name,
+  'clients/common/tests/' + test_name,
   test_script,
   args: test_args + [exe.full_path()],
 )
 
-###############################################################################
+test_name = 'test-libnm-core-aux'
+
+deps = [
+  libnm_dep,
+  libnm_libnm_core_aux_dep,
+  libnm_nm_default_dep,
+]
 
 exe = executable(
-    'test-libnm-core-aux',
-    [ 'test-libnm-core-aux.c', ],
-    c_args: [
-        '-DNETWORKMANAGER_COMPILATION_TEST',
-        '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
-    ],
-    dependencies: [
-        libnm_dep,
-        shared_nm_libnm_core_aux_dep,
-        shared_nm_libnm_core_intern_dep,
-    ],
+  test_name,
+  test_name + '.c',
+  dependencies: deps,
+  c_args: common_c_flags,
+  link_with: libnm_systemd_logging_stub,
 )
 
 test(
-    'clients/common/tests/test-libnm-core-aux',
-    test_script,
-    args: test_args + [exe.full_path()]
+  'clients/common/tests/' + test_name,
+  test_script,
+  args: test_args + [exe.full_path()]
 )
diff --git a/clients/common/tests/test-clients-common.c b/clients/common/tests/test-clients-common.c
index 75233acd..a5d803df 100644
--- a/clients/common/tests/test-clients-common.c
+++ b/clients/common/tests/test-clients-common.c
@@ -1,19 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2017 Red Hat, Inc.
+ * Copyright (C) 2017 Red Hat, Inc.
  */
 
 #include "nm-default.h"
diff --git a/clients/common/tests/test-libnm-core-aux.c b/clients/common/tests/test-libnm-core-aux.c
index 609a688c..7acbc6e1 100644
--- a/clients/common/tests/test-libnm-core-aux.c
+++ b/clients/common/tests/test-libnm-core-aux.c
@@ -1,20 +1,6 @@
+// SPDX-License-Identifier: LGPL-2.1+
 /*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA.
- *
- * Copyright 2019 Red Hat, Inc.
+ * Copyright (C) 2019 Red Hat, Inc.
  */
 
 #include "nm-default.h"
diff --git a/clients/meson.build b/clients/meson.build
index 76d39fa7..69e0bfef 100644
--- a/clients/meson.build
+++ b/clients/meson.build
@@ -1,23 +1,17 @@
+clients_c_flags = ['-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT']
+
 name = 'nm-online'
 
 deps = [
   libnm_dep,
-  libnm_core_dep,
-]
-
-clients_cflags = [
-  '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
-]
-
-cflags = clients_cflags + [
-  '-DG_LOG_DOMAIN="@0@"'.format(name),
+  libnm_nm_default_dep,
 ]
 
 executable(
   name,
   name + '.c',
   dependencies: deps,
-  c_args: cflags,
+  c_args: clients_c_flags + ['-DG_LOG_DOMAIN="@0@"'.format(name)],
   link_args: ldflags_linker_script_binary,
   link_depends: linker_script_binary,
   install: true,
@@ -32,3 +26,7 @@ endif
 if enable_nmtui
   subdir('tui')
 endif
+
+if enable_nm_cloud_setup
+  subdir('cloud-setup')
+endif
diff --git a/clients/nm-online.c b/clients/nm-online.c
index 9eb0b41b..de9c3794 100644
--- a/clients/nm-online.c
+++ b/clients/nm-online.c
@@ -1,21 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  * Copyright (C) 2006 - 2008 Novell, Inc.
  * Copyright (C) 2008 - 2014 Red Hat, Inc.
- *
  */
 
 /*
diff --git a/clients/tests/test-client.check-on-disk/test_002.expected b/clients/tests/test-client.check-on-disk/test_002.expected
index 01392494..1c6eecc5 100644
--- a/clients/tests/test-client.check-on-disk/test_002.expected
+++ b/clients/tests/test-client.check-on-disk/test_002.expected
@@ -132,14 +132,15 @@ Strony podręcznika nmcli(1) i nmcli-examples(7) zawierają pełne informacje
 o użyciu.
 
 <<<
-size: 1246
+size: 1420
 location: clients/tests/test-client.py:test_002()/7
 cmd: $NMCLI -f AP -mode multiline d show wlan0
 lang: C
 returncode: 0
-stdout: 1097 bytes
+stdout: 1271 bytes
 >>>
 AP[1].IN-USE:                            
+AP[1].BSSID:                            60:B3:25:25:E2:C8
 AP[1].SSID:                             wlan0-ap-3
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -148,6 +149,7 @@ AP[1].SIGNAL:                           55
 AP[1].BARS:                             **  
 AP[1].SECURITY:                         WPA3
 AP[2].IN-USE:                            
+AP[2].BSSID:                            90:B1:5F:9E:E0:E3
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -156,6 +158,7 @@ AP[2].SIGNAL:                           44
 AP[2].BARS:                             **  
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            61:66:D2:E7:44:A2
 AP[3].SSID:                             wlan0-ap-2
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -165,14 +168,15 @@ AP[3].BARS:                             **
 AP[3].SECURITY:                         WPA1 WPA2
 
 <<<
-size: 1283
+size: 1457
 location: clients/tests/test-client.py:test_002()/8
 cmd: $NMCLI -f AP -mode multiline d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1124 bytes
+stdout: 1298 bytes
 >>>
 AP[1].IN-USE:                            
+AP[1].BSSID:                            60:B3:25:25:E2:C8
 AP[1].SSID:                             wlan0-ap-3
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -181,6 +185,7 @@ AP[1].SIGNAL:                           55
 AP[1].BARS:                             **  
 AP[1].SECURITY:                         WPA3
 AP[2].IN-USE:                            
+AP[2].BSSID:                            90:B1:5F:9E:E0:E3
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -189,6 +194,7 @@ AP[2].SIGNAL:                           44
 AP[2].BARS:                             **  
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            61:66:D2:E7:44:A2
 AP[3].SSID:                             wlan0-ap-2
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -198,17 +204,18 @@ AP[3].BARS:                             **
 AP[3].SECURITY:                         WPA1 WPA2
 
 <<<
-size: 1700
+size: 1874
 location: clients/tests/test-client.py:test_002()/9
 cmd: $NMCLI -f AP -mode multiline -p d show wlan0
 lang: C
 returncode: 0
-stdout: 1548 bytes
+stdout: 1722 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
 ===============================================================================
 AP[1].IN-USE:                            
+AP[1].BSSID:                            60:B3:25:25:E2:C8
 AP[1].SSID:                             wlan0-ap-3
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -218,6 +225,7 @@ AP[1].BARS:                             **
 AP[1].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            90:B1:5F:9E:E0:E3
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -227,6 +235,7 @@ AP[2].BARS:                             **
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            61:66:D2:E7:44:A2
 AP[3].SSID:                             wlan0-ap-2
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -237,17 +246,18 @@ AP[3].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 
 <<<
-size: 1745
+size: 1919
 location: clients/tests/test-client.py:test_002()/10
 cmd: $NMCLI -f AP -mode multiline -p d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1582 bytes
+stdout: 1756 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
 ===============================================================================
 AP[1].IN-USE:                            
+AP[1].BSSID:                            60:B3:25:25:E2:C8
 AP[1].SSID:                             wlan0-ap-3
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -257,6 +267,7 @@ AP[1].BARS:                             **
 AP[1].SECURITY:                         WPA3
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            90:B1:5F:9E:E0:E3
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -266,6 +277,7 @@ AP[2].BARS:                             **
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            61:66:D2:E7:44:A2
 AP[3].SSID:                             wlan0-ap-2
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -276,14 +288,15 @@ AP[3].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 
 <<<
-size: 577
+size: 667
 location: clients/tests/test-client.py:test_002()/11
 cmd: $NMCLI -f AP -mode multiline -t d show wlan0
 lang: C
 returncode: 0
-stdout: 425 bytes
+stdout: 515 bytes
 >>>
 AP[1].IN-USE: 
+AP[1].BSSID:60:B3:25:25:E2:C8
 AP[1].SSID:wlan0-ap-3
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -292,6 +305,7 @@ AP[1].SIGNAL:55
 AP[1].BARS:**  
 AP[1].SECURITY:WPA3
 AP[2].IN-USE: 
+AP[2].BSSID:90:B1:5F:9E:E0:E3
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
 AP[2].CHAN:1
@@ -300,6 +314,7 @@ AP[2].SIGNAL:44
 AP[2].BARS:**  
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:61:66:D2:E7:44:A2
 AP[3].SSID:wlan0-ap-2
 AP[3].MODE:Infra
 AP[3].CHAN:1
@@ -309,14 +324,15 @@ AP[3].BARS:**
 AP[3].SECURITY:WPA1 WPA2
 
 <<<
-size: 614
+size: 704
 location: clients/tests/test-client.py:test_002()/12
 cmd: $NMCLI -f AP -mode multiline -t d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 452 bytes
+stdout: 542 bytes
 >>>
 AP[1].IN-USE: 
+AP[1].BSSID:60:B3:25:25:E2:C8
 AP[1].SSID:wlan0-ap-3
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -325,6 +341,7 @@ AP[1].SIGNAL:55
 AP[1].BARS:**  
 AP[1].SECURITY:WPA3
 AP[2].IN-USE: 
+AP[2].BSSID:90:B1:5F:9E:E0:E3
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
@@ -333,6 +350,7 @@ AP[2].SIGNAL:44
 AP[2].BARS:**  
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:61:66:D2:E7:44:A2
 AP[3].SSID:wlan0-ap-2
 AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
@@ -342,88 +360,88 @@ AP[3].BARS:**
 AP[3].SECURITY:WPA1 WPA2
 
 <<<
-size: 451
+size: 527
 location: clients/tests/test-client.py:test_002()/13
 cmd: $NMCLI -f AP -mode tabular d show wlan0
 lang: C
 returncode: 0
-stdout: 304 bytes
+stdout: 380 bytes
 >>>
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  44      **    WPA1      
-AP[3]          wlan0-ap-2  Infra  1     54 Mbit/s  34      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          60:B3:25:25:E2:C8  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+AP[2]          90:B1:5F:9E:E0:E3  wlan0-ap-1  Infra  1     54 Mbit/s  44      **    WPA1      
+AP[3]          61:66:D2:E7:44:A2  wlan0-ap-2  Infra  1     54 Mbit/s  34      **    WPA1 WPA2 
 
 <<<
-size: 495
+size: 571
 location: clients/tests/test-client.py:test_002()/14
 cmd: $NMCLI -f AP -mode tabular d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 338 bytes
+stdout: 414 bytes
 >>>
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  44      **    WPA1      
-AP[3]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  34      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          60:B3:25:25:E2:C8  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+AP[2]          90:B1:5F:9E:E0:E3  wlan0-ap-1  Infrastruktura  1     54 Mb/s  44      **    WPA1      
+AP[3]          61:66:D2:E7:44:A2  wlan0-ap-2  Infrastruktura  1     54 Mb/s  34      **    WPA1 WPA2 
 
 <<<
-size: 610
+size: 705
 location: clients/tests/test-client.py:test_002()/15
 cmd: $NMCLI -f AP -mode tabular -p d show wlan0
 lang: C
 returncode: 0
-stdout: 460 bytes
+stdout: 555 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-----------------------------------------------------------------------------
-AP[1]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  44      **    WPA1      
-AP[3]          wlan0-ap-2  Infra  1     54 Mbit/s  34      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-----------------------------------------------------------------------------------------------
+AP[1]          60:B3:25:25:E2:C8  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+AP[2]          90:B1:5F:9E:E0:E3  wlan0-ap-1  Infra  1     54 Mbit/s  44      **    WPA1      
+AP[3]          61:66:D2:E7:44:A2  wlan0-ap-2  Infra  1     54 Mbit/s  34      **    WPA1 WPA2 
 
 <<<
-size: 690
+size: 785
 location: clients/tests/test-client.py:test_002()/16
 cmd: $NMCLI -f AP -mode tabular -p d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 530 bytes
+stdout: 625 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------
-AP[1]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  44      **    WPA1      
-AP[3]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  34      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------------
+AP[1]          60:B3:25:25:E2:C8  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+AP[2]          90:B1:5F:9E:E0:E3  wlan0-ap-1  Infrastruktura  1     54 Mb/s  44      **    WPA1      
+AP[3]          61:66:D2:E7:44:A2  wlan0-ap-2  Infrastruktura  1     54 Mb/s  34      **    WPA1 WPA2 
 
 <<<
-size: 305
+size: 374
 location: clients/tests/test-client.py:test_002()/17
 cmd: $NMCLI -f AP -mode tabular -t d show wlan0
 lang: C
 returncode: 0
-stdout: 155 bytes
+stdout: 224 bytes
 >>>
-AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:44:**  :WPA1
-AP[3]: :wlan0-ap-2:Infra:1:54 Mbit/s:34:**  :WPA1 WPA2
+AP[1]: :60\:B3\:25\:25\:E2\:C8:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+AP[2]: :90\:B1\:5F\:9E\:E0\:E3:wlan0-ap-1:Infra:1:54 Mbit/s:44:**  :WPA1
+AP[3]: :61\:66\:D2\:E7\:44\:A2:wlan0-ap-2:Infra:1:54 Mbit/s:34:**  :WPA1 WPA2
 
 <<<
-size: 342
+size: 411
 location: clients/tests/test-client.py:test_002()/18
 cmd: $NMCLI -f AP -mode tabular -t d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 182 bytes
+stdout: 251 bytes
 >>>
-AP[1]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:44:**  :WPA1
-AP[3]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:34:**  :WPA1 WPA2
+AP[1]: :60\:B3\:25\:25\:E2\:C8:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+AP[2]: :90\:B1\:5F\:9E\:E0\:E3:wlan0-ap-1:Infrastruktura:1:54 Mb/s:44:**  :WPA1
+AP[3]: :61\:66\:D2\:E7\:44\:A2:wlan0-ap-2:Infrastruktura:1:54 Mb/s:34:**  :WPA1 WPA2
 
 <<<
 size: 1969
diff --git a/clients/tests/test-client.check-on-disk/test_003.expected b/clients/tests/test-client.check-on-disk/test_003.expected
index 18cab059..a4e43025 100644
--- a/clients/tests/test-client.check-on-disk/test_003.expected
+++ b/clients/tests/test-client.check-on-disk/test_003.expected
@@ -150,12 +150,12 @@ id
 path
 uuid
 <<<
-size: 4112
+size: 4343
 location: clients/tests/test-client.py:test_003()/12
 cmd: $NMCLI con s con-gsm1
 lang: C
 returncode: 0
-stdout: 3982 bytes
+stdout: 4213 bytes
 >>>
 connection.id:                          con-gsm1
 connection.uuid:                        UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -195,10 +195,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -220,14 +222,17 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 serial.baud:                            5
 serial.bits:                            8
 serial.parity:                          even
 serial.stopbits:                        1
 serial.send-delay:                      100
+gsm.auto-config:                        no
 gsm.number:                             --
 gsm.username:                           --
 gsm.password:                           <hidden>
@@ -247,12 +252,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4141
+size: 4373
 location: clients/tests/test-client.py:test_003()/13
 cmd: $NMCLI con s con-gsm1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4001 bytes
+stdout: 4233 bytes
 >>>
 connection.id:                          con-gsm1
 connection.uuid:                        UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -292,10 +297,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -317,14 +324,17 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 serial.baud:                            5
 serial.bits:                            8
 serial.parity:                          even
 serial.stopbits:                        1
 serial.send-delay:                      100
+gsm.auto-config:                        nie
 gsm.number:                             --
 gsm.username:                           --
 gsm.password:                           <hidden>
@@ -476,12 +486,12 @@ UUID                                  NAME
 UUID-ethernet-REPLACED-REPLACED-REPL  ethernet 
 
 <<<
-size: 3930
+size: 4118
 location: clients/tests/test-client.py:test_003()/25
 cmd: $NMCLI -f ALL con s ethernet
 lang: C
 returncode: 0
-stdout: 3793 bytes
+stdout: 3981 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -535,10 +545,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -560,8 +572,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     no
@@ -569,12 +583,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3958
+size: 4146
 location: clients/tests/test-client.py:test_003()/26
 cmd: $NMCLI -f ALL con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3811 bytes
+stdout: 3999 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -628,10 +642,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -653,8 +669,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     nie
@@ -682,12 +700,12 @@ stdout: 51 bytes
 GENERAL.STATE:                          aktywowano
 
 <<<
-size: 4587
+size: 4818
 location: clients/tests/test-client.py:test_003()/29
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
-stdout: 4457 bytes
+stdout: 4688 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -741,10 +759,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -766,8 +786,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     no
@@ -776,6 +798,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -787,12 +810,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4619
+size: 4850
 location: clients/tests/test-client.py:test_003()/30
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4479 bytes
+stdout: 4710 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -846,10 +869,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -871,8 +896,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     nie
@@ -881,6 +908,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -892,9 +920,9 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 1455
+size: 1405
 location: clients/tests/test-client.py:test_003()/31
-cmd: $NMCLI -f ALL dev s eth0
+cmd: $NMCLI -f ALL dev status
 lang: C
 returncode: 0
 stdout: 1272 bytes
@@ -907,14 +935,9 @@ wlan1   wifi      unavailable  unknown           unknown           /org/freedesk
 wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-stderr: 24 bytes
->>>
-Unknown parameter: eth0
-
-<<<
-size: 1470
+size: 1420
 location: clients/tests/test-client.py:test_003()/32
-cmd: $NMCLI -f ALL dev s eth0
+cmd: $NMCLI -f ALL dev status
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1277 bytes
@@ -927,21 +950,37 @@ wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedes
 wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-stderr: 24 bytes
+size: 169
+location: clients/tests/test-client.py:test_003()/33
+cmd: $NMCLI -f ALL dev s eth0
+lang: C
+returncode: 2
+stderr: 38 bytes
 >>>
-Nieznany parametr: eth0
+Error: invalid extra argument 'eth0'.
 
 <<<
-size: 3490
-location: clients/tests/test-client.py:test_003()/33
+size: 195
+location: clients/tests/test-client.py:test_003()/34
+cmd: $NMCLI -f ALL dev s eth0
+lang: pl_PL.UTF-8
+returncode: 2
+stderr: 54 bytes
+>>>
+Błąd: nieprawidłowy dodatkowy parametr „eth0”.
+
+<<<
+size: 3703
+location: clients/tests/test-client.py:test_003()/35
 cmd: $NMCLI -f ALL dev show eth0
 lang: C
 returncode: 0
-stdout: 3354 bytes
+stdout: 3567 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -969,6 +1008,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIRED-PROPERTIES.CARRIER:               off
 IP4.ADDRESS[1]:                         192.168.6.238/29
 IP4.GATEWAY:                            --
@@ -998,16 +1040,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 3525
-location: clients/tests/test-client.py:test_003()/34
+size: 3739
+location: clients/tests/test-client.py:test_003()/36
 cmd: $NMCLI -f ALL dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3379 bytes
+stdout: 3593 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -1035,6 +1078,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIRED-PROPERTIES.CARRIER:               wyłączone
 IP4.ADDRESS[1]:                         192.168.6.238/29
 IP4.GATEWAY:                            --
@@ -1064,16 +1110,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2235
-location: clients/tests/test-client.py:test_003()/35
+size: 2374
+location: clients/tests/test-client.py:test_003()/37
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: C
 returncode: 0
-stdout: 2096 bytes
+stdout: 2235 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -1101,6 +1148,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
@@ -1130,16 +1180,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2245
-location: clients/tests/test-client.py:test_003()/36
+size: 2384
+location: clients/tests/test-client.py:test_003()/38
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2096 bytes
+stdout: 2235 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -1167,6 +1218,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
@@ -1197,7 +1251,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 248
-location: clients/tests/test-client.py:test_003()/37
+location: clients/tests/test-client.py:test_003()/39
 cmd: $NMCLI con up ethernet ifname eth1
 lang: C
 returncode: 0
@@ -1207,7 +1261,7 @@ Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkMa
 
 <<<
 size: 514
-location: clients/tests/test-client.py:test_003()/38
+location: clients/tests/test-client.py:test_003()/40
 cmd: $NMCLI con
 lang: C
 returncode: 0
@@ -1222,7 +1276,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --
 
 <<<
 size: 524
-location: clients/tests/test-client.py:test_003()/39
+location: clients/tests/test-client.py:test_003()/41
 cmd: $NMCLI con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1237,7 +1291,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --
 
 <<<
 size: 2046
-location: clients/tests/test-client.py:test_003()/40
+location: clients/tests/test-client.py:test_003()/42
 cmd: $NMCLI -f ALL con
 lang: C
 returncode: 0
@@ -1252,7 +1306,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2062
-location: clients/tests/test-client.py:test_003()/41
+location: clients/tests/test-client.py:test_003()/43
 cmd: $NMCLI -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1267,7 +1321,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 1090
-location: clients/tests/test-client.py:test_003()/42
+location: clients/tests/test-client.py:test_003()/44
 cmd: $NMCLI -f ALL con s -a
 lang: C
 returncode: 0
@@ -1279,7 +1333,7 @@ ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never
 
 <<<
 size: 1103
-location: clients/tests/test-client.py:test_003()/43
+location: clients/tests/test-client.py:test_003()/45
 cmd: $NMCLI -f ALL con s -a
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1291,7 +1345,7 @@ ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy
 
 <<<
 size: 446
-location: clients/tests/test-client.py:test_003()/44
+location: clients/tests/test-client.py:test_003()/46
 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act
 lang: C
 returncode: 0
@@ -1303,7 +1357,7 @@ ACTIVE-PATH                                         DEVICE  UUID
 
 <<<
 size: 456
-location: clients/tests/test-client.py:test_003()/45
+location: clients/tests/test-client.py:test_003()/47
 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1315,7 +1369,7 @@ ACTIVE-PATH                                         DEVICE  UUID
 
 <<<
 size: 237
-location: clients/tests/test-client.py:test_003()/46
+location: clients/tests/test-client.py:test_003()/48
 cmd: $NMCLI -f UUID,NAME con s --active
 lang: C
 returncode: 0
@@ -1326,7 +1380,7 @@ UUID-ethernet-REPLACED-REPLACED-REPL  ethernet
 
 <<<
 size: 247
-location: clients/tests/test-client.py:test_003()/47
+location: clients/tests/test-client.py:test_003()/49
 cmd: $NMCLI -f UUID,NAME con s --active
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1336,12 +1390,12 @@ UUID                                  NAME
 UUID-ethernet-REPLACED-REPLACED-REPL  ethernet 
 
 <<<
-size: 3930
-location: clients/tests/test-client.py:test_003()/48
+size: 4118
+location: clients/tests/test-client.py:test_003()/50
 cmd: $NMCLI -f ALL con s ethernet
 lang: C
 returncode: 0
-stdout: 3793 bytes
+stdout: 3981 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1395,10 +1449,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -1420,8 +1476,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     no
@@ -1429,12 +1487,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3958
-location: clients/tests/test-client.py:test_003()/49
+size: 4146
+location: clients/tests/test-client.py:test_003()/51
 cmd: $NMCLI -f ALL con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3811 bytes
+stdout: 3999 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1488,10 +1546,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -1513,8 +1573,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     nie
@@ -1523,7 +1585,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 247
-location: clients/tests/test-client.py:test_003()/50
+location: clients/tests/test-client.py:test_003()/52
 cmd: $NMCLI -f GENERAL.STATE con s ethernet
 lang: C
 returncode: 0
@@ -1535,7 +1597,7 @@ GENERAL.STATE:                          activated
 
 <<<
 size: 259
-location: clients/tests/test-client.py:test_003()/51
+location: clients/tests/test-client.py:test_003()/53
 cmd: $NMCLI -f GENERAL.STATE con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
@@ -1546,12 +1608,12 @@ GENERAL.STATE:                          aktywowano
 GENERAL.STATE:                          aktywowano
 
 <<<
-size: 5252
-location: clients/tests/test-client.py:test_003()/52
+size: 5526
+location: clients/tests/test-client.py:test_003()/54
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
-stdout: 5122 bytes
+stdout: 5396 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1605,10 +1667,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -1630,8 +1694,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     no
@@ -1640,6 +1706,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -1653,6 +1720,7 @@ GENERAL.MASTER-PATH:                    --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth1
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -1664,12 +1732,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5288
-location: clients/tests/test-client.py:test_003()/53
+size: 5562
+location: clients/tests/test-client.py:test_003()/55
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5148 bytes
+stdout: 5422 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1723,10 +1791,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -1748,8 +1818,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     nie
@@ -1758,6 +1830,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -1771,6 +1844,7 @@ GENERAL.MASTER-PATH:                    --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth1
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -1782,9 +1856,9 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 1455
-location: clients/tests/test-client.py:test_003()/54
-cmd: $NMCLI -f ALL dev s eth0
+size: 1405
+location: clients/tests/test-client.py:test_003()/56
+cmd: $NMCLI -f ALL dev status
 lang: C
 returncode: 0
 stdout: 1272 bytes
@@ -1797,14 +1871,9 @@ wlan1   wifi      unavailable  unknown           unknown           /org/freedesk
 wlan1   wifi      unavailable  unknown           unknown           /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-stderr: 24 bytes
->>>
-Unknown parameter: eth0
-
-<<<
-size: 1470
-location: clients/tests/test-client.py:test_003()/55
-cmd: $NMCLI -f ALL dev s eth0
+size: 1420
+location: clients/tests/test-client.py:test_003()/57
+cmd: $NMCLI -f ALL dev status
 lang: pl_PL.UTF-8
 returncode: 0
 stdout: 1277 bytes
@@ -1817,21 +1886,37 @@ wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedes
 wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-stderr: 24 bytes
+size: 169
+location: clients/tests/test-client.py:test_003()/58
+cmd: $NMCLI -f ALL dev s eth0
+lang: C
+returncode: 2
+stderr: 38 bytes
 >>>
-Nieznany parametr: eth0
+Error: invalid extra argument 'eth0'.
 
 <<<
-size: 3490
-location: clients/tests/test-client.py:test_003()/56
+size: 195
+location: clients/tests/test-client.py:test_003()/59
+cmd: $NMCLI -f ALL dev s eth0
+lang: pl_PL.UTF-8
+returncode: 2
+stderr: 54 bytes
+>>>
+Błąd: nieprawidłowy dodatkowy parametr „eth0”.
+
+<<<
+size: 3703
+location: clients/tests/test-client.py:test_003()/60
 cmd: $NMCLI -f ALL dev show eth0
 lang: C
 returncode: 0
-stdout: 3354 bytes
+stdout: 3567 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -1859,6 +1944,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIRED-PROPERTIES.CARRIER:               off
 IP4.ADDRESS[1]:                         192.168.6.238/29
 IP4.GATEWAY:                            --
@@ -1888,16 +1976,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 3525
-location: clients/tests/test-client.py:test_003()/57
+size: 3739
+location: clients/tests/test-client.py:test_003()/61
 cmd: $NMCLI -f ALL dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3379 bytes
+stdout: 3593 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -1925,6 +2014,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIRED-PROPERTIES.CARRIER:               wyłączone
 IP4.ADDRESS[1]:                         192.168.6.238/29
 IP4.GATEWAY:                            --
@@ -1954,16 +2046,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2235
-location: clients/tests/test-client.py:test_003()/58
+size: 2374
+location: clients/tests/test-client.py:test_003()/62
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: C
 returncode: 0
-stdout: 2096 bytes
+stdout: 2235 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -1991,6 +2084,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
@@ -2020,16 +2116,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2245
-location: clients/tests/test-client.py:test_003()/59
+size: 2384
+location: clients/tests/test-client.py:test_003()/63
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2096 bytes
+stdout: 2235 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -2057,6 +2154,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
@@ -2087,7 +2187,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 2064
-location: clients/tests/test-client.py:test_003()/60
+location: clients/tests/test-client.py:test_003()/64
 cmd: $NMCLI -f ALL con
 lang: C
 returncode: 0
@@ -2102,7 +2202,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2086
-location: clients/tests/test-client.py:test_003()/61
+location: clients/tests/test-client.py:test_003()/65
 cmd: $NMCLI -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2117,7 +2217,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 371
-location: clients/tests/test-client.py:test_003()/62
+location: clients/tests/test-client.py:test_003()/66
 cmd: $NMCLI -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -2131,7 +2231,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 381
-location: clients/tests/test-client.py:test_003()/63
+location: clients/tests/test-client.py:test_003()/67
 cmd: $NMCLI -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2144,12 +2244,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 5255
-location: clients/tests/test-client.py:test_003()/64
+size: 5529
+location: clients/tests/test-client.py:test_003()/68
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
-stdout: 5125 bytes
+stdout: 5399 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2203,10 +2303,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -2228,8 +2330,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     no
@@ -2238,6 +2342,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth1
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -2251,6 +2356,7 @@ GENERAL.MASTER-PATH:                    --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -2262,12 +2368,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5292
-location: clients/tests/test-client.py:test_003()/65
+size: 5566
+location: clients/tests/test-client.py:test_003()/69
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5152 bytes
+stdout: 5426 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2321,10 +2427,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -2346,8 +2454,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     nie
@@ -2356,6 +2466,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth1
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -2369,6 +2480,7 @@ GENERAL.MASTER-PATH:                    --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -2380,12 +2492,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4630
-location: clients/tests/test-client.py:test_003()/66
+size: 4861
+location: clients/tests/test-client.py:test_003()/70
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4460 bytes
+stdout: 4691 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2439,10 +2551,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -2464,8 +2578,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     no
@@ -2474,6 +2590,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -2485,12 +2602,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4663
-location: clients/tests/test-client.py:test_003()/67
+size: 4894
+location: clients/tests/test-client.py:test_003()/71
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4483 bytes
+stdout: 4714 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2544,10 +2661,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -2569,8 +2688,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     nie
@@ -2579,6 +2700,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -2590,16 +2712,17 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3490
-location: clients/tests/test-client.py:test_003()/68
+size: 3703
+location: clients/tests/test-client.py:test_003()/72
 cmd: $NMCLI -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3354 bytes
+stdout: 3567 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -2627,6 +2750,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIRED-PROPERTIES.CARRIER:               off
 IP4.ADDRESS[1]:                         192.168.6.238/29
 IP4.GATEWAY:                            --
@@ -2656,16 +2782,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 3525
-location: clients/tests/test-client.py:test_003()/69
+size: 3739
+location: clients/tests/test-client.py:test_003()/73
 cmd: $NMCLI -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3379 bytes
+stdout: 3593 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -2693,6 +2820,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIRED-PROPERTIES.CARRIER:               wyłączone
 IP4.ADDRESS[1]:                         192.168.6.238/29
 IP4.GATEWAY:                            --
@@ -2723,7 +2853,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 2346
-location: clients/tests/test-client.py:test_003()/70
+location: clients/tests/test-client.py:test_003()/74
 cmd: $NMCLI --color yes -f ALL con
 lang: C
 returncode: 0
@@ -2738,7 +2868,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2368
-location: clients/tests/test-client.py:test_003()/71
+location: clients/tests/test-client.py:test_003()/75
 cmd: $NMCLI --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2753,7 +2883,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 401
-location: clients/tests/test-client.py:test_003()/72
+location: clients/tests/test-client.py:test_003()/76
 cmd: $NMCLI --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -2767,7 +2897,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 411
-location: clients/tests/test-client.py:test_003()/73
+location: clients/tests/test-client.py:test_003()/77
 cmd: $NMCLI --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -2780,12 +2910,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 5267
-location: clients/tests/test-client.py:test_003()/74
+size: 5541
+location: clients/tests/test-client.py:test_003()/78
 cmd: $NMCLI --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 5125 bytes
+stdout: 5399 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2839,10 +2969,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -2864,8 +2996,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     no
@@ -2874,6 +3008,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth1
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -2887,6 +3022,7 @@ GENERAL.MASTER-PATH:                    --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -2898,12 +3034,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5304
-location: clients/tests/test-client.py:test_003()/75
+size: 5578
+location: clients/tests/test-client.py:test_003()/79
 cmd: $NMCLI --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5152 bytes
+stdout: 5426 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2957,10 +3093,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -2982,8 +3120,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     nie
@@ -2992,6 +3132,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth1
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -3005,6 +3146,7 @@ GENERAL.MASTER-PATH:                    --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -3016,12 +3158,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4642
-location: clients/tests/test-client.py:test_003()/76
+size: 4873
+location: clients/tests/test-client.py:test_003()/80
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4460 bytes
+stdout: 4691 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -3075,10 +3217,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -3100,8 +3244,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     no
@@ -3110,6 +3256,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -3121,12 +3268,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4675
-location: clients/tests/test-client.py:test_003()/77
+size: 4906
+location: clients/tests/test-client.py:test_003()/81
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4483 bytes
+stdout: 4714 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -3180,10 +3327,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -3205,8 +3354,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     nie
@@ -3215,6 +3366,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -3226,16 +3378,17 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3502
-location: clients/tests/test-client.py:test_003()/78
+size: 3715
+location: clients/tests/test-client.py:test_003()/82
 cmd: $NMCLI --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3354 bytes
+stdout: 3567 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -3263,6 +3416,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIRED-PROPERTIES.CARRIER:               off
 IP4.ADDRESS[1]:                         192.168.6.238/29
 IP4.GATEWAY:                            --
@@ -3292,16 +3448,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 3537
-location: clients/tests/test-client.py:test_003()/79
+size: 3751
+location: clients/tests/test-client.py:test_003()/83
 cmd: $NMCLI --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3379 bytes
+stdout: 3593 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -3329,6 +3486,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIRED-PROPERTIES.CARRIER:               wyłączone
 IP4.ADDRESS[1]:                         192.168.6.238/29
 IP4.GATEWAY:                            --
@@ -3359,7 +3519,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 2550
-location: clients/tests/test-client.py:test_003()/80
+location: clients/tests/test-client.py:test_003()/84
 cmd: $NMCLI --pretty -f ALL con
 lang: C
 returncode: 0
@@ -3378,7 +3538,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2594
-location: clients/tests/test-client.py:test_003()/81
+location: clients/tests/test-client.py:test_003()/85
 cmd: $NMCLI --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -3397,7 +3557,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 582
-location: clients/tests/test-client.py:test_003()/82
+location: clients/tests/test-client.py:test_003()/86
 cmd: $NMCLI --pretty -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -3415,7 +3575,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 612
-location: clients/tests/test-client.py:test_003()/83
+location: clients/tests/test-client.py:test_003()/87
 cmd: $NMCLI --pretty -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -3432,12 +3592,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 6509
-location: clients/tests/test-client.py:test_003()/84
+size: 6783
+location: clients/tests/test-client.py:test_003()/88
 cmd: $NMCLI --pretty con s ethernet
 lang: C
 returncode: 0
-stdout: 6370 bytes
+stdout: 6644 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -3496,10 +3656,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -3522,8 +3684,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 proxy.method:                           none
@@ -3537,6 +3701,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth1
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -3554,6 +3719,7 @@ GENERAL.MASTER-PATH:                    --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -3566,12 +3732,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6565
-location: clients/tests/test-client.py:test_003()/85
+size: 6839
+location: clients/tests/test-client.py:test_003()/89
 cmd: $NMCLI --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6416 bytes
+stdout: 6690 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -3630,10 +3796,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -3656,8 +3824,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 proxy.method:                           none
@@ -3671,6 +3841,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth1
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -3688,6 +3859,7 @@ GENERAL.MASTER-PATH:                    --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -3700,12 +3872,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5571
-location: clients/tests/test-client.py:test_003()/86
+size: 5802
+location: clients/tests/test-client.py:test_003()/90
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 5392 bytes
+stdout: 5623 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -3764,10 +3936,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -3790,8 +3964,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 proxy.method:                           none
@@ -3805,6 +3981,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -3817,12 +3994,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5616
-location: clients/tests/test-client.py:test_003()/87
+size: 5847
+location: clients/tests/test-client.py:test_003()/91
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5427 bytes
+stdout: 5658 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -3881,10 +4058,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -3907,8 +4086,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 proxy.method:                           none
@@ -3922,6 +4103,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -3934,12 +4116,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4350
-location: clients/tests/test-client.py:test_003()/88
+size: 4643
+location: clients/tests/test-client.py:test_003()/92
 cmd: $NMCLI --pretty -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4205 bytes
+stdout: 4498 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -3947,6 +4129,7 @@ stdout: 4205 bytes
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -3976,6 +4159,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               off
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.6.238/29
@@ -4011,12 +4198,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 -------------------------------------------------------------------------------
 
 <<<
-size: 4391
-location: clients/tests/test-client.py:test_003()/89
+size: 4685
+location: clients/tests/test-client.py:test_003()/93
 cmd: $NMCLI --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4236 bytes
+stdout: 4530 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -4024,6 +4211,7 @@ stdout: 4236 bytes
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -4053,6 +4241,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               wyłączone
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.6.238/29
@@ -4089,7 +4281,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 2832
-location: clients/tests/test-client.py:test_003()/90
+location: clients/tests/test-client.py:test_003()/94
 cmd: $NMCLI --pretty --color yes -f ALL con
 lang: C
 returncode: 0
@@ -4108,7 +4300,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2876
-location: clients/tests/test-client.py:test_003()/91
+location: clients/tests/test-client.py:test_003()/95
 cmd: $NMCLI --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4127,7 +4319,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 612
-location: clients/tests/test-client.py:test_003()/92
+location: clients/tests/test-client.py:test_003()/96
 cmd: $NMCLI --pretty --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -4145,7 +4337,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 642
-location: clients/tests/test-client.py:test_003()/93
+location: clients/tests/test-client.py:test_003()/97
 cmd: $NMCLI --pretty --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4162,12 +4354,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 6521
-location: clients/tests/test-client.py:test_003()/94
+size: 6795
+location: clients/tests/test-client.py:test_003()/98
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 6370 bytes
+stdout: 6644 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -4226,10 +4418,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -4252,8 +4446,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 proxy.method:                           none
@@ -4267,6 +4463,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth1
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -4284,6 +4481,7 @@ GENERAL.MASTER-PATH:                    --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -4296,12 +4494,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6577
-location: clients/tests/test-client.py:test_003()/95
+size: 6851
+location: clients/tests/test-client.py:test_003()/99
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6416 bytes
+stdout: 6690 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -4360,10 +4558,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -4386,8 +4586,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 proxy.method:                           none
@@ -4401,6 +4603,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth1
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -4418,6 +4621,7 @@ GENERAL.MASTER-PATH:                    --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -4430,12 +4634,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5583
-location: clients/tests/test-client.py:test_003()/96
+size: 5815
+location: clients/tests/test-client.py:test_003()/100
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 5392 bytes
+stdout: 5623 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -4494,10 +4698,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -4520,8 +4726,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 proxy.method:                           none
@@ -4535,6 +4743,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -4547,12 +4756,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5628
-location: clients/tests/test-client.py:test_003()/97
+size: 5860
+location: clients/tests/test-client.py:test_003()/101
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5427 bytes
+stdout: 5658 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -4611,10 +4820,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -4637,8 +4848,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 proxy.method:                           none
@@ -4652,6 +4865,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -4664,12 +4878,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4362
-location: clients/tests/test-client.py:test_003()/98
+size: 4656
+location: clients/tests/test-client.py:test_003()/102
 cmd: $NMCLI --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4205 bytes
+stdout: 4498 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -4677,6 +4891,7 @@ stdout: 4205 bytes
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -4706,6 +4921,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               off
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.6.238/29
@@ -4741,12 +4960,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 -------------------------------------------------------------------------------
 
 <<<
-size: 4403
-location: clients/tests/test-client.py:test_003()/99
+size: 4698
+location: clients/tests/test-client.py:test_003()/103
 cmd: $NMCLI --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4236 bytes
+stdout: 4530 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -4754,6 +4973,7 @@ stdout: 4236 bytes
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -4783,6 +5003,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               wyłączone
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.6.238/29
@@ -4819,7 +5043,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 1181
-location: clients/tests/test-client.py:test_003()/100
+location: clients/tests/test-client.py:test_003()/104
 cmd: $NMCLI --terse -f ALL con
 lang: C
 returncode: 0
@@ -4833,7 +5057,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 1191
-location: clients/tests/test-client.py:test_003()/101
+location: clients/tests/test-client.py:test_003()/105
 cmd: $NMCLI --terse -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4847,7 +5071,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 337
-location: clients/tests/test-client.py:test_003()/102
+location: clients/tests/test-client.py:test_003()/106
 cmd: $NMCLI --terse -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -4860,7 +5084,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 347
-location: clients/tests/test-client.py:test_003()/103
+location: clients/tests/test-client.py:test_003()/107
 cmd: $NMCLI --terse -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4872,12 +5096,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 2837
-location: clients/tests/test-client.py:test_003()/104
+size: 2963
+location: clients/tests/test-client.py:test_003()/108
 cmd: $NMCLI --terse con s ethernet
 lang: C
 returncode: 0
-stdout: 2698 bytes
+stdout: 2824 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -4931,10 +5155,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -4956,8 +5182,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 proxy.method:none
 proxy.browser-only:no
@@ -4966,6 +5194,7 @@ proxy.pac-script:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth1
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -4979,6 +5208,7 @@ GENERAL.MASTER-PATH:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -4990,12 +5220,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2847
-location: clients/tests/test-client.py:test_003()/105
+size: 2973
+location: clients/tests/test-client.py:test_003()/109
 cmd: $NMCLI --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2698 bytes
+stdout: 2824 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5049,10 +5279,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -5074,8 +5306,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 proxy.method:none
 proxy.browser-only:no
@@ -5084,6 +5318,7 @@ proxy.pac-script:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth1
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -5097,6 +5332,7 @@ GENERAL.MASTER-PATH:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -5108,12 +5344,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2509
-location: clients/tests/test-client.py:test_003()/106
+size: 2617
+location: clients/tests/test-client.py:test_003()/110
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2330 bytes
+stdout: 2438 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5167,10 +5403,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -5192,8 +5430,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 proxy.method:none
 proxy.browser-only:no
@@ -5202,6 +5442,7 @@ proxy.pac-script:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -5213,12 +5454,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2519
-location: clients/tests/test-client.py:test_003()/107
+size: 2627
+location: clients/tests/test-client.py:test_003()/111
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2330 bytes
+stdout: 2438 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5272,10 +5513,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -5297,8 +5540,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 proxy.method:none
 proxy.browser-only:no
@@ -5307,6 +5552,7 @@ proxy.pac-script:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -5318,16 +5564,17 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2241
-location: clients/tests/test-client.py:test_003()/108
+size: 2380
+location: clients/tests/test-client.py:test_003()/112
 cmd: $NMCLI --terse -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2096 bytes
+stdout: 2235 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -5355,6 +5602,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
@@ -5384,16 +5634,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2251
-location: clients/tests/test-client.py:test_003()/109
+size: 2390
+location: clients/tests/test-client.py:test_003()/113
 cmd: $NMCLI --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2096 bytes
+stdout: 2235 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -5421,6 +5672,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
@@ -5451,7 +5705,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 1463
-location: clients/tests/test-client.py:test_003()/110
+location: clients/tests/test-client.py:test_003()/114
 cmd: $NMCLI --terse --color yes -f ALL con
 lang: C
 returncode: 0
@@ -5465,7 +5719,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 1473
-location: clients/tests/test-client.py:test_003()/111
+location: clients/tests/test-client.py:test_003()/115
 cmd: $NMCLI --terse --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5479,7 +5733,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 367
-location: clients/tests/test-client.py:test_003()/112
+location: clients/tests/test-client.py:test_003()/116
 cmd: $NMCLI --terse --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -5492,7 +5746,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 377
-location: clients/tests/test-client.py:test_003()/113
+location: clients/tests/test-client.py:test_003()/117
 cmd: $NMCLI --terse --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5504,12 +5758,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 2849
-location: clients/tests/test-client.py:test_003()/114
+size: 2975
+location: clients/tests/test-client.py:test_003()/118
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 2698 bytes
+stdout: 2824 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5563,10 +5817,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -5588,8 +5844,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 proxy.method:none
 proxy.browser-only:no
@@ -5598,6 +5856,7 @@ proxy.pac-script:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth1
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -5611,6 +5870,7 @@ GENERAL.MASTER-PATH:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -5622,12 +5882,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2859
-location: clients/tests/test-client.py:test_003()/115
+size: 2985
+location: clients/tests/test-client.py:test_003()/119
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2698 bytes
+stdout: 2824 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5681,10 +5941,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -5706,8 +5968,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 proxy.method:none
 proxy.browser-only:no
@@ -5716,6 +5980,7 @@ proxy.pac-script:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth1
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -5729,6 +5994,7 @@ GENERAL.MASTER-PATH:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -5740,12 +6006,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2521
-location: clients/tests/test-client.py:test_003()/116
+size: 2629
+location: clients/tests/test-client.py:test_003()/120
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2330 bytes
+stdout: 2438 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5799,10 +6065,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -5824,8 +6092,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 proxy.method:none
 proxy.browser-only:no
@@ -5834,6 +6104,7 @@ proxy.pac-script:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -5845,12 +6116,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2531
-location: clients/tests/test-client.py:test_003()/117
+size: 2639
+location: clients/tests/test-client.py:test_003()/121
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2330 bytes
+stdout: 2438 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5904,10 +6175,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -5929,8 +6202,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 proxy.method:none
 proxy.browser-only:no
@@ -5939,6 +6214,7 @@ proxy.pac-script:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -5950,16 +6226,17 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2253
-location: clients/tests/test-client.py:test_003()/118
+size: 2392
+location: clients/tests/test-client.py:test_003()/122
 cmd: $NMCLI --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2096 bytes
+stdout: 2235 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -5987,6 +6264,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
@@ -6016,16 +6296,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2263
-location: clients/tests/test-client.py:test_003()/119
+size: 2402
+location: clients/tests/test-client.py:test_003()/123
 cmd: $NMCLI --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2096 bytes
+stdout: 2235 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -6053,6 +6334,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
@@ -6083,7 +6367,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 2080
-location: clients/tests/test-client.py:test_003()/120
+location: clients/tests/test-client.py:test_003()/124
 cmd: $NMCLI --mode tabular -f ALL con
 lang: C
 returncode: 0
@@ -6098,7 +6382,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2102
-location: clients/tests/test-client.py:test_003()/121
+location: clients/tests/test-client.py:test_003()/125
 cmd: $NMCLI --mode tabular -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6113,7 +6397,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 387
-location: clients/tests/test-client.py:test_003()/122
+location: clients/tests/test-client.py:test_003()/126
 cmd: $NMCLI --mode tabular -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -6127,7 +6411,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 397
-location: clients/tests/test-client.py:test_003()/123
+location: clients/tests/test-client.py:test_003()/127
 cmd: $NMCLI --mode tabular -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6140,12 +6424,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 3514
-location: clients/tests/test-client.py:test_003()/124
+size: 3682
+location: clients/tests/test-client.py:test_003()/128
 cmd: $NMCLI --mode tabular con s ethernet
 lang: C
 returncode: 0
-stdout: 3368 bytes
+stdout: 3536 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
@@ -6153,30 +6437,30 @@ connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-eth
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      no              --           --                  --                         --                     auto  --                --            --            default      --                   
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              0 (default)   yes                 --             --         no             yes       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
 
-GROUP    NAME      UUID                                  DEVICES  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     activated  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     --        activated  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
-GROUP    NAME      UUID                                  DEVICES  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 3548
-location: clients/tests/test-client.py:test_003()/125
+size: 3716
+location: clients/tests/test-client.py:test_003()/129
 cmd: $NMCLI --mode tabular con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3392 bytes
+stdout: 3560 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
@@ -6184,30 +6468,30 @@ connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-eth
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                     automatyczne  --                --            --            default      --                   
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              0 (default)   tak                 --             --         nie            tak       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
 
-GROUP    NAME      UUID                                  DEVICES  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     aktywowano  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     --        aktywowano  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
-GROUP    NAME      UUID                                  DEVICES  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 3072
-location: clients/tests/test-client.py:test_003()/126
+size: 3220
+location: clients/tests/test-client.py:test_003()/130
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2886 bytes
+stdout: 3034 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
@@ -6215,26 +6499,26 @@ connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-eth
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      no              --           --                  --                         --                     auto  --                --            --            default      --                   
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              0 (default)   yes                 --             --         no             yes       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
 
-GROUP    NAME      UUID                                  DEVICES  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 3104
-location: clients/tests/test-client.py:test_003()/127
+size: 3252
+location: clients/tests/test-client.py:test_003()/131
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2908 bytes
+stdout: 3056 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
@@ -6242,33 +6526,36 @@ connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-eth
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                     automatyczne  --                --            --            default      --                   
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              0 (default)   tak                 --             --         nie            tak       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
 
-GROUP    NAME      UUID                                  DEVICES  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 2967
-location: clients/tests/test-client.py:test_003()/128
+size: 3136
+location: clients/tests/test-client.py:test_003()/132
 cmd: $NMCLI --mode tabular -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2815 bytes
+stdout: 2984 bytes
 >>>
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              100 Mb/s  no           no    
 
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  yes  yes       no      
+
 NAME              CARRIER  S390-SUBCHANNELS 
 WIRED-PROPERTIES  off      --               
 
@@ -6288,19 +6575,22 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet 
 
 <<<
-size: 2998
-location: clients/tests/test-client.py:test_003()/129
+size: 3167
+location: clients/tests/test-client.py:test_003()/133
 cmd: $NMCLI --mode tabular -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2836 bytes
+stdout: 3005 bytes
 >>>
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             100 Mb/s  nie          nie   
 
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  tak  tak       nie     
+
 NAME              CARRIER    S390-SUBCHANNELS 
 WIRED-PROPERTIES  wyłączone  --               
 
@@ -6321,7 +6611,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6
 
 <<<
 size: 2362
-location: clients/tests/test-client.py:test_003()/130
+location: clients/tests/test-client.py:test_003()/134
 cmd: $NMCLI --mode tabular --color yes -f ALL con
 lang: C
 returncode: 0
@@ -6336,7 +6626,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2384
-location: clients/tests/test-client.py:test_003()/131
+location: clients/tests/test-client.py:test_003()/135
 cmd: $NMCLI --mode tabular --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6351,7 +6641,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 417
-location: clients/tests/test-client.py:test_003()/132
+location: clients/tests/test-client.py:test_003()/136
 cmd: $NMCLI --mode tabular --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -6365,7 +6655,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 427
-location: clients/tests/test-client.py:test_003()/133
+location: clients/tests/test-client.py:test_003()/137
 cmd: $NMCLI --mode tabular --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6378,12 +6668,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 3526
-location: clients/tests/test-client.py:test_003()/134
+size: 3694
+location: clients/tests/test-client.py:test_003()/138
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 3368 bytes
+stdout: 3536 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
@@ -6391,30 +6681,30 @@ connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-eth
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      no              --           --                  --                         --                     auto  --                --            --            default      --                   
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              0 (default)   yes                 --             --         no             yes       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
 
-GROUP    NAME      UUID                                  DEVICES  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     activated  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     --        activated  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
-GROUP    NAME      UUID                                  DEVICES  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 3560
-location: clients/tests/test-client.py:test_003()/135
+size: 3728
+location: clients/tests/test-client.py:test_003()/139
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3392 bytes
+stdout: 3560 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
@@ -6422,30 +6712,30 @@ connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-eth
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                     automatyczne  --                --            --            default      --                   
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              0 (default)   tak                 --             --         nie            tak       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
 
-GROUP    NAME      UUID                                  DEVICES  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     aktywowano  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     --        aktywowano  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
-GROUP    NAME      UUID                                  DEVICES  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 3084
-location: clients/tests/test-client.py:test_003()/136
+size: 3232
+location: clients/tests/test-client.py:test_003()/140
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2886 bytes
+stdout: 3034 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
@@ -6453,26 +6743,26 @@ connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-eth
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      no              --           --                  --                         --                     auto  --                --            --            default      --                   
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              0 (default)   yes                 --             --         no             yes       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
 
-GROUP    NAME      UUID                                  DEVICES  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 3116
-location: clients/tests/test-client.py:test_003()/137
+size: 3264
+location: clients/tests/test-client.py:test_003()/141
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2908 bytes
+stdout: 3056 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
@@ -6480,33 +6770,36 @@ connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-eth
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-blacklist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password 
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                     automatyczne  --                --            --            default      --                   
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              0 (default)   tak                 --             --         nie            tak       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
 
-GROUP    NAME      UUID                                  DEVICES  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 2979
-location: clients/tests/test-client.py:test_003()/138
+size: 3148
+location: clients/tests/test-client.py:test_003()/142
 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2815 bytes
+stdout: 2984 bytes
 >>>
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              100 Mb/s  no           no    
 
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  yes  yes       no      
+
 NAME              CARRIER  S390-SUBCHANNELS 
 WIRED-PROPERTIES  off      --               
 
@@ -6526,19 +6819,22 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet 
 
 <<<
-size: 3010
-location: clients/tests/test-client.py:test_003()/139
+size: 3179
+location: clients/tests/test-client.py:test_003()/143
 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2836 bytes
+stdout: 3005 bytes
 >>>
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             100 Mb/s  nie          nie   
 
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  tak  tak       nie     
+
 NAME              CARRIER    S390-SUBCHANNELS 
 WIRED-PROPERTIES  wyłączone  --               
 
@@ -6559,7 +6855,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6
 
 <<<
 size: 2566
-location: clients/tests/test-client.py:test_003()/140
+location: clients/tests/test-client.py:test_003()/144
 cmd: $NMCLI --mode tabular --pretty -f ALL con
 lang: C
 returncode: 0
@@ -6578,7 +6874,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2610
-location: clients/tests/test-client.py:test_003()/141
+location: clients/tests/test-client.py:test_003()/145
 cmd: $NMCLI --mode tabular --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6597,7 +6893,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 598
-location: clients/tests/test-client.py:test_003()/142
+location: clients/tests/test-client.py:test_003()/146
 cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -6615,7 +6911,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 628
-location: clients/tests/test-client.py:test_003()/143
+location: clients/tests/test-client.py:test_003()/147
 cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6632,12 +6928,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 5756
-location: clients/tests/test-client.py:test_003()/144
+size: 6008
+location: clients/tests/test-client.py:test_003()/148
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: C
 returncode: 0
-stdout: 5601 bytes
+stdout: 5853 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
@@ -6650,13 +6946,13 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 802-3-ethernet  --    0      --      no              --           --                  --                         --                     auto  --                --            --            default      --                   
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              0 (default)   yes                 --             --         no             yes       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -6665,26 +6961,26 @@ proxy  none    no            --       --
 ======================================================================
   Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
 ======================================================================
-GROUP    NAME      UUID                                  DEVICES  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     activated  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     --        activated  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 ======================================================================
   Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
 ======================================================================
-GROUP    NAME      UUID                                  DEVICES  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 5850
-location: clients/tests/test-client.py:test_003()/145
+size: 6102
+location: clients/tests/test-client.py:test_003()/149
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5685 bytes
+stdout: 5937 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
@@ -6697,13 +6993,13 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                     automatyczne  --                --            --            default      --                   
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              0 (default)   tak                 --             --         nie            tak       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -6712,26 +7008,26 @@ proxy  none    nie           --       --
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
 ===========================================================================
-GROUP    NAME      UUID                                  DEVICES  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     aktywowano  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     --        aktywowano  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
 ===========================================================================
-GROUP    NAME      UUID                                  DEVICES  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 4862
-location: clients/tests/test-client.py:test_003()/146
+size: 5084
+location: clients/tests/test-client.py:test_003()/150
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4667 bytes
+stdout: 4889 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
@@ -6744,13 +7040,13 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 802-3-ethernet  --    0      --      no              --           --                  --                         --                     auto  --                --            --            default      --                   
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              0 (default)   yes                 --             --         no             yes       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -6759,18 +7055,18 @@ proxy  none    no            --       --
 ======================================================================
   Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
 ======================================================================
-GROUP    NAME      UUID                                  DEVICES  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 4934
-location: clients/tests/test-client.py:test_003()/147
+size: 5156
+location: clients/tests/test-client.py:test_003()/151
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4729 bytes
+stdout: 4951 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
@@ -6783,13 +7079,13 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                     automatyczne  --                --            --            default      --                   
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              0 (default)   tak                 --             --         nie            tak       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -6798,30 +7094,34 @@ proxy  none    nie           --       --
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
 ===========================================================================
-GROUP    NAME      UUID                                  DEVICES  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 4464
-location: clients/tests/test-client.py:test_003()/148
+size: 4718
+location: clients/tests/test-client.py:test_003()/152
 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4303 bytes
+stdout: 4557 bytes
 >>>
 =========================
   Device details (eth0)
 =========================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  no              100 Mb/s  no           no    
 
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  yes  yes       no      
+
 NAME              CARRIER  S390-SUBCHANNELS 
 ---------------------------------------------
 WIRED-PROPERTIES  off      --               
@@ -6847,24 +7147,28 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet 
 
 <<<
-size: 4532
-location: clients/tests/test-client.py:test_003()/149
+size: 4786
+location: clients/tests/test-client.py:test_003()/153
 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4361 bytes
+stdout: 4615 bytes
 >>>
 ==================================
   Informacje o urządzeniu (eth0)
 ==================================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  nie             100 Mb/s  nie          nie   
 
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  tak  tak       nie     
+
 NAME              CARRIER    S390-SUBCHANNELS 
 -----------------------------------------------
 WIRED-PROPERTIES  wyłączone  --               
@@ -6891,7 +7195,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6
 
 <<<
 size: 2848
-location: clients/tests/test-client.py:test_003()/150
+location: clients/tests/test-client.py:test_003()/154
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con
 lang: C
 returncode: 0
@@ -6910,7 +7214,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2892
-location: clients/tests/test-client.py:test_003()/151
+location: clients/tests/test-client.py:test_003()/155
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6929,7 +7233,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 628
-location: clients/tests/test-client.py:test_003()/152
+location: clients/tests/test-client.py:test_003()/156
 cmd: $NMCLI --mode tabular --pretty --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -6947,7 +7251,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 658
-location: clients/tests/test-client.py:test_003()/153
+location: clients/tests/test-client.py:test_003()/157
 cmd: $NMCLI --mode tabular --pretty --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6964,12 +7268,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 5768
-location: clients/tests/test-client.py:test_003()/154
+size: 6020
+location: clients/tests/test-client.py:test_003()/158
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 5601 bytes
+stdout: 5853 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
@@ -6982,13 +7286,13 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 802-3-ethernet  --    0      --      no              --           --                  --                         --                     auto  --                --            --            default      --                   
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              0 (default)   yes                 --             --         no             yes       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -6997,26 +7301,26 @@ proxy  none    no            --       --
 ======================================================================
   Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
 ======================================================================
-GROUP    NAME      UUID                                  DEVICES  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     activated  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     --        activated  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 ======================================================================
   Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
 ======================================================================
-GROUP    NAME      UUID                                  DEVICES  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 5862
-location: clients/tests/test-client.py:test_003()/155
+size: 6114
+location: clients/tests/test-client.py:test_003()/159
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5685 bytes
+stdout: 5937 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
@@ -7029,13 +7333,13 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                     automatyczne  --                --            --            default      --                   
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              0 (default)   tak                 --             --         nie            tak       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -7044,26 +7348,26 @@ proxy  none    nie           --       --
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
 ===========================================================================
-GROUP    NAME      UUID                                  DEVICES  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     aktywowano  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     --        aktywowano  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
 ===========================================================================
-GROUP    NAME      UUID                                  DEVICES  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 4874
-location: clients/tests/test-client.py:test_003()/156
+size: 5096
+location: clients/tests/test-client.py:test_003()/160
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4667 bytes
+stdout: 4889 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
@@ -7076,13 +7380,13 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 802-3-ethernet  --    0      --      no              --           --                  --                         --                     auto  --                --            --            default      --                   
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              0 (default)   yes                 --             --         no             yes       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -7091,18 +7395,18 @@ proxy  none    no            --       --
 ======================================================================
   Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
 ======================================================================
-GROUP    NAME      UUID                                  DEVICES  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 4946
-location: clients/tests/test-client.py:test_003()/157
+size: 5168
+location: clients/tests/test-client.py:test_003()/161
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4729 bytes
+stdout: 4951 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
@@ -7115,13 +7419,13 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                     automatyczne  --                --            --            default      --                   
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              0 (default)   tak                 --             --         nie            tak       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -7130,30 +7434,34 @@ proxy  none    nie           --       --
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
 ===========================================================================
-GROUP    NAME      UUID                                  DEVICES  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 4476
-location: clients/tests/test-client.py:test_003()/158
+size: 4730
+location: clients/tests/test-client.py:test_003()/162
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4303 bytes
+stdout: 4557 bytes
 >>>
 =========================
   Device details (eth0)
 =========================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  no              100 Mb/s  no           no    
 
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  yes  yes       no      
+
 NAME              CARRIER  S390-SUBCHANNELS 
 ---------------------------------------------
 WIRED-PROPERTIES  off      --               
@@ -7179,24 +7487,28 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet 
 
 <<<
-size: 4544
-location: clients/tests/test-client.py:test_003()/159
+size: 4798
+location: clients/tests/test-client.py:test_003()/163
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4361 bytes
+stdout: 4615 bytes
 >>>
 ==================================
   Informacje o urządzeniu (eth0)
 ==================================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  nie             100 Mb/s  nie          nie   
 
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  tak  tak       nie     
+
 NAME              CARRIER    S390-SUBCHANNELS 
 -----------------------------------------------
 WIRED-PROPERTIES  wyłączone  --               
@@ -7223,7 +7535,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6
 
 <<<
 size: 1196
-location: clients/tests/test-client.py:test_003()/160
+location: clients/tests/test-client.py:test_003()/164
 cmd: $NMCLI --mode tabular --terse -f ALL con
 lang: C
 returncode: 0
@@ -7237,7 +7549,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 1206
-location: clients/tests/test-client.py:test_003()/161
+location: clients/tests/test-client.py:test_003()/165
 cmd: $NMCLI --mode tabular --terse -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7251,7 +7563,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 352
-location: clients/tests/test-client.py:test_003()/162
+location: clients/tests/test-client.py:test_003()/166
 cmd: $NMCLI --mode tabular --terse -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -7264,7 +7576,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 362
-location: clients/tests/test-client.py:test_003()/163
+location: clients/tests/test-client.py:test_003()/167
 cmd: $NMCLI --mode tabular --terse -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7276,79 +7588,80 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 827
-location: clients/tests/test-client.py:test_003()/164
+size: 839
+location: clients/tests/test-client.py:test_003()/168
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: C
 returncode: 0
-stdout: 674 bytes
+stdout: 686 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
-ipv4:auto::::0::::-1:0::no:no::0:yes:::no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
 proxy:none:no::
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/4::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 837
-location: clients/tests/test-client.py:test_003()/165
+size: 849
+location: clients/tests/test-client.py:test_003()/169
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 674 bytes
+stdout: 686 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
-ipv4:auto::::0::::-1:0::no:no::0:yes:::no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
 proxy:none:no::
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/4::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 680
-location: clients/tests/test-client.py:test_003()/166
+size: 691
+location: clients/tests/test-client.py:test_003()/170
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 487 bytes
+stdout: 498 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
-ipv4:auto::::0::::-1:0::no:no::0:yes:::no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
 proxy:none:no::
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 690
-location: clients/tests/test-client.py:test_003()/167
+size: 701
+location: clients/tests/test-client.py:test_003()/171
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 487 bytes
+stdout: 498 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
-ipv4:auto::::0::::-1:0::no:no::0:yes:::no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
 proxy:none:no::
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 1371
-location: clients/tests/test-client.py:test_003()/168
+size: 1440
+location: clients/tests/test-client.py:test_003()/172
 cmd: $NMCLI --mode tabular --terse -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 1211 bytes
+stdout: 1280 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
+INTERFACE-FLAGS:yes:yes:no
 WIRED-PROPERTIES:off:
 IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
 DHCP4:
@@ -7357,15 +7670,16 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 1381
-location: clients/tests/test-client.py:test_003()/169
+size: 1450
+location: clients/tests/test-client.py:test_003()/173
 cmd: $NMCLI --mode tabular --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1211 bytes
+stdout: 1280 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
+INTERFACE-FLAGS:yes:yes:no
 WIRED-PROPERTIES:off:
 IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
 DHCP4:
@@ -7375,7 +7689,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7
 
 <<<
 size: 1478
-location: clients/tests/test-client.py:test_003()/170
+location: clients/tests/test-client.py:test_003()/174
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con
 lang: C
 returncode: 0
@@ -7389,7 +7703,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 1488
-location: clients/tests/test-client.py:test_003()/171
+location: clients/tests/test-client.py:test_003()/175
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7403,7 +7717,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 382
-location: clients/tests/test-client.py:test_003()/172
+location: clients/tests/test-client.py:test_003()/176
 cmd: $NMCLI --mode tabular --terse --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -7416,7 +7730,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 392
-location: clients/tests/test-client.py:test_003()/173
+location: clients/tests/test-client.py:test_003()/177
 cmd: $NMCLI --mode tabular --terse --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7428,79 +7742,80 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 839
-location: clients/tests/test-client.py:test_003()/174
+size: 851
+location: clients/tests/test-client.py:test_003()/178
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 674 bytes
+stdout: 686 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
-ipv4:auto::::0::::-1:0::no:no::0:yes:::no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
 proxy:none:no::
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/4::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 849
-location: clients/tests/test-client.py:test_003()/175
+size: 861
+location: clients/tests/test-client.py:test_003()/179
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 674 bytes
+stdout: 686 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
-ipv4:auto::::0::::-1:0::no:no::0:yes:::no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
 proxy:none:no::
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/4::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1::activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 692
-location: clients/tests/test-client.py:test_003()/176
+size: 703
+location: clients/tests/test-client.py:test_003()/180
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 487 bytes
+stdout: 498 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
-ipv4:auto::::0::::-1:0::no:no::0:yes:::no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
 proxy:none:no::
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 702
-location: clients/tests/test-client.py:test_003()/177
+size: 713
+location: clients/tests/test-client.py:test_003()/181
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 487 bytes
+stdout: 498 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
 802-3-ethernet::0::no:::::auto::::default:
-ipv4:auto::::0::::-1:0::no:no::0:yes:::no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
 proxy:none:no::
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 1383
-location: clients/tests/test-client.py:test_003()/178
+size: 1452
+location: clients/tests/test-client.py:test_003()/182
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 1211 bytes
+stdout: 1280 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
+INTERFACE-FLAGS:yes:yes:no
 WIRED-PROPERTIES:off:
 IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
 DHCP4:
@@ -7509,15 +7824,16 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 1393
-location: clients/tests/test-client.py:test_003()/179
+size: 1462
+location: clients/tests/test-client.py:test_003()/183
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1211 bytes
+stdout: 1280 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
+INTERFACE-FLAGS:yes:yes:no
 WIRED-PROPERTIES:off:
 IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
 DHCP4:
@@ -7527,7 +7843,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7
 
 <<<
 size: 4194
-location: clients/tests/test-client.py:test_003()/180
+location: clients/tests/test-client.py:test_003()/184
 cmd: $NMCLI --mode multiline -f ALL con
 lang: C
 returncode: 0
@@ -7611,7 +7927,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 4216
-location: clients/tests/test-client.py:test_003()/181
+location: clients/tests/test-client.py:test_003()/185
 cmd: $NMCLI --mode multiline -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7695,7 +8011,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 648
-location: clients/tests/test-client.py:test_003()/182
+location: clients/tests/test-client.py:test_003()/186
 cmd: $NMCLI --mode multiline -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -7712,7 +8028,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 658
-location: clients/tests/test-client.py:test_003()/183
+location: clients/tests/test-client.py:test_003()/187
 cmd: $NMCLI --mode multiline -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7728,12 +8044,12 @@ UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:                                   ethernet
 
 <<<
-size: 5273
-location: clients/tests/test-client.py:test_003()/184
+size: 5547
+location: clients/tests/test-client.py:test_003()/188
 cmd: $NMCLI --mode multiline con s ethernet
 lang: C
 returncode: 0
-stdout: 5125 bytes
+stdout: 5399 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -7787,10 +8103,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -7812,8 +8130,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     no
@@ -7822,6 +8142,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth1
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -7835,6 +8156,7 @@ GENERAL.MASTER-PATH:                    --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -7846,12 +8168,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5310
-location: clients/tests/test-client.py:test_003()/185
+size: 5584
+location: clients/tests/test-client.py:test_003()/189
 cmd: $NMCLI --mode multiline con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5152 bytes
+stdout: 5426 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -7905,10 +8227,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -7930,8 +8254,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     nie
@@ -7940,6 +8266,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth1
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -7953,6 +8280,7 @@ GENERAL.MASTER-PATH:                    --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -7964,12 +8292,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4648
-location: clients/tests/test-client.py:test_003()/186
+size: 4879
+location: clients/tests/test-client.py:test_003()/190
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4460 bytes
+stdout: 4691 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8023,10 +8351,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -8048,8 +8378,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     no
@@ -8058,6 +8390,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -8069,12 +8402,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4681
-location: clients/tests/test-client.py:test_003()/187
+size: 4912
+location: clients/tests/test-client.py:test_003()/191
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4483 bytes
+stdout: 4714 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8128,10 +8461,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -8153,8 +8488,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     nie
@@ -8163,6 +8500,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -8174,16 +8512,17 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3508
-location: clients/tests/test-client.py:test_003()/188
+size: 3721
+location: clients/tests/test-client.py:test_003()/192
 cmd: $NMCLI --mode multiline -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3354 bytes
+stdout: 3567 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -8211,6 +8550,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIRED-PROPERTIES.CARRIER:               off
 IP4.ADDRESS[1]:                         192.168.6.238/29
 IP4.GATEWAY:                            --
@@ -8240,16 +8582,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 3543
-location: clients/tests/test-client.py:test_003()/189
+size: 3757
+location: clients/tests/test-client.py:test_003()/193
 cmd: $NMCLI --mode multiline -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3379 bytes
+stdout: 3593 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -8277,6 +8620,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIRED-PROPERTIES.CARRIER:               wyłączone
 IP4.ADDRESS[1]:                         192.168.6.238/29
 IP4.GATEWAY:                            --
@@ -8307,7 +8653,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 4476
-location: clients/tests/test-client.py:test_003()/190
+location: clients/tests/test-client.py:test_003()/194
 cmd: $NMCLI --mode multiline --color yes -f ALL con
 lang: C
 returncode: 0
@@ -8391,7 +8737,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 4498
-location: clients/tests/test-client.py:test_003()/191
+location: clients/tests/test-client.py:test_003()/195
 cmd: $NMCLI --mode multiline --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -8475,7 +8821,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 678
-location: clients/tests/test-client.py:test_003()/192
+location: clients/tests/test-client.py:test_003()/196
 cmd: $NMCLI --mode multiline --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -8492,7 +8838,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 688
-location: clients/tests/test-client.py:test_003()/193
+location: clients/tests/test-client.py:test_003()/197
 cmd: $NMCLI --mode multiline --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -8508,12 +8854,12 @@ UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:                                   ethernet
 
 <<<
-size: 5285
-location: clients/tests/test-client.py:test_003()/194
+size: 5559
+location: clients/tests/test-client.py:test_003()/198
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 5125 bytes
+stdout: 5399 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8567,10 +8913,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -8592,8 +8940,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     no
@@ -8602,6 +8952,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth1
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -8615,6 +8966,7 @@ GENERAL.MASTER-PATH:                    --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -8626,12 +8978,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5322
-location: clients/tests/test-client.py:test_003()/195
+size: 5596
+location: clients/tests/test-client.py:test_003()/199
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5152 bytes
+stdout: 5426 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8685,10 +9037,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -8710,8 +9064,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     nie
@@ -8720,6 +9076,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth1
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -8733,6 +9090,7 @@ GENERAL.MASTER-PATH:                    --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -8744,12 +9102,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4660
-location: clients/tests/test-client.py:test_003()/196
+size: 4891
+location: clients/tests/test-client.py:test_003()/200
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4460 bytes
+stdout: 4691 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8803,10 +9161,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -8828,8 +9188,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     no
@@ -8838,6 +9200,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -8849,12 +9212,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4693
-location: clients/tests/test-client.py:test_003()/197
+size: 4924
+location: clients/tests/test-client.py:test_003()/201
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4483 bytes
+stdout: 4714 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8908,10 +9271,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -8933,8 +9298,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     nie
@@ -8943,6 +9310,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -8954,16 +9322,17 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3520
-location: clients/tests/test-client.py:test_003()/198
+size: 3733
+location: clients/tests/test-client.py:test_003()/202
 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3354 bytes
+stdout: 3567 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -8991,6 +9360,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIRED-PROPERTIES.CARRIER:               off
 IP4.ADDRESS[1]:                         192.168.6.238/29
 IP4.GATEWAY:                            --
@@ -9020,16 +9392,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 3555
-location: clients/tests/test-client.py:test_003()/199
+size: 3769
+location: clients/tests/test-client.py:test_003()/203
 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3379 bytes
+stdout: 3593 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -9057,6 +9430,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIRED-PROPERTIES.CARRIER:               wyłączone
 IP4.ADDRESS[1]:                         192.168.6.238/29
 IP4.GATEWAY:                            --
@@ -9087,7 +9463,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 4820
-location: clients/tests/test-client.py:test_003()/200
+location: clients/tests/test-client.py:test_003()/204
 cmd: $NMCLI --mode multiline --pretty -f ALL con
 lang: C
 returncode: 0
@@ -9179,7 +9555,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 4848
-location: clients/tests/test-client.py:test_003()/201
+location: clients/tests/test-client.py:test_003()/205
 cmd: $NMCLI --mode multiline --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9271,7 +9647,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 1195
-location: clients/tests/test-client.py:test_003()/202
+location: clients/tests/test-client.py:test_003()/206
 cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -9295,7 +9671,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 1211
-location: clients/tests/test-client.py:test_003()/203
+location: clients/tests/test-client.py:test_003()/207
 cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9318,12 +9694,12 @@ TYPE:                                   ethernet
 -------------------------------------------------------------------------------
 
 <<<
-size: 6527
-location: clients/tests/test-client.py:test_003()/204
+size: 6801
+location: clients/tests/test-client.py:test_003()/208
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: C
 returncode: 0
-stdout: 6370 bytes
+stdout: 6644 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -9382,10 +9758,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -9408,8 +9786,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 proxy.method:                           none
@@ -9423,6 +9803,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth1
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -9440,6 +9821,7 @@ GENERAL.MASTER-PATH:                    --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -9452,12 +9834,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6583
-location: clients/tests/test-client.py:test_003()/205
+size: 6857
+location: clients/tests/test-client.py:test_003()/209
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6416 bytes
+stdout: 6690 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -9516,10 +9898,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -9542,8 +9926,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 proxy.method:                           none
@@ -9557,6 +9943,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth1
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -9574,6 +9961,7 @@ GENERAL.MASTER-PATH:                    --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -9586,12 +9974,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5589
-location: clients/tests/test-client.py:test_003()/206
+size: 5820
+location: clients/tests/test-client.py:test_003()/210
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 5392 bytes
+stdout: 5623 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -9650,10 +10038,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -9676,8 +10066,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 proxy.method:                           none
@@ -9691,6 +10083,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -9703,12 +10096,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5634
-location: clients/tests/test-client.py:test_003()/207
+size: 5865
+location: clients/tests/test-client.py:test_003()/211
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5427 bytes
+stdout: 5658 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -9767,10 +10160,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -9793,8 +10188,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 proxy.method:                           none
@@ -9808,6 +10205,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -9820,12 +10218,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4368
-location: clients/tests/test-client.py:test_003()/208
+size: 4661
+location: clients/tests/test-client.py:test_003()/212
 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4205 bytes
+stdout: 4498 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -9833,6 +10231,7 @@ stdout: 4205 bytes
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -9862,6 +10261,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               off
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.6.238/29
@@ -9897,12 +10300,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 -------------------------------------------------------------------------------
 
 <<<
-size: 4409
-location: clients/tests/test-client.py:test_003()/209
+size: 4703
+location: clients/tests/test-client.py:test_003()/213
 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4236 bytes
+stdout: 4530 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -9910,6 +10313,7 @@ stdout: 4236 bytes
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -9939,6 +10343,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               wyłączone
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.6.238/29
@@ -9975,7 +10383,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 5102
-location: clients/tests/test-client.py:test_003()/210
+location: clients/tests/test-client.py:test_003()/214
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con
 lang: C
 returncode: 0
@@ -10067,7 +10475,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 5130
-location: clients/tests/test-client.py:test_003()/211
+location: clients/tests/test-client.py:test_003()/215
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10159,7 +10567,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 1225
-location: clients/tests/test-client.py:test_003()/212
+location: clients/tests/test-client.py:test_003()/216
 cmd: $NMCLI --mode multiline --pretty --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -10183,7 +10591,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 1241
-location: clients/tests/test-client.py:test_003()/213
+location: clients/tests/test-client.py:test_003()/217
 cmd: $NMCLI --mode multiline --pretty --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10206,12 +10614,12 @@ TYPE:                                   ethernet
 -------------------------------------------------------------------------------
 
 <<<
-size: 6539
-location: clients/tests/test-client.py:test_003()/214
+size: 6813
+location: clients/tests/test-client.py:test_003()/218
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 6370 bytes
+stdout: 6644 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -10270,10 +10678,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -10296,8 +10706,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 proxy.method:                           none
@@ -10311,6 +10723,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth1
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -10328,6 +10741,7 @@ GENERAL.MASTER-PATH:                    --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -10340,12 +10754,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6595
-location: clients/tests/test-client.py:test_003()/215
+size: 6869
+location: clients/tests/test-client.py:test_003()/219
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6416 bytes
+stdout: 6690 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -10404,10 +10818,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -10430,8 +10846,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 proxy.method:                           none
@@ -10445,6 +10863,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth1
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -10462,6 +10881,7 @@ GENERAL.MASTER-PATH:                    --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -10474,12 +10894,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5601
-location: clients/tests/test-client.py:test_003()/216
+size: 5832
+location: clients/tests/test-client.py:test_003()/220
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 5392 bytes
+stdout: 5623 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -10538,10 +10958,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -10564,8 +10986,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 proxy.method:                           none
@@ -10579,6 +11003,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -10591,12 +11016,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5646
-location: clients/tests/test-client.py:test_003()/217
+size: 5877
+location: clients/tests/test-client.py:test_003()/221
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5427 bytes
+stdout: 5658 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -10655,10 +11080,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -10681,8 +11108,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 proxy.method:                           none
@@ -10696,6 +11125,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -10708,12 +11138,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4380
-location: clients/tests/test-client.py:test_003()/218
+size: 4673
+location: clients/tests/test-client.py:test_003()/222
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4205 bytes
+stdout: 4498 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -10721,6 +11151,7 @@ stdout: 4205 bytes
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -10750,6 +11181,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               off
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.6.238/29
@@ -10785,12 +11220,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 -------------------------------------------------------------------------------
 
 <<<
-size: 4421
-location: clients/tests/test-client.py:test_003()/219
+size: 4715
+location: clients/tests/test-client.py:test_003()/223
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4236 bytes
+stdout: 4530 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -10798,6 +11233,7 @@ stdout: 4236 bytes
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -10827,6 +11263,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               wyłączone
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.6.238/29
@@ -10863,7 +11303,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 
 <<<
 size: 1893
-location: clients/tests/test-client.py:test_003()/220
+location: clients/tests/test-client.py:test_003()/224
 cmd: $NMCLI --mode multiline --terse -f ALL con
 lang: C
 returncode: 0
@@ -10947,7 +11387,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 1903
-location: clients/tests/test-client.py:test_003()/221
+location: clients/tests/test-client.py:test_003()/225
 cmd: $NMCLI --mode multiline --terse -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -11031,7 +11471,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 394
-location: clients/tests/test-client.py:test_003()/222
+location: clients/tests/test-client.py:test_003()/226
 cmd: $NMCLI --mode multiline --terse -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -11048,7 +11488,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 404
-location: clients/tests/test-client.py:test_003()/223
+location: clients/tests/test-client.py:test_003()/227
 cmd: $NMCLI --mode multiline --terse -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -11064,12 +11504,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:802-3-ethernet
 
 <<<
-size: 2854
-location: clients/tests/test-client.py:test_003()/224
+size: 2980
+location: clients/tests/test-client.py:test_003()/228
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: C
 returncode: 0
-stdout: 2698 bytes
+stdout: 2824 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11123,10 +11563,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -11148,8 +11590,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 proxy.method:none
 proxy.browser-only:no
@@ -11158,6 +11602,7 @@ proxy.pac-script:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth1
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -11171,6 +11616,7 @@ GENERAL.MASTER-PATH:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -11182,12 +11628,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2864
-location: clients/tests/test-client.py:test_003()/225
+size: 2990
+location: clients/tests/test-client.py:test_003()/229
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2698 bytes
+stdout: 2824 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11241,10 +11687,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -11266,8 +11714,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 proxy.method:none
 proxy.browser-only:no
@@ -11276,6 +11726,7 @@ proxy.pac-script:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth1
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -11289,6 +11740,7 @@ GENERAL.MASTER-PATH:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -11300,12 +11752,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2526
-location: clients/tests/test-client.py:test_003()/226
+size: 2634
+location: clients/tests/test-client.py:test_003()/230
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2330 bytes
+stdout: 2438 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11359,10 +11811,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -11384,8 +11838,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 proxy.method:none
 proxy.browser-only:no
@@ -11394,6 +11850,7 @@ proxy.pac-script:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -11405,12 +11862,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2536
-location: clients/tests/test-client.py:test_003()/227
+size: 2644
+location: clients/tests/test-client.py:test_003()/231
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2330 bytes
+stdout: 2438 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11464,10 +11921,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -11489,8 +11948,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 proxy.method:none
 proxy.browser-only:no
@@ -11499,6 +11960,7 @@ proxy.pac-script:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -11510,16 +11972,17 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2258
-location: clients/tests/test-client.py:test_003()/228
+size: 2397
+location: clients/tests/test-client.py:test_003()/232
 cmd: $NMCLI --mode multiline --terse -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2096 bytes
+stdout: 2235 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -11547,6 +12010,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
@@ -11576,16 +12042,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2268
-location: clients/tests/test-client.py:test_003()/229
+size: 2407
+location: clients/tests/test-client.py:test_003()/233
 cmd: $NMCLI --mode multiline --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2096 bytes
+stdout: 2235 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -11613,6 +12080,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
@@ -11643,7 +12113,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 2175
-location: clients/tests/test-client.py:test_003()/230
+location: clients/tests/test-client.py:test_003()/234
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con
 lang: C
 returncode: 0
@@ -11727,7 +12197,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 2185
-location: clients/tests/test-client.py:test_003()/231
+location: clients/tests/test-client.py:test_003()/235
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -11811,7 +12281,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 424
-location: clients/tests/test-client.py:test_003()/232
+location: clients/tests/test-client.py:test_003()/236
 cmd: $NMCLI --mode multiline --terse --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -11828,7 +12298,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 434
-location: clients/tests/test-client.py:test_003()/233
+location: clients/tests/test-client.py:test_003()/237
 cmd: $NMCLI --mode multiline --terse --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -11844,12 +12314,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:802-3-ethernet
 
 <<<
-size: 2866
-location: clients/tests/test-client.py:test_003()/234
+size: 2992
+location: clients/tests/test-client.py:test_003()/238
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 2698 bytes
+stdout: 2824 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11903,10 +12373,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -11928,8 +12400,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 proxy.method:none
 proxy.browser-only:no
@@ -11938,6 +12412,7 @@ proxy.pac-script:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth1
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -11951,6 +12426,7 @@ GENERAL.MASTER-PATH:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -11962,12 +12438,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2876
-location: clients/tests/test-client.py:test_003()/235
+size: 3002
+location: clients/tests/test-client.py:test_003()/239
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2698 bytes
+stdout: 2824 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -12021,10 +12497,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -12046,8 +12524,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 proxy.method:none
 proxy.browser-only:no
@@ -12056,6 +12536,7 @@ proxy.pac-script:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth1
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -12069,6 +12550,7 @@ GENERAL.MASTER-PATH:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -12080,12 +12562,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2538
-location: clients/tests/test-client.py:test_003()/236
+size: 2646
+location: clients/tests/test-client.py:test_003()/240
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2330 bytes
+stdout: 2438 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -12139,10 +12621,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -12164,8 +12648,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 proxy.method:none
 proxy.browser-only:no
@@ -12174,6 +12660,7 @@ proxy.pac-script:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -12185,12 +12672,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2548
-location: clients/tests/test-client.py:test_003()/237
+size: 2656
+location: clients/tests/test-client.py:test_003()/241
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2330 bytes
+stdout: 2438 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -12244,10 +12731,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -12269,8 +12758,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 proxy.method:none
 proxy.browser-only:no
@@ -12279,6 +12770,7 @@ proxy.pac-script:
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -12290,16 +12782,17 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2270
-location: clients/tests/test-client.py:test_003()/238
+size: 2409
+location: clients/tests/test-client.py:test_003()/242
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2096 bytes
+stdout: 2235 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -12327,6 +12820,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
@@ -12356,16 +12852,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2280
-location: clients/tests/test-client.py:test_003()/239
+size: 2419
+location: clients/tests/test-client.py:test_003()/243
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2096 bytes
+stdout: 2235 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -12393,6 +12890,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
@@ -12423,7 +12923,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethe
 
 <<<
 size: 2065
-location: clients/tests/test-client.py:test_003()/240
+location: clients/tests/test-client.py:test_003()/244
 cmd: $NMCLI -f ALL con
 lang: C
 returncode: 0
@@ -12438,7 +12938,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2087
-location: clients/tests/test-client.py:test_003()/241
+location: clients/tests/test-client.py:test_003()/245
 cmd: $NMCLI -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12453,7 +12953,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 324
-location: clients/tests/test-client.py:test_003()/242
+location: clients/tests/test-client.py:test_003()/246
 cmd: $NMCLI -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -12466,7 +12966,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 334
-location: clients/tests/test-client.py:test_003()/243
+location: clients/tests/test-client.py:test_003()/247
 cmd: $NMCLI -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12479,7 +12979,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 176
-location: clients/tests/test-client.py:test_003()/244
+location: clients/tests/test-client.py:test_003()/248
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 10
@@ -12489,7 +12989,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 198
-location: clients/tests/test-client.py:test_003()/245
+location: clients/tests/test-client.py:test_003()/249
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -12498,16 +12998,17 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 837
-location: clients/tests/test-client.py:test_003()/246
+size: 880
+location: clients/tests/test-client.py:test_003()/250
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 667 bytes
+stdout: 710 bytes
 >>>
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -12519,16 +13020,17 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 852
-location: clients/tests/test-client.py:test_003()/247
+size: 895
+location: clients/tests/test-client.py:test_003()/251
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 672 bytes
+stdout: 715 bytes
 >>>
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -12540,16 +13042,17 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3511
-location: clients/tests/test-client.py:test_003()/248
+size: 3724
+location: clients/tests/test-client.py:test_003()/252
 cmd: $NMCLI -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3374 bytes
+stdout: 3587 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -12577,6 +13080,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIRED-PROPERTIES.CARRIER:               off
 IP4.ADDRESS[1]:                         192.168.6.238/29
 IP4.GATEWAY:                            --
@@ -12606,16 +13112,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 3548
-location: clients/tests/test-client.py:test_003()/249
+size: 3762
+location: clients/tests/test-client.py:test_003()/253
 cmd: $NMCLI -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3401 bytes
+stdout: 3615 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -12643,6 +13150,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIRED-PROPERTIES.CARRIER:               wyłączone
 IP4.ADDRESS[1]:                         192.168.6.238/29
 IP4.GATEWAY:                            --
@@ -12673,7 +13183,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <niewidoczne> | /org/freedesktop/Network
 
 <<<
 size: 2347
-location: clients/tests/test-client.py:test_003()/250
+location: clients/tests/test-client.py:test_003()/254
 cmd: $NMCLI --color yes -f ALL con
 lang: C
 returncode: 0
@@ -12688,7 +13198,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2369
-location: clients/tests/test-client.py:test_003()/251
+location: clients/tests/test-client.py:test_003()/255
 cmd: $NMCLI --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12703,7 +13213,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 336
-location: clients/tests/test-client.py:test_003()/252
+location: clients/tests/test-client.py:test_003()/256
 cmd: $NMCLI --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -12716,7 +13226,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 346
-location: clients/tests/test-client.py:test_003()/253
+location: clients/tests/test-client.py:test_003()/257
 cmd: $NMCLI --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12729,7 +13239,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 188
-location: clients/tests/test-client.py:test_003()/254
+location: clients/tests/test-client.py:test_003()/258
 cmd: $NMCLI --color yes con s ethernet
 lang: C
 returncode: 10
@@ -12739,7 +13249,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 210
-location: clients/tests/test-client.py:test_003()/255
+location: clients/tests/test-client.py:test_003()/259
 cmd: $NMCLI --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -12748,16 +13258,17 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 849
-location: clients/tests/test-client.py:test_003()/256
+size: 892
+location: clients/tests/test-client.py:test_003()/260
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 667 bytes
+stdout: 710 bytes
 >>>
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -12769,16 +13280,17 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 864
-location: clients/tests/test-client.py:test_003()/257
+size: 907
+location: clients/tests/test-client.py:test_003()/261
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 672 bytes
+stdout: 715 bytes
 >>>
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -12790,16 +13302,17 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3523
-location: clients/tests/test-client.py:test_003()/258
+size: 3736
+location: clients/tests/test-client.py:test_003()/262
 cmd: $NMCLI --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3374 bytes
+stdout: 3587 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -12827,6 +13340,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIRED-PROPERTIES.CARRIER:               off
 IP4.ADDRESS[1]:                         192.168.6.238/29
 IP4.GATEWAY:                            --
@@ -12856,16 +13372,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 3560
-location: clients/tests/test-client.py:test_003()/259
+size: 3774
+location: clients/tests/test-client.py:test_003()/263
 cmd: $NMCLI --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3401 bytes
+stdout: 3615 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -12893,6 +13410,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIRED-PROPERTIES.CARRIER:               wyłączone
 IP4.ADDRESS[1]:                         192.168.6.238/29
 IP4.GATEWAY:                            --
@@ -12923,7 +13443,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <niewidoczne> | /org/freedesktop/Network
 
 <<<
 size: 2551
-location: clients/tests/test-client.py:test_003()/260
+location: clients/tests/test-client.py:test_003()/264
 cmd: $NMCLI --pretty -f ALL con
 lang: C
 returncode: 0
@@ -12942,7 +13462,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2595
-location: clients/tests/test-client.py:test_003()/261
+location: clients/tests/test-client.py:test_003()/265
 cmd: $NMCLI --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12961,7 +13481,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 535
-location: clients/tests/test-client.py:test_003()/262
+location: clients/tests/test-client.py:test_003()/266
 cmd: $NMCLI --pretty -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -12978,7 +13498,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 565
-location: clients/tests/test-client.py:test_003()/263
+location: clients/tests/test-client.py:test_003()/267
 cmd: $NMCLI --pretty -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12995,7 +13515,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 185
-location: clients/tests/test-client.py:test_003()/264
+location: clients/tests/test-client.py:test_003()/268
 cmd: $NMCLI --pretty con s ethernet
 lang: C
 returncode: 10
@@ -13005,7 +13525,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 207
-location: clients/tests/test-client.py:test_003()/265
+location: clients/tests/test-client.py:test_003()/269
 cmd: $NMCLI --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -13014,12 +13534,12 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 1373
-location: clients/tests/test-client.py:test_003()/266
+size: 1416
+location: clients/tests/test-client.py:test_003()/270
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 1193 bytes
+stdout: 1236 bytes
 >>>
 ===============================================================================
                           Connection profile details
@@ -13030,6 +13550,7 @@ stdout: 1193 bytes
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -13042,12 +13563,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 1400
-location: clients/tests/test-client.py:test_003()/267
+size: 1443
+location: clients/tests/test-client.py:test_003()/271
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1210 bytes
+stdout: 1253 bytes
 >>>
 ===============================================================================
                          Szczegóły profilu połączenia
@@ -13058,6 +13579,7 @@ stdout: 1210 bytes
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -13070,12 +13592,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4371
-location: clients/tests/test-client.py:test_003()/268
+size: 4664
+location: clients/tests/test-client.py:test_003()/272
 cmd: $NMCLI --pretty -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4225 bytes
+stdout: 4518 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -13083,6 +13605,7 @@ stdout: 4225 bytes
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -13112,6 +13635,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               off
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.6.238/29
@@ -13147,12 +13674,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkMa
 -------------------------------------------------------------------------------
 
 <<<
-size: 4414
-location: clients/tests/test-client.py:test_003()/269
+size: 4708
+location: clients/tests/test-client.py:test_003()/273
 cmd: $NMCLI --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4258 bytes
+stdout: 4552 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -13160,6 +13687,7 @@ stdout: 4258 bytes
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -13189,6 +13717,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               wyłączone
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.6.238/29
@@ -13225,7 +13757,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <niewidoczne> | /org/freedesktop/Network
 
 <<<
 size: 2833
-location: clients/tests/test-client.py:test_003()/270
+location: clients/tests/test-client.py:test_003()/274
 cmd: $NMCLI --pretty --color yes -f ALL con
 lang: C
 returncode: 0
@@ -13244,7 +13776,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2877
-location: clients/tests/test-client.py:test_003()/271
+location: clients/tests/test-client.py:test_003()/275
 cmd: $NMCLI --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13263,7 +13795,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 547
-location: clients/tests/test-client.py:test_003()/272
+location: clients/tests/test-client.py:test_003()/276
 cmd: $NMCLI --pretty --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -13280,7 +13812,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 577
-location: clients/tests/test-client.py:test_003()/273
+location: clients/tests/test-client.py:test_003()/277
 cmd: $NMCLI --pretty --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13297,7 +13829,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 197
-location: clients/tests/test-client.py:test_003()/274
+location: clients/tests/test-client.py:test_003()/278
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: C
 returncode: 10
@@ -13307,7 +13839,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 219
-location: clients/tests/test-client.py:test_003()/275
+location: clients/tests/test-client.py:test_003()/279
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -13316,12 +13848,12 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 1385
-location: clients/tests/test-client.py:test_003()/276
+size: 1428
+location: clients/tests/test-client.py:test_003()/280
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 1193 bytes
+stdout: 1236 bytes
 >>>
 ===============================================================================
                           Connection profile details
@@ -13332,6 +13864,7 @@ stdout: 1193 bytes
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -13344,12 +13877,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 1412
-location: clients/tests/test-client.py:test_003()/277
+size: 1455
+location: clients/tests/test-client.py:test_003()/281
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1210 bytes
+stdout: 1253 bytes
 >>>
 ===============================================================================
                          Szczegóły profilu połączenia
@@ -13360,6 +13893,7 @@ stdout: 1210 bytes
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -13372,12 +13906,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4383
-location: clients/tests/test-client.py:test_003()/278
+size: 4676
+location: clients/tests/test-client.py:test_003()/282
 cmd: $NMCLI --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4225 bytes
+stdout: 4518 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -13385,6 +13919,7 @@ stdout: 4225 bytes
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -13414,6 +13949,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               off
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.6.238/29
@@ -13449,12 +13988,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkMa
 -------------------------------------------------------------------------------
 
 <<<
-size: 4426
-location: clients/tests/test-client.py:test_003()/279
+size: 4720
+location: clients/tests/test-client.py:test_003()/283
 cmd: $NMCLI --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4258 bytes
+stdout: 4552 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -13462,6 +14001,7 @@ stdout: 4258 bytes
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -13491,6 +14031,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               wyłączone
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.6.238/29
@@ -13527,7 +14071,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <niewidoczne> | /org/freedesktop/Network
 
 <<<
 size: 1157
-location: clients/tests/test-client.py:test_003()/280
+location: clients/tests/test-client.py:test_003()/284
 cmd: $NMCLI --terse -f ALL con
 lang: C
 returncode: 0
@@ -13541,7 +14085,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 1167
-location: clients/tests/test-client.py:test_003()/281
+location: clients/tests/test-client.py:test_003()/285
 cmd: $NMCLI --terse -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13555,7 +14099,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 285
-location: clients/tests/test-client.py:test_003()/282
+location: clients/tests/test-client.py:test_003()/286
 cmd: $NMCLI --terse -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -13567,7 +14111,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 295
-location: clients/tests/test-client.py:test_003()/283
+location: clients/tests/test-client.py:test_003()/287
 cmd: $NMCLI --terse -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13579,7 +14123,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 184
-location: clients/tests/test-client.py:test_003()/284
+location: clients/tests/test-client.py:test_003()/288
 cmd: $NMCLI --terse con s ethernet
 lang: C
 returncode: 10
@@ -13589,7 +14133,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 206
-location: clients/tests/test-client.py:test_003()/285
+location: clients/tests/test-client.py:test_003()/289
 cmd: $NMCLI --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -13598,16 +14142,17 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 548
-location: clients/tests/test-client.py:test_003()/286
+size: 566
+location: clients/tests/test-client.py:test_003()/290
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 370 bytes
+stdout: 388 bytes
 >>>
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -13619,16 +14164,17 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 558
-location: clients/tests/test-client.py:test_003()/287
+size: 576
+location: clients/tests/test-client.py:test_003()/291
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 370 bytes
+stdout: 388 bytes
 >>>
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -13640,16 +14186,17 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2261
-location: clients/tests/test-client.py:test_003()/288
+size: 2400
+location: clients/tests/test-client.py:test_003()/292
 cmd: $NMCLI --terse -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2116 bytes
+stdout: 2255 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -13677,6 +14224,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
@@ -13706,16 +14256,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:<invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 2271
-location: clients/tests/test-client.py:test_003()/289
+size: 2410
+location: clients/tests/test-client.py:test_003()/293
 cmd: $NMCLI --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2116 bytes
+stdout: 2255 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -13743,6 +14294,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
@@ -13773,7 +14327,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:<invisible> | /org/freedesktop/NetworkManag
 
 <<<
 size: 1439
-location: clients/tests/test-client.py:test_003()/290
+location: clients/tests/test-client.py:test_003()/294
 cmd: $NMCLI --terse --color yes -f ALL con
 lang: C
 returncode: 0
@@ -13787,7 +14341,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 1449
-location: clients/tests/test-client.py:test_003()/291
+location: clients/tests/test-client.py:test_003()/295
 cmd: $NMCLI --terse --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13801,7 +14355,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 297
-location: clients/tests/test-client.py:test_003()/292
+location: clients/tests/test-client.py:test_003()/296
 cmd: $NMCLI --terse --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -13813,7 +14367,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 307
-location: clients/tests/test-client.py:test_003()/293
+location: clients/tests/test-client.py:test_003()/297
 cmd: $NMCLI --terse --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13825,7 +14379,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 196
-location: clients/tests/test-client.py:test_003()/294
+location: clients/tests/test-client.py:test_003()/298
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: C
 returncode: 10
@@ -13835,7 +14389,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 218
-location: clients/tests/test-client.py:test_003()/295
+location: clients/tests/test-client.py:test_003()/299
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -13844,16 +14398,17 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 560
-location: clients/tests/test-client.py:test_003()/296
+size: 578
+location: clients/tests/test-client.py:test_003()/300
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 370 bytes
+stdout: 388 bytes
 >>>
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -13865,16 +14420,17 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 570
-location: clients/tests/test-client.py:test_003()/297
+size: 588
+location: clients/tests/test-client.py:test_003()/301
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 370 bytes
+stdout: 388 bytes
 >>>
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -13886,16 +14442,17 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2273
-location: clients/tests/test-client.py:test_003()/298
+size: 2412
+location: clients/tests/test-client.py:test_003()/302
 cmd: $NMCLI --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2116 bytes
+stdout: 2255 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -13923,6 +14480,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
@@ -13952,16 +14512,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:<invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 2283
-location: clients/tests/test-client.py:test_003()/299
+size: 2422
+location: clients/tests/test-client.py:test_003()/303
 cmd: $NMCLI --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2116 bytes
+stdout: 2255 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -13989,6 +14550,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
@@ -14019,7 +14583,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:<invisible> | /org/freedesktop/NetworkManag
 
 <<<
 size: 2080
-location: clients/tests/test-client.py:test_003()/300
+location: clients/tests/test-client.py:test_003()/304
 cmd: $NMCLI --mode tabular -f ALL con
 lang: C
 returncode: 0
@@ -14034,7 +14598,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2102
-location: clients/tests/test-client.py:test_003()/301
+location: clients/tests/test-client.py:test_003()/305
 cmd: $NMCLI --mode tabular -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14049,7 +14613,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 339
-location: clients/tests/test-client.py:test_003()/302
+location: clients/tests/test-client.py:test_003()/306
 cmd: $NMCLI --mode tabular -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -14062,7 +14626,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 349
-location: clients/tests/test-client.py:test_003()/303
+location: clients/tests/test-client.py:test_003()/307
 cmd: $NMCLI --mode tabular -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14075,7 +14639,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 191
-location: clients/tests/test-client.py:test_003()/304
+location: clients/tests/test-client.py:test_003()/308
 cmd: $NMCLI --mode tabular con s ethernet
 lang: C
 returncode: 10
@@ -14085,7 +14649,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 213
-location: clients/tests/test-client.py:test_003()/305
+location: clients/tests/test-client.py:test_003()/309
 cmd: $NMCLI --mode tabular con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -14094,43 +14658,46 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 672
-location: clients/tests/test-client.py:test_003()/306
+size: 692
+location: clients/tests/test-client.py:test_003()/310
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 487 bytes
+stdout: 507 bytes
 >>>
-GROUP    NAME      UUID                                  DEVICES  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 686
-location: clients/tests/test-client.py:test_003()/307
+size: 706
+location: clients/tests/test-client.py:test_003()/311
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 491 bytes
+stdout: 511 bytes
 >>>
-GROUP    NAME      UUID                                  DEVICES  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 3007
-location: clients/tests/test-client.py:test_003()/308
+size: 3176
+location: clients/tests/test-client.py:test_003()/312
 cmd: $NMCLI --mode tabular -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2855 bytes
+stdout: 3024 bytes
 >>>
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              100 Mb/s  no           no    
 
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  yes  yes       no      
+
 NAME              CARRIER  S390-SUBCHANNELS 
 WIRED-PROPERTIES  off      --               
 
@@ -14150,19 +14717,22 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4 
 
 <<<
-size: 3042
-location: clients/tests/test-client.py:test_003()/309
+size: 3211
+location: clients/tests/test-client.py:test_003()/313
 cmd: $NMCLI --mode tabular -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2880 bytes
+stdout: 3049 bytes
 >>>
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             100 Mb/s  nie          nie   
 
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  tak  tak       nie     
+
 NAME              CARRIER    S390-SUBCHANNELS 
 WIRED-PROPERTIES  wyłączone  --               
 
@@ -14183,7 +14753,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6
 
 <<<
 size: 2362
-location: clients/tests/test-client.py:test_003()/310
+location: clients/tests/test-client.py:test_003()/314
 cmd: $NMCLI --mode tabular --color yes -f ALL con
 lang: C
 returncode: 0
@@ -14198,7 +14768,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2384
-location: clients/tests/test-client.py:test_003()/311
+location: clients/tests/test-client.py:test_003()/315
 cmd: $NMCLI --mode tabular --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14213,7 +14783,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 351
-location: clients/tests/test-client.py:test_003()/312
+location: clients/tests/test-client.py:test_003()/316
 cmd: $NMCLI --mode tabular --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -14226,7 +14796,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 361
-location: clients/tests/test-client.py:test_003()/313
+location: clients/tests/test-client.py:test_003()/317
 cmd: $NMCLI --mode tabular --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14239,7 +14809,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 203
-location: clients/tests/test-client.py:test_003()/314
+location: clients/tests/test-client.py:test_003()/318
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: C
 returncode: 10
@@ -14249,7 +14819,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 225
-location: clients/tests/test-client.py:test_003()/315
+location: clients/tests/test-client.py:test_003()/319
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -14258,43 +14828,46 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 684
-location: clients/tests/test-client.py:test_003()/316
+size: 704
+location: clients/tests/test-client.py:test_003()/320
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 487 bytes
+stdout: 507 bytes
 >>>
-GROUP    NAME      UUID                                  DEVICES  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 698
-location: clients/tests/test-client.py:test_003()/317
+size: 718
+location: clients/tests/test-client.py:test_003()/321
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 491 bytes
+stdout: 511 bytes
 >>>
-GROUP    NAME      UUID                                  DEVICES  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 3019
-location: clients/tests/test-client.py:test_003()/318
+size: 3188
+location: clients/tests/test-client.py:test_003()/322
 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2855 bytes
+stdout: 3024 bytes
 >>>
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              100 Mb/s  no           no    
 
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  yes  yes       no      
+
 NAME              CARRIER  S390-SUBCHANNELS 
 WIRED-PROPERTIES  off      --               
 
@@ -14314,19 +14887,22 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4 
 
 <<<
-size: 3054
-location: clients/tests/test-client.py:test_003()/319
+size: 3223
+location: clients/tests/test-client.py:test_003()/323
 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2880 bytes
+stdout: 3049 bytes
 >>>
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             100 Mb/s  nie          nie   
 
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  tak  tak       nie     
+
 NAME              CARRIER    S390-SUBCHANNELS 
 WIRED-PROPERTIES  wyłączone  --               
 
@@ -14347,7 +14923,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6
 
 <<<
 size: 2566
-location: clients/tests/test-client.py:test_003()/320
+location: clients/tests/test-client.py:test_003()/324
 cmd: $NMCLI --mode tabular --pretty -f ALL con
 lang: C
 returncode: 0
@@ -14366,7 +14942,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2610
-location: clients/tests/test-client.py:test_003()/321
+location: clients/tests/test-client.py:test_003()/325
 cmd: $NMCLI --mode tabular --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14385,7 +14961,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 550
-location: clients/tests/test-client.py:test_003()/322
+location: clients/tests/test-client.py:test_003()/326
 cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -14402,7 +14978,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 580
-location: clients/tests/test-client.py:test_003()/323
+location: clients/tests/test-client.py:test_003()/327
 cmd: $NMCLI --mode tabular --pretty -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14419,7 +14995,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 200
-location: clients/tests/test-client.py:test_003()/324
+location: clients/tests/test-client.py:test_003()/328
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: C
 returncode: 10
@@ -14429,7 +15005,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 222
-location: clients/tests/test-client.py:test_003()/325
+location: clients/tests/test-client.py:test_003()/329
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -14438,12 +15014,12 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 1228
-location: clients/tests/test-client.py:test_003()/326
+size: 1258
+location: clients/tests/test-client.py:test_003()/330
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 1033 bytes
+stdout: 1063 bytes
 >>>
 ==============================
   Connection profile details
@@ -14451,18 +15027,18 @@ stdout: 1033 bytes
 ======================================================================
   Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
 ======================================================================
-GROUP    NAME      UUID                                  DEVICES  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 1273
-location: clients/tests/test-client.py:test_003()/327
+size: 1303
+location: clients/tests/test-client.py:test_003()/331
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1068 bytes
+stdout: 1098 bytes
 >>>
 ================================
   Szczegóły profilu połączenia
@@ -14470,30 +15046,34 @@ stdout: 1068 bytes
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
 ===========================================================================
-GROUP    NAME      UUID                                  DEVICES  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 4524
-location: clients/tests/test-client.py:test_003()/328
+size: 4778
+location: clients/tests/test-client.py:test_003()/332
 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4363 bytes
+stdout: 4617 bytes
 >>>
 =========================
   Device details (eth0)
 =========================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  no              100 Mb/s  no           no    
 
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  yes  yes       no      
+
 NAME              CARRIER  S390-SUBCHANNELS 
 ---------------------------------------------
 WIRED-PROPERTIES  off      --               
@@ -14519,24 +15099,28 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4 
 
 <<<
-size: 4598
-location: clients/tests/test-client.py:test_003()/329
+size: 4852
+location: clients/tests/test-client.py:test_003()/333
 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4427 bytes
+stdout: 4681 bytes
 >>>
 ==================================
   Informacje o urządzeniu (eth0)
 ==================================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  nie             100 Mb/s  nie          nie   
 
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  tak  tak       nie     
+
 NAME              CARRIER    S390-SUBCHANNELS 
 -----------------------------------------------
 WIRED-PROPERTIES  wyłączone  --               
@@ -14563,7 +15147,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6
 
 <<<
 size: 2848
-location: clients/tests/test-client.py:test_003()/330
+location: clients/tests/test-client.py:test_003()/334
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con
 lang: C
 returncode: 0
@@ -14582,7 +15166,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never
 
 <<<
 size: 2892
-location: clients/tests/test-client.py:test_003()/331
+location: clients/tests/test-client.py:test_003()/335
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14601,7 +15185,7 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy
 
 <<<
 size: 562
-location: clients/tests/test-client.py:test_003()/332
+location: clients/tests/test-client.py:test_003()/336
 cmd: $NMCLI --mode tabular --pretty --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -14618,7 +15202,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 592
-location: clients/tests/test-client.py:test_003()/333
+location: clients/tests/test-client.py:test_003()/337
 cmd: $NMCLI --mode tabular --pretty --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14635,7 +15219,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet
 
 <<<
 size: 212
-location: clients/tests/test-client.py:test_003()/334
+location: clients/tests/test-client.py:test_003()/338
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: C
 returncode: 10
@@ -14645,7 +15229,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 234
-location: clients/tests/test-client.py:test_003()/335
+location: clients/tests/test-client.py:test_003()/339
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -14654,12 +15238,12 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 1240
-location: clients/tests/test-client.py:test_003()/336
+size: 1270
+location: clients/tests/test-client.py:test_003()/340
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 1033 bytes
+stdout: 1063 bytes
 >>>
 ==============================
   Connection profile details
@@ -14667,18 +15251,18 @@ stdout: 1033 bytes
 ======================================================================
   Activate connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
 ======================================================================
-GROUP    NAME      UUID                                  DEVICES  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 1285
-location: clients/tests/test-client.py:test_003()/337
+size: 1315
+location: clients/tests/test-client.py:test_003()/341
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1068 bytes
+stdout: 1098 bytes
 >>>
 ================================
   Szczegóły profilu połączenia
@@ -14686,30 +15270,34 @@ stdout: 1068 bytes
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
 ===========================================================================
-GROUP    NAME      UUID                                  DEVICES  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     --        dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/4  --    --          
 
 
 <<<
-size: 4536
-location: clients/tests/test-client.py:test_003()/338
+size: 4790
+location: clients/tests/test-client.py:test_003()/342
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4363 bytes
+stdout: 4617 bytes
 >>>
 =========================
   Device details (eth0)
 =========================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  no              100 Mb/s  no           no    
 
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  yes  yes       no      
+
 NAME              CARRIER  S390-SUBCHANNELS 
 ---------------------------------------------
 WIRED-PROPERTIES  off      --               
@@ -14735,24 +15323,28 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4 
 
 <<<
-size: 4610
-location: clients/tests/test-client.py:test_003()/339
+size: 4864
+location: clients/tests/test-client.py:test_003()/343
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4427 bytes
+stdout: 4681 bytes
 >>>
 ==================================
   Informacje o urządzeniu (eth0)
 ==================================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  nie             100 Mb/s  nie          nie   
 
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  tak  tak       nie     
+
 NAME              CARRIER    S390-SUBCHANNELS 
 -----------------------------------------------
 WIRED-PROPERTIES  wyłączone  --               
@@ -14779,7 +15371,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}  5fcfd6
 
 <<<
 size: 1172
-location: clients/tests/test-client.py:test_003()/340
+location: clients/tests/test-client.py:test_003()/344
 cmd: $NMCLI --mode tabular --terse -f ALL con
 lang: C
 returncode: 0
@@ -14793,7 +15385,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 1182
-location: clients/tests/test-client.py:test_003()/341
+location: clients/tests/test-client.py:test_003()/345
 cmd: $NMCLI --mode tabular --terse -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14807,7 +15399,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 300
-location: clients/tests/test-client.py:test_003()/342
+location: clients/tests/test-client.py:test_003()/346
 cmd: $NMCLI --mode tabular --terse -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -14819,7 +15411,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 310
-location: clients/tests/test-client.py:test_003()/343
+location: clients/tests/test-client.py:test_003()/347
 cmd: $NMCLI --mode tabular --terse -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14831,7 +15423,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 199
-location: clients/tests/test-client.py:test_003()/344
+location: clients/tests/test-client.py:test_003()/348
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: C
 returncode: 10
@@ -14841,7 +15433,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 221
-location: clients/tests/test-client.py:test_003()/345
+location: clients/tests/test-client.py:test_003()/349
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -14850,35 +15442,36 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 382
-location: clients/tests/test-client.py:test_003()/346
+size: 383
+location: clients/tests/test-client.py:test_003()/350
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 189 bytes
+stdout: 190 bytes
 >>>
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 392
-location: clients/tests/test-client.py:test_003()/347
+size: 393
+location: clients/tests/test-client.py:test_003()/351
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 189 bytes
+stdout: 190 bytes
 >>>
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 1391
-location: clients/tests/test-client.py:test_003()/348
+size: 1460
+location: clients/tests/test-client.py:test_003()/352
 cmd: $NMCLI --mode tabular --terse -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 1231 bytes
+stdout: 1300 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
+INTERFACE-FLAGS:yes:yes:no
 WIRED-PROPERTIES:off:
 IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
 DHCP4:
@@ -14887,15 +15480,16 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 1401
-location: clients/tests/test-client.py:test_003()/349
+size: 1470
+location: clients/tests/test-client.py:test_003()/353
 cmd: $NMCLI --mode tabular --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1231 bytes
+stdout: 1300 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
+INTERFACE-FLAGS:yes:yes:no
 WIRED-PROPERTIES:off:
 IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
 DHCP4:
@@ -14905,7 +15499,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7
 
 <<<
 size: 1454
-location: clients/tests/test-client.py:test_003()/350
+location: clients/tests/test-client.py:test_003()/354
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con
 lang: C
 returncode: 0
@@ -14919,7 +15513,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 1464
-location: clients/tests/test-client.py:test_003()/351
+location: clients/tests/test-client.py:test_003()/355
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14933,7 +15527,7 @@ con-xx1:UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet:0:never:yes:0:no:/or
 
 <<<
 size: 312
-location: clients/tests/test-client.py:test_003()/352
+location: clients/tests/test-client.py:test_003()/356
 cmd: $NMCLI --mode tabular --terse --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -14945,7 +15539,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 322
-location: clients/tests/test-client.py:test_003()/353
+location: clients/tests/test-client.py:test_003()/357
 cmd: $NMCLI --mode tabular --terse --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14957,7 +15551,7 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
 size: 211
-location: clients/tests/test-client.py:test_003()/354
+location: clients/tests/test-client.py:test_003()/358
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: C
 returncode: 10
@@ -14967,7 +15561,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 233
-location: clients/tests/test-client.py:test_003()/355
+location: clients/tests/test-client.py:test_003()/359
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -14976,35 +15570,36 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 394
-location: clients/tests/test-client.py:test_003()/356
+size: 395
+location: clients/tests/test-client.py:test_003()/360
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 189 bytes
+stdout: 190 bytes
 >>>
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 404
-location: clients/tests/test-client.py:test_003()/357
+size: 405
+location: clients/tests/test-client.py:test_003()/361
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 189 bytes
+stdout: 190 bytes
 >>>
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0::deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 1403
-location: clients/tests/test-client.py:test_003()/358
+size: 1472
+location: clients/tests/test-client.py:test_003()/362
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 1231 bytes
+stdout: 1300 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
+INTERFACE-FLAGS:yes:yes:no
 WIRED-PROPERTIES:off:
 IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
 DHCP4:
@@ -15013,15 +15608,16 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 1413
-location: clients/tests/test-client.py:test_003()/359
+size: 1482
+location: clients/tests/test-client.py:test_003()/363
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1231 bytes
+stdout: 1300 bytes
 >>>
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
+INTERFACE-FLAGS:yes:yes:no
 WIRED-PROPERTIES:off:
 IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar:192.168.156.115 | 192.168.8.33
 DHCP4:
@@ -15031,7 +15627,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,4}:5fcfd6d7
 
 <<<
 size: 4190
-location: clients/tests/test-client.py:test_003()/360
+location: clients/tests/test-client.py:test_003()/364
 cmd: $NMCLI --mode multiline -f ALL con
 lang: C
 returncode: 0
@@ -15115,7 +15711,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 4210
-location: clients/tests/test-client.py:test_003()/361
+location: clients/tests/test-client.py:test_003()/365
 cmd: $NMCLI --mode multiline -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15199,7 +15795,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 522
-location: clients/tests/test-client.py:test_003()/362
+location: clients/tests/test-client.py:test_003()/366
 cmd: $NMCLI --mode multiline -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -15214,7 +15810,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 532
-location: clients/tests/test-client.py:test_003()/363
+location: clients/tests/test-client.py:test_003()/367
 cmd: $NMCLI --mode multiline -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15229,7 +15825,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 193
-location: clients/tests/test-client.py:test_003()/364
+location: clients/tests/test-client.py:test_003()/368
 cmd: $NMCLI --mode multiline con s ethernet
 lang: C
 returncode: 10
@@ -15239,7 +15835,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 215
-location: clients/tests/test-client.py:test_003()/365
+location: clients/tests/test-client.py:test_003()/369
 cmd: $NMCLI --mode multiline con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -15248,16 +15844,17 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 854
-location: clients/tests/test-client.py:test_003()/366
+size: 897
+location: clients/tests/test-client.py:test_003()/370
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 667 bytes
+stdout: 710 bytes
 >>>
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -15269,16 +15866,17 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 869
-location: clients/tests/test-client.py:test_003()/367
+size: 912
+location: clients/tests/test-client.py:test_003()/371
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 672 bytes
+stdout: 715 bytes
 >>>
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -15290,16 +15888,17 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3528
-location: clients/tests/test-client.py:test_003()/368
+size: 3741
+location: clients/tests/test-client.py:test_003()/372
 cmd: $NMCLI --mode multiline -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3374 bytes
+stdout: 3587 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -15327,6 +15926,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIRED-PROPERTIES.CARRIER:               off
 IP4.ADDRESS[1]:                         192.168.6.238/29
 IP4.GATEWAY:                            --
@@ -15356,16 +15958,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 3565
-location: clients/tests/test-client.py:test_003()/369
+size: 3779
+location: clients/tests/test-client.py:test_003()/373
 cmd: $NMCLI --mode multiline -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3401 bytes
+stdout: 3615 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -15393,6 +15996,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIRED-PROPERTIES.CARRIER:               wyłączone
 IP4.ADDRESS[1]:                         192.168.6.238/29
 IP4.GATEWAY:                            --
@@ -15423,7 +16029,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <niewidoczne> | /org/freedesktop/Network
 
 <<<
 size: 4472
-location: clients/tests/test-client.py:test_003()/370
+location: clients/tests/test-client.py:test_003()/374
 cmd: $NMCLI --mode multiline --color yes -f ALL con
 lang: C
 returncode: 0
@@ -15507,7 +16113,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 4492
-location: clients/tests/test-client.py:test_003()/371
+location: clients/tests/test-client.py:test_003()/375
 cmd: $NMCLI --mode multiline --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15591,7 +16197,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 534
-location: clients/tests/test-client.py:test_003()/372
+location: clients/tests/test-client.py:test_003()/376
 cmd: $NMCLI --mode multiline --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -15606,7 +16212,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 544
-location: clients/tests/test-client.py:test_003()/373
+location: clients/tests/test-client.py:test_003()/377
 cmd: $NMCLI --mode multiline --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15621,7 +16227,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 205
-location: clients/tests/test-client.py:test_003()/374
+location: clients/tests/test-client.py:test_003()/378
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: C
 returncode: 10
@@ -15631,7 +16237,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 227
-location: clients/tests/test-client.py:test_003()/375
+location: clients/tests/test-client.py:test_003()/379
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -15640,16 +16246,17 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 866
-location: clients/tests/test-client.py:test_003()/376
+size: 909
+location: clients/tests/test-client.py:test_003()/380
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 667 bytes
+stdout: 710 bytes
 >>>
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -15661,16 +16268,17 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 881
-location: clients/tests/test-client.py:test_003()/377
+size: 924
+location: clients/tests/test-client.py:test_003()/381
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 672 bytes
+stdout: 715 bytes
 >>>
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -15682,16 +16290,17 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3540
-location: clients/tests/test-client.py:test_003()/378
+size: 3753
+location: clients/tests/test-client.py:test_003()/382
 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3374 bytes
+stdout: 3587 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -15719,6 +16328,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIRED-PROPERTIES.CARRIER:               off
 IP4.ADDRESS[1]:                         192.168.6.238/29
 IP4.GATEWAY:                            --
@@ -15748,16 +16360,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 3577
-location: clients/tests/test-client.py:test_003()/379
+size: 3791
+location: clients/tests/test-client.py:test_003()/383
 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3401 bytes
+stdout: 3615 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -15785,6 +16398,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIRED-PROPERTIES.CARRIER:               wyłączone
 IP4.ADDRESS[1]:                         192.168.6.238/29
 IP4.GATEWAY:                            --
@@ -15815,7 +16431,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <niewidoczne> | /org/freedesktop/Network
 
 <<<
 size: 4816
-location: clients/tests/test-client.py:test_003()/380
+location: clients/tests/test-client.py:test_003()/384
 cmd: $NMCLI --mode multiline --pretty -f ALL con
 lang: C
 returncode: 0
@@ -15907,7 +16523,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 4842
-location: clients/tests/test-client.py:test_003()/381
+location: clients/tests/test-client.py:test_003()/385
 cmd: $NMCLI --mode multiline --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15999,7 +16615,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 988
-location: clients/tests/test-client.py:test_003()/382
+location: clients/tests/test-client.py:test_003()/386
 cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -16020,7 +16636,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 1004
-location: clients/tests/test-client.py:test_003()/383
+location: clients/tests/test-client.py:test_003()/387
 cmd: $NMCLI --mode multiline --pretty -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16041,7 +16657,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 202
-location: clients/tests/test-client.py:test_003()/384
+location: clients/tests/test-client.py:test_003()/388
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: C
 returncode: 10
@@ -16051,7 +16667,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 224
-location: clients/tests/test-client.py:test_003()/385
+location: clients/tests/test-client.py:test_003()/389
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -16060,12 +16676,12 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 1390
-location: clients/tests/test-client.py:test_003()/386
+size: 1433
+location: clients/tests/test-client.py:test_003()/390
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 1193 bytes
+stdout: 1236 bytes
 >>>
 ===============================================================================
                           Connection profile details
@@ -16076,6 +16692,7 @@ stdout: 1193 bytes
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -16088,12 +16705,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 1417
-location: clients/tests/test-client.py:test_003()/387
+size: 1460
+location: clients/tests/test-client.py:test_003()/391
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1210 bytes
+stdout: 1253 bytes
 >>>
 ===============================================================================
                          Szczegóły profilu połączenia
@@ -16104,6 +16721,7 @@ stdout: 1210 bytes
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -16116,12 +16734,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4388
-location: clients/tests/test-client.py:test_003()/388
+size: 4681
+location: clients/tests/test-client.py:test_003()/392
 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4225 bytes
+stdout: 4518 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -16129,6 +16747,7 @@ stdout: 4225 bytes
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -16158,6 +16777,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               off
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.6.238/29
@@ -16193,12 +16816,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkMa
 -------------------------------------------------------------------------------
 
 <<<
-size: 4431
-location: clients/tests/test-client.py:test_003()/389
+size: 4725
+location: clients/tests/test-client.py:test_003()/393
 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4258 bytes
+stdout: 4552 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -16206,6 +16829,7 @@ stdout: 4258 bytes
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -16235,6 +16859,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               wyłączone
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.6.238/29
@@ -16271,7 +16899,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <niewidoczne> | /org/freedesktop/Network
 
 <<<
 size: 5098
-location: clients/tests/test-client.py:test_003()/390
+location: clients/tests/test-client.py:test_003()/394
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con
 lang: C
 returncode: 0
@@ -16363,7 +16991,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 5124
-location: clients/tests/test-client.py:test_003()/391
+location: clients/tests/test-client.py:test_003()/395
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16455,7 +17083,7 @@ FILENAME:                               /etc/NetworkManager/system-connections/c
 
 <<<
 size: 1000
-location: clients/tests/test-client.py:test_003()/392
+location: clients/tests/test-client.py:test_003()/396
 cmd: $NMCLI --mode multiline --pretty --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -16476,7 +17104,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 1016
-location: clients/tests/test-client.py:test_003()/393
+location: clients/tests/test-client.py:test_003()/397
 cmd: $NMCLI --mode multiline --pretty --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16497,7 +17125,7 @@ TYPE:                                   ethernet
 
 <<<
 size: 214
-location: clients/tests/test-client.py:test_003()/394
+location: clients/tests/test-client.py:test_003()/398
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: C
 returncode: 10
@@ -16507,7 +17135,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 236
-location: clients/tests/test-client.py:test_003()/395
+location: clients/tests/test-client.py:test_003()/399
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -16516,12 +17144,12 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 1402
-location: clients/tests/test-client.py:test_003()/396
+size: 1445
+location: clients/tests/test-client.py:test_003()/400
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 1193 bytes
+stdout: 1236 bytes
 >>>
 ===============================================================================
                           Connection profile details
@@ -16532,6 +17160,7 @@ stdout: 1193 bytes
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          deactivating
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -16544,12 +17173,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 1429
-location: clients/tests/test-client.py:test_003()/397
+size: 1472
+location: clients/tests/test-client.py:test_003()/401
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1210 bytes
+stdout: 1253 bytes
 >>>
 ===============================================================================
                          Szczegóły profilu połączenia
@@ -16560,6 +17189,7 @@ stdout: 1210 bytes
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:                        eth0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          dezaktywowanie
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -16572,12 +17202,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4400
-location: clients/tests/test-client.py:test_003()/398
+size: 4693
+location: clients/tests/test-client.py:test_003()/402
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4225 bytes
+stdout: 4518 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -16585,6 +17215,7 @@ stdout: 4225 bytes
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -16614,6 +17245,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               off
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.6.238/29
@@ -16649,12 +17284,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkMa
 -------------------------------------------------------------------------------
 
 <<<
-size: 4443
-location: clients/tests/test-client.py:test_003()/399
+size: 4737
+location: clients/tests/test-client.py:test_003()/403
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4258 bytes
+stdout: 4552 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -16662,6 +17297,7 @@ stdout: 4258 bytes
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -16691,6 +17327,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               wyłączone
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.6.238/29
@@ -16727,7 +17367,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <niewidoczne> | /org/freedesktop/Network
 
 <<<
 size: 1869
-location: clients/tests/test-client.py:test_003()/400
+location: clients/tests/test-client.py:test_003()/404
 cmd: $NMCLI --mode multiline --terse -f ALL con
 lang: C
 returncode: 0
@@ -16811,7 +17451,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 1879
-location: clients/tests/test-client.py:test_003()/401
+location: clients/tests/test-client.py:test_003()/405
 cmd: $NMCLI --mode multiline --terse -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16895,7 +17535,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 332
-location: clients/tests/test-client.py:test_003()/402
+location: clients/tests/test-client.py:test_003()/406
 cmd: $NMCLI --mode multiline --terse -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -16910,7 +17550,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 342
-location: clients/tests/test-client.py:test_003()/403
+location: clients/tests/test-client.py:test_003()/407
 cmd: $NMCLI --mode multiline --terse -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16925,7 +17565,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 201
-location: clients/tests/test-client.py:test_003()/404
+location: clients/tests/test-client.py:test_003()/408
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: C
 returncode: 10
@@ -16935,7 +17575,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 223
-location: clients/tests/test-client.py:test_003()/405
+location: clients/tests/test-client.py:test_003()/409
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -16944,16 +17584,17 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 565
-location: clients/tests/test-client.py:test_003()/406
+size: 583
+location: clients/tests/test-client.py:test_003()/410
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 370 bytes
+stdout: 388 bytes
 >>>
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -16965,16 +17606,17 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 575
-location: clients/tests/test-client.py:test_003()/407
+size: 593
+location: clients/tests/test-client.py:test_003()/411
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 370 bytes
+stdout: 388 bytes
 >>>
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -16986,16 +17628,17 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2278
-location: clients/tests/test-client.py:test_003()/408
+size: 2417
+location: clients/tests/test-client.py:test_003()/412
 cmd: $NMCLI --mode multiline --terse -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2116 bytes
+stdout: 2255 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -17023,6 +17666,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
@@ -17052,16 +17698,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:<invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 2288
-location: clients/tests/test-client.py:test_003()/409
+size: 2427
+location: clients/tests/test-client.py:test_003()/413
 cmd: $NMCLI --mode multiline --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2116 bytes
+stdout: 2255 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -17089,6 +17736,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
@@ -17119,7 +17769,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:<invisible> | /org/freedesktop/NetworkManag
 
 <<<
 size: 2151
-location: clients/tests/test-client.py:test_003()/410
+location: clients/tests/test-client.py:test_003()/414
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con
 lang: C
 returncode: 0
@@ -17203,7 +17853,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 2161
-location: clients/tests/test-client.py:test_003()/411
+location: clients/tests/test-client.py:test_003()/415
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -17287,7 +17937,7 @@ FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
 size: 344
-location: clients/tests/test-client.py:test_003()/412
+location: clients/tests/test-client.py:test_003()/416
 cmd: $NMCLI --mode multiline --terse --color yes -f UUID,TYPE con
 lang: C
 returncode: 0
@@ -17302,7 +17952,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 354
-location: clients/tests/test-client.py:test_003()/413
+location: clients/tests/test-client.py:test_003()/417
 cmd: $NMCLI --mode multiline --terse --color yes -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
@@ -17317,7 +17967,7 @@ TYPE:802-3-ethernet
 
 <<<
 size: 213
-location: clients/tests/test-client.py:test_003()/414
+location: clients/tests/test-client.py:test_003()/418
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: C
 returncode: 10
@@ -17327,7 +17977,7 @@ Error: ethernet - no such connection profile.
 
 <<<
 size: 235
-location: clients/tests/test-client.py:test_003()/415
+location: clients/tests/test-client.py:test_003()/419
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
@@ -17336,16 +17986,17 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 577
-location: clients/tests/test-client.py:test_003()/416
+size: 595
+location: clients/tests/test-client.py:test_003()/420
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 370 bytes
+stdout: 388 bytes
 >>>
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -17357,16 +18008,17 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 587
-location: clients/tests/test-client.py:test_003()/417
+size: 605
+location: clients/tests/test-client.py:test_003()/421
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 370 bytes
+stdout: 388 bytes
 >>>
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
 GENERAL.DEVICES:eth0
+GENERAL.IP-IFACE:
 GENERAL.STATE:deactivating
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -17378,16 +18030,17 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2290
-location: clients/tests/test-client.py:test_003()/418
+size: 2429
+location: clients/tests/test-client.py:test_003()/422
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2116 bytes
+stdout: 2255 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -17415,6 +18068,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
@@ -17444,16 +18100,17 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:<invisible> | /org/freedesktop/NetworkManager/Settings/Connection/4
 
 <<<
-size: 2300
-location: clients/tests/test-client.py:test_003()/419
+size: 2439
+location: clients/tests/test-client.py:test_003()/423
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2116 bytes
+stdout: 2255 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -17481,6 +18138,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.6.238/29
 IP4.GATEWAY:
diff --git a/clients/tests/test-client.check-on-disk/test_004.expected b/clients/tests/test-client.check-on-disk/test_004.expected
index 3db4d510..a5375950 100644
--- a/clients/tests/test-client.check-on-disk/test_004.expected
+++ b/clients/tests/test-client.check-on-disk/test_004.expected
@@ -58,12 +58,12 @@ location: clients/tests/test-client.py:test_004()/7
 cmd: $NMCLI connection mod con-xx1 ipv4.addresses 192.168.77.5/24 ipv4.routes '2.3.4.5/32 192.168.77.1' ipv6.addresses 1:2:3:4::6/64 ipv6.routes 1:2:3:4:5:6::5/128
 lang: C
 returncode: 0
-size: 4172
+size: 4360
 location: clients/tests/test-client.py:test_004()/8
 cmd: $NMCLI con s con-xx1
 lang: C
 returncode: 0
-stdout: 4044 bytes
+stdout: 4232 bytes
 >>>
 connection.id:                          con-xx1
 connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -120,10 +120,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -145,8 +147,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     no
@@ -154,12 +158,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4200
+size: 4388
 location: clients/tests/test-client.py:test_004()/9
 cmd: $NMCLI con s con-xx1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4062 bytes
+stdout: 4250 bytes
 >>>
 connection.id:                          con-xx1
 connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -216,10 +220,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -241,8 +247,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 proxy.method:                           none
 proxy.browser-only:                     nie
@@ -286,12 +294,12 @@ con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  vpn       --
 con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      --     
 
 <<<
-size: 3639
+size: 3827
 location: clients/tests/test-client.py:test_004()/13
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3508 bytes
+stdout: 3696 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -331,10 +339,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -356,8 +366,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -371,12 +383,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3659
+size: 3847
 location: clients/tests/test-client.py:test_004()/14
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3518 bytes
+stdout: 3706 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -416,10 +428,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -441,8 +455,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -528,12 +544,12 @@ con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      wlan0
 con-1      5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --     
 
 <<<
-size: 4721
+size: 4952
 location: clients/tests/test-client.py:test_004()/21
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4590 bytes
+stdout: 4821 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -573,10 +589,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -598,8 +616,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -614,6 +634,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -633,12 +654,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4747
+size: 4978
 location: clients/tests/test-client.py:test_004()/22
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4606 bytes
+stdout: 4837 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -678,10 +699,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -703,8 +726,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -719,6 +744,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -738,12 +764,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4727
+size: 4958
 location: clients/tests/test-client.py:test_004()/23
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4596 bytes
+stdout: 4827 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -783,10 +809,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -808,8 +836,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -824,6 +854,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -843,12 +874,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4757
+size: 4988
 location: clients/tests/test-client.py:test_004()/24
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4616 bytes
+stdout: 4847 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -888,10 +919,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -913,8 +946,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -929,6 +964,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -948,12 +984,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4727
+size: 4958
 location: clients/tests/test-client.py:test_004()/25
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4596 bytes
+stdout: 4827 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -993,10 +1029,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -1018,8 +1056,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -1034,6 +1074,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -1053,12 +1094,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4757
+size: 4988
 location: clients/tests/test-client.py:test_004()/26
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4616 bytes
+stdout: 4847 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1098,10 +1139,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -1123,8 +1166,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -1139,6 +1184,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -1158,12 +1204,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 3646
+size: 3834
 location: clients/tests/test-client.py:test_004()/27
 cmd: $NMCLI -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3508 bytes
+stdout: 3696 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1203,10 +1249,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -1228,8 +1276,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -1243,12 +1293,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3666
+size: 3854
 location: clients/tests/test-client.py:test_004()/28
 cmd: $NMCLI -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3518 bytes
+stdout: 3706 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1288,10 +1338,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -1313,8 +1365,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -1358,16 +1412,17 @@ vpn.persistent:                         nie
 vpn.timeout:                            0
 
 <<<
-size: 808
+size: 851
 location: clients/tests/test-client.py:test_004()/31
 cmd: $NMCLI -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 667 bytes
+stdout: 710 bytes
 >>>
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -1379,16 +1434,17 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 821
+size: 864
 location: clients/tests/test-client.py:test_004()/32
 cmd: $NMCLI -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 670 bytes
+stdout: 713 bytes
 >>>
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -1752,16 +1808,17 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
-size: 20784
+size: 22210
 location: clients/tests/test-client.py:test_004()/39
 cmd: $NMCLI -f all dev show
 lang: C
 returncode: 0
-stdout: 20652 bytes
+stdout: 22078 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -1789,6 +1846,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -1799,7 +1859,9 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -1808,6 +1870,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -1816,6 +1879,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -1855,6 +1919,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -1882,6 +1947,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIRED-PROPERTIES.CARRIER:               off
 IP4.ADDRESS[1]:                         192.168.49.34/22
 IP4.ADDRESS[2]:                         192.168.135.86/19
@@ -1918,6 +1986,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -1945,6 +2014,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIRED-PROPERTIES.CARRIER:               off
 IP4.ADDRESS[1]:                         192.168.127.210/25
 IP4.GATEWAY:                            192.168.88.4
@@ -1988,6 +2060,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -2015,6 +2088,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -2025,7 +2101,9 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 AP[1].IN-USE:                            
+AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -2077,6 +2155,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -2104,6 +2183,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -2114,6 +2196,7 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
 IP4.GATEWAY:                            --
@@ -2144,16 +2227,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 20937
+size: 22371
 location: clients/tests/test-client.py:test_004()/40
 cmd: $NMCLI -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 20795 bytes
+stdout: 22229 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -2181,6 +2265,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -2191,7 +2278,9 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -2200,6 +2289,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -2208,6 +2298,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -2247,6 +2338,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -2274,6 +2366,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIRED-PROPERTIES.CARRIER:               wyłączone
 IP4.ADDRESS[1]:                         192.168.49.34/22
 IP4.ADDRESS[2]:                         192.168.135.86/19
@@ -2310,6 +2405,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -2337,6 +2433,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIRED-PROPERTIES.CARRIER:               wyłączone
 IP4.ADDRESS[1]:                         192.168.127.210/25
 IP4.GATEWAY:                            192.168.88.4
@@ -2380,6 +2479,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -2407,6 +2507,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -2417,7 +2520,9 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 AP[1].IN-USE:                            
+AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -2469,6 +2574,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -2496,6 +2602,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -2506,6 +2615,7 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
 IP4.GATEWAY:                            --
@@ -2602,16 +2712,17 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 4885
+size: 5315
 location: clients/tests/test-client.py:test_004()/43
 cmd: $NMCLI -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4748 bytes
+stdout: 5178 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -2639,6 +2750,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -2649,7 +2763,9 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -2658,6 +2774,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -2666,6 +2783,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -2703,16 +2821,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 4941
+size: 5373
 location: clients/tests/test-client.py:test_004()/44
 cmd: $NMCLI -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4794 bytes
+stdout: 5226 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -2740,6 +2859,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -2750,7 +2872,9 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -2759,6 +2883,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -2767,6 +2892,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -2804,16 +2930,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1998
+size: 2123
 location: clients/tests/test-client.py:test_004()/45
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1826 bytes
+stdout: 1951 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -2848,18 +2975,20 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 
 <<<
-size: 2023
+size: 2149
 location: clients/tests/test-client.py:test_004()/46
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1841 bytes
+stdout: 1967 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -2894,18 +3023,20 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 
 <<<
-size: 1998
+size: 2123
 location: clients/tests/test-client.py:test_004()/47
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1826 bytes
+stdout: 1951 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -2940,18 +3071,20 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 
 <<<
-size: 2023
+size: 2149
 location: clients/tests/test-client.py:test_004()/48
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1841 bytes
+stdout: 1967 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -2986,6 +3119,7 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 
 <<<
 size: 509
@@ -3054,40 +3188,40 @@ AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
 <<<
-size: 613
+size: 734
 location: clients/tests/test-client.py:test_004()/53
 cmd: $NMCLI -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 472 bytes
+stdout: 593 bytes
 >>>
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
 
-IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 <<<
-size: 673
+size: 794
 location: clients/tests/test-client.py:test_004()/54
 cmd: $NMCLI -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 522 bytes
+stdout: 643 bytes
 >>>
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
 
-IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 <<<
 size: 2092
@@ -3152,28 +3286,28 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1
 
 
 <<<
-size: 305
+size: 343
 location: clients/tests/test-client.py:test_004()/59
 cmd: $NMCLI -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 140 bytes
+stdout: 178 bytes
 >>>
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
-size: 331
+size: 369
 location: clients/tests/test-client.py:test_004()/60
 cmd: $NMCLI -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 156 bytes
+stdout: 194 bytes
 >>>
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
 
 
 
@@ -3204,16 +3338,17 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1
 
 
 <<<
-size: 4888
+size: 5318
 location: clients/tests/test-client.py:test_004()/63
 cmd: $NMCLI -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4748 bytes
+stdout: 5178 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -3241,6 +3376,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -3251,7 +3389,9 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -3260,6 +3400,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -3268,6 +3409,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -3305,16 +3447,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 4944
+size: 5376
 location: clients/tests/test-client.py:test_004()/64
 cmd: $NMCLI -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4794 bytes
+stdout: 5226 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -3342,6 +3485,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -3352,7 +3498,9 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -3361,6 +3509,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -3369,6 +3518,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -3472,16 +3622,17 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5026
+size: 5325
 location: clients/tests/test-client.py:test_004()/67
 cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 4748 bytes
+stdout: 5047 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -3519,7 +3670,9 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -3528,6 +3681,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -3536,6 +3690,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -3573,16 +3728,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5082
+size: 5382
 location: clients/tests/test-client.py:test_004()/68
 cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4794 bytes
+stdout: 5094 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -3620,7 +3776,9 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -3629,6 +3787,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -3637,6 +3796,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -3734,12 +3894,60 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION:         Test system #3
 NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 
 <<<
-size: 4739
+size: 1061
 location: clients/tests/test-client.py:test_004()/71
+cmd: $NMCLI -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: C
+returncode: 0
+stdout: 704 bytes
+>>>
+connection.id:                          con-1
+connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
+connection.type:                        802-3-ethernet
+connection.interface-name:              --
+
+connection.id:                          con-vpn-1
+connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
+connection.type:                        vpn
+connection.interface-name:              --
+vpn.user-name:                          --
+
+connection.id:                          con-xx1
+connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
+connection.type:                        802-11-wireless
+connection.interface-name:              --
+
+<<<
+size: 1071
+location: clients/tests/test-client.py:test_004()/72
+cmd: $NMCLI -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 704 bytes
+>>>
+connection.id:                          con-1
+connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
+connection.type:                        802-3-ethernet
+connection.interface-name:              --
+
+connection.id:                          con-vpn-1
+connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
+connection.type:                        vpn
+connection.interface-name:              --
+vpn.user-name:                          --
+
+connection.id:                          con-xx1
+connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
+connection.type:                        802-11-wireless
+connection.interface-name:              --
+
+<<<
+size: 4970
+location: clients/tests/test-client.py:test_004()/73
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4596 bytes
+stdout: 4827 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -3779,10 +3987,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -3804,8 +4014,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -3820,6 +4032,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -3839,12 +4052,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4769
-location: clients/tests/test-client.py:test_004()/72
+size: 5000
+location: clients/tests/test-client.py:test_004()/74
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4616 bytes
+stdout: 4847 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -3884,10 +4097,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -3909,8 +4124,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -3925,6 +4142,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -3944,12 +4162,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4739
-location: clients/tests/test-client.py:test_004()/73
+size: 4970
+location: clients/tests/test-client.py:test_004()/75
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4596 bytes
+stdout: 4827 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -3989,10 +4207,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -4014,8 +4234,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -4030,6 +4252,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -4049,12 +4272,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4769
-location: clients/tests/test-client.py:test_004()/74
+size: 5000
+location: clients/tests/test-client.py:test_004()/76
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4616 bytes
+stdout: 4847 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4094,10 +4317,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -4119,8 +4344,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -4135,6 +4362,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -4154,12 +4382,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 3658
-location: clients/tests/test-client.py:test_004()/75
+size: 3846
+location: clients/tests/test-client.py:test_004()/77
 cmd: $NMCLI --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3508 bytes
+stdout: 3696 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4199,10 +4427,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -4224,8 +4454,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -4239,12 +4471,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3678
-location: clients/tests/test-client.py:test_004()/76
+size: 3866
+location: clients/tests/test-client.py:test_004()/78
 cmd: $NMCLI --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3518 bytes
+stdout: 3706 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4284,10 +4516,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -4309,8 +4543,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -4325,7 +4561,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 483
-location: clients/tests/test-client.py:test_004()/77
+location: clients/tests/test-client.py:test_004()/79
 cmd: $NMCLI --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -4340,7 +4576,7 @@ vpn.timeout:                            0
 
 <<<
 size: 494
-location: clients/tests/test-client.py:test_004()/78
+location: clients/tests/test-client.py:test_004()/80
 cmd: $NMCLI --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4354,16 +4590,17 @@ vpn.persistent:                         nie
 vpn.timeout:                            0
 
 <<<
-size: 820
-location: clients/tests/test-client.py:test_004()/79
+size: 863
+location: clients/tests/test-client.py:test_004()/81
 cmd: $NMCLI --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 667 bytes
+stdout: 710 bytes
 >>>
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -4375,16 +4612,17 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 833
-location: clients/tests/test-client.py:test_004()/80
+size: 876
+location: clients/tests/test-client.py:test_004()/82
 cmd: $NMCLI --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 670 bytes
+stdout: 713 bytes
 >>>
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -4397,7 +4635,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 550
-location: clients/tests/test-client.py:test_004()/81
+location: clients/tests/test-client.py:test_004()/83
 cmd: $NMCLI --color yes dev s
 lang: C
 returncode: 0
@@ -4412,7 +4650,7 @@ DEVICE  TYPE      STATE        CONNECTION
 
 <<<
 size: 565
-location: clients/tests/test-client.py:test_004()/82
+location: clients/tests/test-client.py:test_004()/84
 cmd: $NMCLI --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4427,7 +4665,7 @@ DEVICE  TYPE      STATE        CONNECTION
 
 <<<
 size: 1777
-location: clients/tests/test-client.py:test_004()/83
+location: clients/tests/test-client.py:test_004()/85
 cmd: $NMCLI --color yes -f all dev status
 lang: C
 returncode: 0
@@ -4442,7 +4680,7 @@ DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH
 
 <<<
 size: 1792
-location: clients/tests/test-client.py:test_004()/84
+location: clients/tests/test-client.py:test_004()/86
 cmd: $NMCLI --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4457,7 +4695,7 @@ DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH
 
 <<<
 size: 8054
-location: clients/tests/test-client.py:test_004()/85
+location: clients/tests/test-client.py:test_004()/87
 cmd: $NMCLI --color yes dev show
 lang: C
 returncode: 0
@@ -4603,7 +4841,7 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
 size: 8085
-location: clients/tests/test-client.py:test_004()/86
+location: clients/tests/test-client.py:test_004()/88
 cmd: $NMCLI --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -4748,16 +4986,17 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
-size: 21084
-location: clients/tests/test-client.py:test_004()/87
+size: 22546
+location: clients/tests/test-client.py:test_004()/89
 cmd: $NMCLI --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 20940 bytes
+stdout: 22402 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -4785,6 +5024,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -4795,7 +5037,9 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -4804,6 +5048,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -4812,6 +5057,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -4851,6 +5097,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -4878,6 +5125,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIRED-PROPERTIES.CARRIER:               off
 IP4.ADDRESS[1]:                         192.168.49.34/22
 IP4.ADDRESS[2]:                         192.168.135.86/19
@@ -4914,6 +5164,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -4941,6 +5192,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIRED-PROPERTIES.CARRIER:               off
 IP4.ADDRESS[1]:                         192.168.127.210/25
 IP4.GATEWAY:                            192.168.88.4
@@ -4984,6 +5238,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -5011,6 +5266,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -5021,7 +5279,9 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 AP[1].IN-USE:                            
+AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -5073,6 +5333,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -5100,6 +5361,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -5110,6 +5374,7 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
 IP4.GATEWAY:                            --
@@ -5140,16 +5405,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 21237
-location: clients/tests/test-client.py:test_004()/88
+size: 22707
+location: clients/tests/test-client.py:test_004()/90
 cmd: $NMCLI --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 21083 bytes
+stdout: 22553 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -5177,6 +5443,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -5187,7 +5456,9 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -5196,6 +5467,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -5204,6 +5476,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -5243,6 +5516,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -5270,6 +5544,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIRED-PROPERTIES.CARRIER:               wyłączone
 IP4.ADDRESS[1]:                         192.168.49.34/22
 IP4.ADDRESS[2]:                         192.168.135.86/19
@@ -5306,6 +5583,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -5333,6 +5611,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIRED-PROPERTIES.CARRIER:               wyłączone
 IP4.ADDRESS[1]:                         192.168.127.210/25
 IP4.GATEWAY:                            192.168.88.4
@@ -5376,6 +5657,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -5403,6 +5685,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -5413,7 +5698,9 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 AP[1].IN-USE:                            
+AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -5465,6 +5752,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -5492,6 +5780,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -5502,6 +5793,7 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
 IP4.GATEWAY:                            --
@@ -5533,7 +5825,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1505
-location: clients/tests/test-client.py:test_004()/89
+location: clients/tests/test-client.py:test_004()/91
 cmd: $NMCLI --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -5566,7 +5858,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1516
-location: clients/tests/test-client.py:test_004()/90
+location: clients/tests/test-client.py:test_004()/92
 cmd: $NMCLI --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -5598,16 +5890,17 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5113
-location: clients/tests/test-client.py:test_004()/91
+size: 5570
+location: clients/tests/test-client.py:test_004()/93
 cmd: $NMCLI --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4964 bytes
+stdout: 5421 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -5635,6 +5928,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -5645,7 +5941,9 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -5654,6 +5952,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -5662,6 +5961,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -5699,16 +5999,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5169
-location: clients/tests/test-client.py:test_004()/92
+size: 5628
+location: clients/tests/test-client.py:test_004()/94
 cmd: $NMCLI --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5010 bytes
+stdout: 5469 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -5736,6 +6037,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -5746,7 +6050,9 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -5755,6 +6061,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -5763,6 +6070,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -5800,16 +6108,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2010
-location: clients/tests/test-client.py:test_004()/93
+size: 2135
+location: clients/tests/test-client.py:test_004()/95
 cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1826 bytes
+stdout: 1951 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -5844,18 +6153,20 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 
 <<<
-size: 2035
-location: clients/tests/test-client.py:test_004()/94
+size: 2161
+location: clients/tests/test-client.py:test_004()/96
 cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1841 bytes
+stdout: 1967 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -5890,18 +6201,20 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 
 <<<
-size: 2010
-location: clients/tests/test-client.py:test_004()/95
+size: 2135
+location: clients/tests/test-client.py:test_004()/97
 cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1826 bytes
+stdout: 1951 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -5936,18 +6249,20 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 
 <<<
-size: 2035
-location: clients/tests/test-client.py:test_004()/96
+size: 2161
+location: clients/tests/test-client.py:test_004()/98
 cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1841 bytes
+stdout: 1967 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -5982,10 +6297,11 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 
 <<<
 size: 641
-location: clients/tests/test-client.py:test_004()/97
+location: clients/tests/test-client.py:test_004()/99
 cmd: $NMCLI --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -5999,8 +6315,8 @@ DEVICE  TYPE      DBUS-PATH
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
 
 <<<
-size: 651
-location: clients/tests/test-client.py:test_004()/98
+size: 652
+location: clients/tests/test-client.py:test_004()/100
 cmd: $NMCLI --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6014,8 +6330,8 @@ DEVICE  TYPE      DBUS-PATH
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
 
 <<<
-size: 2603
-location: clients/tests/test-client.py:test_004()/99
+size: 2604
+location: clients/tests/test-client.py:test_004()/101
 cmd: $NMCLI --color yes -f ALL device wifi list
 lang: C
 returncode: 0
@@ -6033,7 +6349,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 2672
-location: clients/tests/test-client.py:test_004()/100
+location: clients/tests/test-client.py:test_004()/102
 cmd: $NMCLI --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6050,44 +6366,44 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
 <<<
-size: 914
-location: clients/tests/test-client.py:test_004()/101
+size: 1071
+location: clients/tests/test-client.py:test_004()/103
 cmd: $NMCLI --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 760 bytes
+stdout: 917 bytes
 >>>
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
 
-IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 <<<
-size: 974
-location: clients/tests/test-client.py:test_004()/102
+size: 1131
+location: clients/tests/test-client.py:test_004()/104
 cmd: $NMCLI --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 810 bytes
+stdout: 967 bytes
 >>>
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
 
-IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 <<<
 size: 2717
-location: clients/tests/test-client.py:test_004()/103
+location: clients/tests/test-client.py:test_004()/105
 cmd: $NMCLI --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -6105,7 +6421,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 2785
-location: clients/tests/test-client.py:test_004()/104
+location: clients/tests/test-client.py:test_004()/106
 cmd: $NMCLI --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6123,7 +6439,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 898
-location: clients/tests/test-client.py:test_004()/105
+location: clients/tests/test-client.py:test_004()/107
 cmd: $NMCLI --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -6136,7 +6452,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 
 <<<
 size: 926
-location: clients/tests/test-client.py:test_004()/106
+location: clients/tests/test-client.py:test_004()/108
 cmd: $NMCLI --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6148,34 +6464,34 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 
 
 <<<
-size: 390
-location: clients/tests/test-client.py:test_004()/107
+size: 437
+location: clients/tests/test-client.py:test_004()/109
 cmd: $NMCLI --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 212 bytes
+stdout: 259 bytes
 >>>
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
-size: 416
-location: clients/tests/test-client.py:test_004()/108
+size: 463
+location: clients/tests/test-client.py:test_004()/110
 cmd: $NMCLI --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 228 bytes
+stdout: 275 bytes
 >>>
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
 size: 1011
-location: clients/tests/test-client.py:test_004()/109
+location: clients/tests/test-client.py:test_004()/111
 cmd: $NMCLI --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -6188,7 +6504,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 
 <<<
 size: 1039
-location: clients/tests/test-client.py:test_004()/110
+location: clients/tests/test-client.py:test_004()/112
 cmd: $NMCLI --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6200,16 +6516,17 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 
 
 <<<
-size: 5117
-location: clients/tests/test-client.py:test_004()/111
+size: 5574
+location: clients/tests/test-client.py:test_004()/113
 cmd: $NMCLI --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4964 bytes
+stdout: 5421 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -6237,6 +6554,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -6247,7 +6567,9 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -6256,6 +6578,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -6264,6 +6587,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -6301,16 +6625,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5173
-location: clients/tests/test-client.py:test_004()/112
+size: 5632
+location: clients/tests/test-client.py:test_004()/114
 cmd: $NMCLI --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5010 bytes
+stdout: 5469 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -6338,6 +6663,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -6348,7 +6676,9 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -6357,6 +6687,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -6365,6 +6696,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -6403,7 +6735,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1519
-location: clients/tests/test-client.py:test_004()/113
+location: clients/tests/test-client.py:test_004()/115
 cmd: $NMCLI --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -6436,7 +6768,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1530
-location: clients/tests/test-client.py:test_004()/114
+location: clients/tests/test-client.py:test_004()/116
 cmd: $NMCLI --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6468,16 +6800,17 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5255
-location: clients/tests/test-client.py:test_004()/115
+size: 5581
+location: clients/tests/test-client.py:test_004()/117
 cmd: $NMCLI --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 4964 bytes
+stdout: 5290 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -6515,7 +6848,9 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -6524,6 +6859,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -6532,6 +6868,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -6569,16 +6906,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5311
-location: clients/tests/test-client.py:test_004()/116
+size: 5638
+location: clients/tests/test-client.py:test_004()/118
 cmd: $NMCLI --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5010 bytes
+stdout: 5337 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -6616,7 +6954,9 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -6625,6 +6965,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -6633,6 +6974,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -6671,7 +7013,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1442
-location: clients/tests/test-client.py:test_004()/117
+location: clients/tests/test-client.py:test_004()/119
 cmd: $NMCLI --color yes dev lldp list ifname eth0
 lang: C
 returncode: 0
@@ -6701,7 +7043,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 
 <<<
 size: 1452
-location: clients/tests/test-client.py:test_004()/118
+location: clients/tests/test-client.py:test_004()/120
 cmd: $NMCLI --color yes dev lldp list ifname eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -6730,12 +7072,60 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION:         Test system #3
 NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 
 <<<
-size: 5749
-location: clients/tests/test-client.py:test_004()/119
+size: 1074
+location: clients/tests/test-client.py:test_004()/121
+cmd: $NMCLI --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: C
+returncode: 0
+stdout: 704 bytes
+>>>
+connection.id:                          con-1
+connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
+connection.type:                        802-3-ethernet
+connection.interface-name:              --
+
+connection.id:                          con-vpn-1
+connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
+connection.type:                        vpn
+connection.interface-name:              --
+vpn.user-name:                          --
+
+connection.id:                          con-xx1
+connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
+connection.type:                        802-11-wireless
+connection.interface-name:              --
+
+<<<
+size: 1084
+location: clients/tests/test-client.py:test_004()/122
+cmd: $NMCLI --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 704 bytes
+>>>
+connection.id:                          con-1
+connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
+connection.type:                        802-3-ethernet
+connection.interface-name:              --
+
+connection.id:                          con-vpn-1
+connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
+connection.type:                        vpn
+connection.interface-name:              --
+vpn.user-name:                          --
+
+connection.id:                          con-xx1
+connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
+connection.type:                        802-11-wireless
+connection.interface-name:              --
+
+<<<
+size: 5980
+location: clients/tests/test-client.py:test_004()/123
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5608 bytes
+stdout: 5839 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -6779,10 +7169,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -6805,8 +7197,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -6827,6 +7221,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -6848,12 +7243,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5791
-location: clients/tests/test-client.py:test_004()/120
+size: 6022
+location: clients/tests/test-client.py:test_004()/124
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5640 bytes
+stdout: 5871 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -6897,10 +7292,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -6923,8 +7320,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -6945,6 +7344,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -6966,12 +7366,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5749
-location: clients/tests/test-client.py:test_004()/121
+size: 5980
+location: clients/tests/test-client.py:test_004()/125
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5608 bytes
+stdout: 5839 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -7015,10 +7415,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -7041,8 +7443,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -7063,6 +7467,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -7084,12 +7489,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5791
-location: clients/tests/test-client.py:test_004()/122
+size: 6022
+location: clients/tests/test-client.py:test_004()/126
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5640 bytes
+stdout: 5871 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -7133,10 +7538,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -7159,8 +7566,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -7181,6 +7590,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -7202,12 +7612,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 4275
-location: clients/tests/test-client.py:test_004()/123
+size: 4463
+location: clients/tests/test-client.py:test_004()/127
 cmd: $NMCLI --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4127 bytes
+stdout: 4315 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -7251,10 +7661,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -7277,8 +7689,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -7295,12 +7709,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4300
-location: clients/tests/test-client.py:test_004()/124
+size: 4488
+location: clients/tests/test-client.py:test_004()/128
 cmd: $NMCLI --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4142 bytes
+stdout: 4330 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -7344,10 +7758,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -7370,8 +7786,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -7389,7 +7807,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 780
-location: clients/tests/test-client.py:test_004()/125
+location: clients/tests/test-client.py:test_004()/129
 cmd: $NMCLI --pretty -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -7408,7 +7826,7 @@ vpn.timeout:                            0
 
 <<<
 size: 796
-location: clients/tests/test-client.py:test_004()/126
+location: clients/tests/test-client.py:test_004()/130
 cmd: $NMCLI --pretty -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7426,12 +7844,12 @@ vpn.timeout:                            0
 -------------------------------------------------------------------------------
 
 <<<
-size: 1131
-location: clients/tests/test-client.py:test_004()/127
+size: 1175
+location: clients/tests/test-client.py:test_004()/131
 cmd: $NMCLI --pretty -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 980 bytes
+stdout: 1023 bytes
 >>>
 ===============================================================================
       Activate connection details (UUID-con-vpn-1-REPLACED-REPLACED-REP)
@@ -7439,6 +7857,7 @@ stdout: 980 bytes
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -7451,12 +7870,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 1151
-location: clients/tests/test-client.py:test_004()/128
+size: 1195
+location: clients/tests/test-client.py:test_004()/132
 cmd: $NMCLI --pretty -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 990 bytes
+stdout: 1033 bytes
 >>>
 ===============================================================================
     Szczegóły aktywowania połączenia (UUID-con-vpn-1-REPLACED-REPLACED-REP)
@@ -7464,6 +7883,7 @@ stdout: 990 bytes
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -7477,7 +7897,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 517
-location: clients/tests/test-client.py:test_004()/129
+location: clients/tests/test-client.py:test_004()/133
 cmd: $NMCLI --pretty dev s
 lang: C
 returncode: 0
@@ -7496,7 +7916,7 @@ wlan1   wifi      unavailable  --
 
 <<<
 size: 525
-location: clients/tests/test-client.py:test_004()/130
+location: clients/tests/test-client.py:test_004()/134
 cmd: $NMCLI --pretty dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7515,7 +7935,7 @@ wlan1   wifi      niedostępne  --
 
 <<<
 size: 1713
-location: clients/tests/test-client.py:test_004()/131
+location: clients/tests/test-client.py:test_004()/135
 cmd: $NMCLI --pretty -f all dev status
 lang: C
 returncode: 0
@@ -7534,7 +7954,7 @@ wlan1   wifi      unavailable  unknown           unknown           /org/freedesk
 
 <<<
 size: 1721
-location: clients/tests/test-client.py:test_004()/132
+location: clients/tests/test-client.py:test_004()/136
 cmd: $NMCLI --pretty -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7553,7 +7973,7 @@ wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedes
 
 <<<
 size: 12868
-location: clients/tests/test-client.py:test_004()/133
+location: clients/tests/test-client.py:test_004()/137
 cmd: $NMCLI --pretty dev show
 lang: C
 returncode: 0
@@ -7761,7 +8181,7 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
 size: 12932
-location: clients/tests/test-client.py:test_004()/134
+location: clients/tests/test-client.py:test_004()/138
 cmd: $NMCLI --pretty dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -7968,12 +8388,12 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
 <<<
-size: 25369
-location: clients/tests/test-client.py:test_004()/135
+size: 27195
+location: clients/tests/test-client.py:test_004()/139
 cmd: $NMCLI --pretty -f all dev show
 lang: C
 returncode: 0
-stdout: 25227 bytes
+stdout: 27053 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -7981,6 +8401,7 @@ stdout: 25227 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -8010,6 +8431,10 @@ CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -8020,8 +8445,10 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -8031,6 +8458,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -8040,6 +8468,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -8088,6 +8517,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -8117,6 +8547,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               off
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.49.34/22
@@ -8162,6 +8596,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -8191,6 +8626,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               off
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.127.210/25
@@ -8243,6 +8682,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -8272,6 +8712,10 @@ CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -8282,8 +8726,10 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -8344,6 +8790,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -8373,6 +8820,10 @@ CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -8383,6 +8834,7 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
@@ -8419,12 +8871,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 25555
-location: clients/tests/test-client.py:test_004()/136
+size: 27389
+location: clients/tests/test-client.py:test_004()/140
 cmd: $NMCLI --pretty -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 25403 bytes
+stdout: 27237 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -8432,6 +8884,7 @@ stdout: 25403 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -8461,6 +8914,10 @@ CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -8471,8 +8928,10 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -8482,6 +8941,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -8491,6 +8951,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -8539,6 +9000,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -8568,6 +9030,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               wyłączone
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.49.34/22
@@ -8613,6 +9079,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -8642,6 +9109,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               wyłączone
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.127.210/25
@@ -8694,6 +9165,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -8723,6 +9195,10 @@ CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -8733,8 +9209,10 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -8795,6 +9273,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -8824,6 +9303,10 @@ CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -8834,6 +9317,7 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
@@ -8871,7 +9355,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2434
-location: clients/tests/test-client.py:test_004()/137
+location: clients/tests/test-client.py:test_004()/141
 cmd: $NMCLI --pretty dev show wlan0
 lang: C
 returncode: 0
@@ -8916,7 +9400,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2452
-location: clients/tests/test-client.py:test_004()/138
+location: clients/tests/test-client.py:test_004()/142
 cmd: $NMCLI --pretty dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -8960,12 +9444,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 5986
-location: clients/tests/test-client.py:test_004()/139
+size: 6496
+location: clients/tests/test-client.py:test_004()/143
 cmd: $NMCLI --pretty -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 5839 bytes
+stdout: 6349 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -8973,6 +9457,7 @@ stdout: 5839 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -9002,6 +9487,10 @@ CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -9012,8 +9501,10 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -9023,6 +9514,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -9032,6 +9524,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -9075,12 +9568,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6049
-location: clients/tests/test-client.py:test_004()/140
+size: 6561
+location: clients/tests/test-client.py:test_004()/144
 cmd: $NMCLI --pretty -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5892 bytes
+stdout: 6404 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -9088,6 +9581,7 @@ stdout: 5892 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -9117,6 +9611,10 @@ CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -9127,8 +9625,10 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -9138,6 +9638,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -9147,6 +9648,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -9190,12 +9692,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 2459
-location: clients/tests/test-client.py:test_004()/141
+size: 2584
+location: clients/tests/test-client.py:test_004()/145
 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2277 bytes
+stdout: 2402 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -9203,6 +9705,7 @@ stdout: 2277 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -9239,15 +9742,16 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 
 <<<
-size: 2491
-location: clients/tests/test-client.py:test_004()/142
+size: 2617
+location: clients/tests/test-client.py:test_004()/146
 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2299 bytes
+stdout: 2425 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -9255,6 +9759,7 @@ stdout: 2299 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -9291,15 +9796,16 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 
 <<<
-size: 2459
-location: clients/tests/test-client.py:test_004()/143
+size: 2584
+location: clients/tests/test-client.py:test_004()/147
 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2277 bytes
+stdout: 2402 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -9307,6 +9813,7 @@ stdout: 2277 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -9343,15 +9850,16 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 
 <<<
-size: 2491
-location: clients/tests/test-client.py:test_004()/144
+size: 2617
+location: clients/tests/test-client.py:test_004()/148
 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2299 bytes
+stdout: 2425 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -9359,6 +9867,7 @@ stdout: 2299 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -9395,11 +9904,12 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 
 <<<
 size: 666
-location: clients/tests/test-client.py:test_004()/145
+location: clients/tests/test-client.py:test_004()/149
 cmd: $NMCLI --pretty -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -9418,7 +9928,7 @@ wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 669
-location: clients/tests/test-client.py:test_004()/146
+location: clients/tests/test-client.py:test_004()/150
 cmd: $NMCLI --pretty -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9437,7 +9947,7 @@ wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 3021
-location: clients/tests/test-client.py:test_004()/147
+location: clients/tests/test-client.py:test_004()/151
 cmd: $NMCLI --pretty -f ALL device wifi list
 lang: C
 returncode: 0
@@ -9467,7 +9977,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 3259
-location: clients/tests/test-client.py:test_004()/148
+location: clients/tests/test-client.py:test_004()/152
 cmd: $NMCLI --pretty -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9496,68 +10006,68 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 <<<
-size: 1147
-location: clients/tests/test-client.py:test_004()/149
+size: 1314
+location: clients/tests/test-client.py:test_004()/153
 cmd: $NMCLI --pretty -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 996 bytes
+stdout: 1162 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------
-        wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-------------------------------------------------------------------------------------------------------------------
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
------------------------------------------------------------------------------------
+IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+------------------------------------------------------------------------------------------
 
 <<<
-size: 1378
-location: clients/tests/test-client.py:test_004()/150
+size: 1544
+location: clients/tests/test-client.py:test_004()/154
 cmd: $NMCLI --pretty -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1216 bytes
+stdout: 1382 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
---------------------------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
---------------------------------------------------------------------------------------------------------------------
-        wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------------------------------
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
-------------------------------------------------------------------------------------------------
+IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+-------------------------------------------------------------------------------------------------------
 
 <<<
 size: 3134
-location: clients/tests/test-client.py:test_004()/151
+location: clients/tests/test-client.py:test_004()/155
 cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -9587,7 +10097,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 3372
-location: clients/tests/test-client.py:test_004()/152
+location: clients/tests/test-client.py:test_004()/156
 cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9617,7 +10127,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 1136
-location: clients/tests/test-client.py:test_004()/153
+location: clients/tests/test-client.py:test_004()/157
 cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -9634,7 +10144,7 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MH
 
 <<<
 size: 1224
-location: clients/tests/test-client.py:test_004()/154
+location: clients/tests/test-client.py:test_004()/158
 cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9650,42 +10160,42 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1
 
 
 <<<
-size: 494
-location: clients/tests/test-client.py:test_004()/155
+size: 551
+location: clients/tests/test-client.py:test_004()/159
 cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 319 bytes
+stdout: 376 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
-size: 579
-location: clients/tests/test-client.py:test_004()/156
+size: 636
+location: clients/tests/test-client.py:test_004()/160
 cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 394 bytes
+stdout: 451 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
---------------------------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
 size: 1249
-location: clients/tests/test-client.py:test_004()/157
+location: clients/tests/test-client.py:test_004()/161
 cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -9702,7 +10212,7 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MH
 
 <<<
 size: 1337
-location: clients/tests/test-client.py:test_004()/158
+location: clients/tests/test-client.py:test_004()/162
 cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -9718,12 +10228,12 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1
 
 
 <<<
-size: 5989
-location: clients/tests/test-client.py:test_004()/159
+size: 6499
+location: clients/tests/test-client.py:test_004()/163
 cmd: $NMCLI --pretty -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 5839 bytes
+stdout: 6349 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -9731,6 +10241,7 @@ stdout: 5839 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -9760,6 +10271,10 @@ CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -9770,8 +10285,10 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -9781,6 +10298,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -9790,6 +10308,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -9833,12 +10352,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6052
-location: clients/tests/test-client.py:test_004()/160
+size: 6564
+location: clients/tests/test-client.py:test_004()/164
 cmd: $NMCLI --pretty -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5892 bytes
+stdout: 6404 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -9846,6 +10365,7 @@ stdout: 5892 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -9875,6 +10395,10 @@ CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -9885,8 +10409,10 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -9896,6 +10422,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -9905,6 +10432,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -9949,7 +10477,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2447
-location: clients/tests/test-client.py:test_004()/161
+location: clients/tests/test-client.py:test_004()/165
 cmd: $NMCLI --pretty -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -9994,7 +10522,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2465
-location: clients/tests/test-client.py:test_004()/162
+location: clients/tests/test-client.py:test_004()/166
 cmd: $NMCLI --pretty -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10038,12 +10566,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6127
-location: clients/tests/test-client.py:test_004()/163
+size: 6426
+location: clients/tests/test-client.py:test_004()/167
 cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 5839 bytes
+stdout: 6138 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -10051,6 +10579,7 @@ stdout: 5839 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -10090,8 +10619,10 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -10101,6 +10632,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -10110,6 +10642,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -10153,12 +10686,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6190
-location: clients/tests/test-client.py:test_004()/164
+size: 6490
+location: clients/tests/test-client.py:test_004()/168
 cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5892 bytes
+stdout: 6192 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -10166,6 +10699,7 @@ stdout: 5892 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -10205,8 +10739,10 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -10216,6 +10752,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -10225,6 +10762,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -10269,7 +10807,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1893
-location: clients/tests/test-client.py:test_004()/165
+location: clients/tests/test-client.py:test_004()/169
 cmd: $NMCLI --pretty dev lldp list ifname eth0
 lang: C
 returncode: 0
@@ -10305,7 +10843,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 
 <<<
 size: 1907
-location: clients/tests/test-client.py:test_004()/166
+location: clients/tests/test-client.py:test_004()/170
 cmd: $NMCLI --pretty dev lldp list ifname eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -10340,12 +10878,104 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 -------------------------------------------------------------------------------
 
 <<<
-size: 5761
-location: clients/tests/test-client.py:test_004()/167
+size: 2766
+location: clients/tests/test-client.py:test_004()/171
+cmd: $NMCLI --pretty -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: C
+returncode: 0
+stdout: 2398 bytes
+>>>
+===============================================================================
+                      Connection profile details (con-1)
+===============================================================================
+connection.id:                          con-1
+-------------------------------------------------------------------------------
+connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
+-------------------------------------------------------------------------------
+connection.type:                        802-3-ethernet
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+
+===============================================================================
+                    Connection profile details (con-vpn-1)
+===============================================================================
+connection.id:                          con-vpn-1
+-------------------------------------------------------------------------------
+connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
+-------------------------------------------------------------------------------
+connection.type:                        vpn
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+vpn.user-name:                          --
+-------------------------------------------------------------------------------
+
+===============================================================================
+                     Connection profile details (con-xx1)
+===============================================================================
+connection.id:                          con-xx1
+-------------------------------------------------------------------------------
+connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
+-------------------------------------------------------------------------------
+connection.type:                        802-11-wireless
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+
+<<<
+size: 2791
+location: clients/tests/test-client.py:test_004()/172
+cmd: $NMCLI --pretty -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2413 bytes
+>>>
+===============================================================================
+                     Szczegóły profilu połączenia (con-1)
+===============================================================================
+connection.id:                          con-1
+-------------------------------------------------------------------------------
+connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
+-------------------------------------------------------------------------------
+connection.type:                        802-3-ethernet
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+
+===============================================================================
+                   Szczegóły profilu połączenia (con-vpn-1)
+===============================================================================
+connection.id:                          con-vpn-1
+-------------------------------------------------------------------------------
+connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
+-------------------------------------------------------------------------------
+connection.type:                        vpn
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+vpn.user-name:                          --
+-------------------------------------------------------------------------------
+
+===============================================================================
+                    Szczegóły profilu połączenia (con-xx1)
+===============================================================================
+connection.id:                          con-xx1
+-------------------------------------------------------------------------------
+connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
+-------------------------------------------------------------------------------
+connection.type:                        802-11-wireless
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+
+<<<
+size: 5992
+location: clients/tests/test-client.py:test_004()/173
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5608 bytes
+stdout: 5839 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -10389,10 +11019,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -10415,8 +11047,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -10437,6 +11071,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -10458,12 +11093,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5803
-location: clients/tests/test-client.py:test_004()/168
+size: 6034
+location: clients/tests/test-client.py:test_004()/174
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5640 bytes
+stdout: 5871 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -10507,10 +11142,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -10533,8 +11170,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -10555,6 +11194,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -10576,12 +11216,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5761
-location: clients/tests/test-client.py:test_004()/169
+size: 5992
+location: clients/tests/test-client.py:test_004()/175
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5608 bytes
+stdout: 5839 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -10625,10 +11265,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -10651,8 +11293,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -10673,6 +11317,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -10694,12 +11339,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5803
-location: clients/tests/test-client.py:test_004()/170
+size: 6034
+location: clients/tests/test-client.py:test_004()/176
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5640 bytes
+stdout: 5871 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -10743,10 +11388,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -10769,8 +11416,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -10791,6 +11440,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -10812,12 +11462,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 4287
-location: clients/tests/test-client.py:test_004()/171
+size: 4475
+location: clients/tests/test-client.py:test_004()/177
 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4127 bytes
+stdout: 4315 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -10861,10 +11511,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -10887,8 +11539,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -10905,12 +11559,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4312
-location: clients/tests/test-client.py:test_004()/172
+size: 4500
+location: clients/tests/test-client.py:test_004()/178
 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4142 bytes
+stdout: 4330 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -10954,10 +11608,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -10980,8 +11636,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -10999,7 +11657,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 792
-location: clients/tests/test-client.py:test_004()/173
+location: clients/tests/test-client.py:test_004()/179
 cmd: $NMCLI --pretty --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -11018,7 +11676,7 @@ vpn.timeout:                            0
 
 <<<
 size: 808
-location: clients/tests/test-client.py:test_004()/174
+location: clients/tests/test-client.py:test_004()/180
 cmd: $NMCLI --pretty --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -11036,12 +11694,12 @@ vpn.timeout:                            0
 -------------------------------------------------------------------------------
 
 <<<
-size: 1143
-location: clients/tests/test-client.py:test_004()/175
+size: 1187
+location: clients/tests/test-client.py:test_004()/181
 cmd: $NMCLI --pretty --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 980 bytes
+stdout: 1023 bytes
 >>>
 ===============================================================================
       Activate connection details (UUID-con-vpn-1-REPLACED-REPLACED-REP)
@@ -11049,6 +11707,7 @@ stdout: 980 bytes
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -11061,12 +11720,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 1163
-location: clients/tests/test-client.py:test_004()/176
+size: 1207
+location: clients/tests/test-client.py:test_004()/182
 cmd: $NMCLI --pretty --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 990 bytes
+stdout: 1033 bytes
 >>>
 ===============================================================================
     Szczegóły aktywowania połączenia (UUID-con-vpn-1-REPLACED-REPLACED-REP)
@@ -11074,6 +11733,7 @@ stdout: 990 bytes
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -11087,7 +11747,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 689
-location: clients/tests/test-client.py:test_004()/177
+location: clients/tests/test-client.py:test_004()/183
 cmd: $NMCLI --pretty --color yes dev s
 lang: C
 returncode: 0
@@ -11106,7 +11766,7 @@ DEVICE  TYPE      STATE        CONNECTION
 
 <<<
 size: 697
-location: clients/tests/test-client.py:test_004()/178
+location: clients/tests/test-client.py:test_004()/184
 cmd: $NMCLI --pretty --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -11125,7 +11785,7 @@ DEVICE  TYPE      STATE        CONNECTION
 
 <<<
 size: 2085
-location: clients/tests/test-client.py:test_004()/179
+location: clients/tests/test-client.py:test_004()/185
 cmd: $NMCLI --pretty --color yes -f all dev status
 lang: C
 returncode: 0
@@ -11144,7 +11804,7 @@ DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH
 
 <<<
 size: 2093
-location: clients/tests/test-client.py:test_004()/180
+location: clients/tests/test-client.py:test_004()/186
 cmd: $NMCLI --pretty --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -11163,7 +11823,7 @@ DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH
 
 <<<
 size: 12880
-location: clients/tests/test-client.py:test_004()/181
+location: clients/tests/test-client.py:test_004()/187
 cmd: $NMCLI --pretty --color yes dev show
 lang: C
 returncode: 0
@@ -11371,7 +12031,7 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
 size: 12944
-location: clients/tests/test-client.py:test_004()/182
+location: clients/tests/test-client.py:test_004()/188
 cmd: $NMCLI --pretty --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -11578,12 +12238,12 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
 <<<
-size: 25669
-location: clients/tests/test-client.py:test_004()/183
+size: 27531
+location: clients/tests/test-client.py:test_004()/189
 cmd: $NMCLI --pretty --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 25515 bytes
+stdout: 27377 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -11591,6 +12251,7 @@ stdout: 25515 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -11620,6 +12281,10 @@ CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -11630,8 +12295,10 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -11641,6 +12308,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -11650,6 +12318,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -11698,6 +12367,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -11727,6 +12397,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               off
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.49.34/22
@@ -11772,6 +12446,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -11801,6 +12476,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               off
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.127.210/25
@@ -11853,6 +12532,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -11882,6 +12562,10 @@ CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -11892,8 +12576,10 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -11954,6 +12640,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -11983,6 +12670,10 @@ CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -11993,6 +12684,7 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
@@ -12029,12 +12721,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 25855
-location: clients/tests/test-client.py:test_004()/184
+size: 27725
+location: clients/tests/test-client.py:test_004()/190
 cmd: $NMCLI --pretty --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 25691 bytes
+stdout: 27561 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -12042,6 +12734,7 @@ stdout: 25691 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -12071,6 +12764,10 @@ CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -12081,8 +12778,10 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -12092,6 +12791,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -12101,6 +12801,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -12149,6 +12850,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -12178,6 +12880,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               wyłączone
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.49.34/22
@@ -12223,6 +12929,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -12252,6 +12959,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               wyłączone
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.127.210/25
@@ -12304,6 +13015,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -12333,6 +13045,10 @@ CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -12343,8 +13059,10 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -12405,6 +13123,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -12434,6 +13153,10 @@ CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -12444,6 +13167,7 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
@@ -12481,7 +13205,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2446
-location: clients/tests/test-client.py:test_004()/185
+location: clients/tests/test-client.py:test_004()/191
 cmd: $NMCLI --pretty --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -12526,7 +13250,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2464
-location: clients/tests/test-client.py:test_004()/186
+location: clients/tests/test-client.py:test_004()/192
 cmd: $NMCLI --pretty --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -12570,12 +13294,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6214
-location: clients/tests/test-client.py:test_004()/187
+size: 6751
+location: clients/tests/test-client.py:test_004()/193
 cmd: $NMCLI --pretty --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 6055 bytes
+stdout: 6592 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -12583,6 +13307,7 @@ stdout: 6055 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -12612,6 +13337,10 @@ CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -12622,8 +13351,10 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -12633,6 +13364,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -12642,6 +13374,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -12685,12 +13418,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6277
-location: clients/tests/test-client.py:test_004()/188
+size: 6816
+location: clients/tests/test-client.py:test_004()/194
 cmd: $NMCLI --pretty --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6108 bytes
+stdout: 6647 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -12698,6 +13431,7 @@ stdout: 6108 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -12727,6 +13461,10 @@ CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -12737,8 +13475,10 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -12748,6 +13488,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -12757,6 +13498,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -12800,12 +13542,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 2471
-location: clients/tests/test-client.py:test_004()/189
+size: 2596
+location: clients/tests/test-client.py:test_004()/195
 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2277 bytes
+stdout: 2402 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -12813,6 +13555,7 @@ stdout: 2277 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -12849,15 +13592,16 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 
 <<<
-size: 2503
-location: clients/tests/test-client.py:test_004()/190
+size: 2629
+location: clients/tests/test-client.py:test_004()/196
 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2299 bytes
+stdout: 2425 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -12865,6 +13609,7 @@ stdout: 2299 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -12901,15 +13646,16 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 
 <<<
-size: 2471
-location: clients/tests/test-client.py:test_004()/191
+size: 2596
+location: clients/tests/test-client.py:test_004()/197
 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2277 bytes
+stdout: 2402 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -12917,6 +13663,7 @@ stdout: 2277 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -12953,15 +13700,16 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 
 <<<
-size: 2503
-location: clients/tests/test-client.py:test_004()/192
+size: 2629
+location: clients/tests/test-client.py:test_004()/198
 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2299 bytes
+stdout: 2425 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -12969,6 +13717,7 @@ stdout: 2299 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -13005,11 +13754,12 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 
 <<<
 size: 798
-location: clients/tests/test-client.py:test_004()/193
+location: clients/tests/test-client.py:test_004()/199
 cmd: $NMCLI --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -13028,7 +13778,7 @@ DEVICE  TYPE      DBUS-PATH
 
 <<<
 size: 801
-location: clients/tests/test-client.py:test_004()/194
+location: clients/tests/test-client.py:test_004()/200
 cmd: $NMCLI --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13047,7 +13797,7 @@ DEVICE  TYPE      DBUS-PATH
 
 <<<
 size: 3645
-location: clients/tests/test-client.py:test_004()/195
+location: clients/tests/test-client.py:test_004()/201
 cmd: $NMCLI --pretty --color yes -f ALL device wifi list
 lang: C
 returncode: 0
@@ -13077,7 +13827,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 3883
-location: clients/tests/test-client.py:test_004()/196
+location: clients/tests/test-client.py:test_004()/202
 cmd: $NMCLI --pretty --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13106,68 +13856,68 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 <<<
-size: 1448
-location: clients/tests/test-client.py:test_004()/197
+size: 1650
+location: clients/tests/test-client.py:test_004()/203
 cmd: $NMCLI --pretty --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 1284 bytes
+stdout: 1486 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------
-        wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-------------------------------------------------------------------------------------------------------------------
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
------------------------------------------------------------------------------------
+IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+------------------------------------------------------------------------------------------
 
 <<<
-size: 1678
-location: clients/tests/test-client.py:test_004()/198
+size: 1880
+location: clients/tests/test-client.py:test_004()/204
 cmd: $NMCLI --pretty --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1504 bytes
+stdout: 1706 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
---------------------------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
---------------------------------------------------------------------------------------------------------------------
-        wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------------------------------
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
-------------------------------------------------------------------------------------------------
+IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+-------------------------------------------------------------------------------------------------------
 
 <<<
 size: 3758
-location: clients/tests/test-client.py:test_004()/199
+location: clients/tests/test-client.py:test_004()/205
 cmd: $NMCLI --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -13197,7 +13947,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 3996
-location: clients/tests/test-client.py:test_004()/200
+location: clients/tests/test-client.py:test_004()/206
 cmd: $NMCLI --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13227,7 +13977,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 1302
-location: clients/tests/test-client.py:test_004()/201
+location: clients/tests/test-client.py:test_004()/207
 cmd: $NMCLI --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -13244,7 +13994,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 
 <<<
 size: 1389
-location: clients/tests/test-client.py:test_004()/202
+location: clients/tests/test-client.py:test_004()/208
 cmd: $NMCLI --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13260,42 +14010,42 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 
 
 <<<
-size: 578
-location: clients/tests/test-client.py:test_004()/203
+size: 644
+location: clients/tests/test-client.py:test_004()/209
 cmd: $NMCLI --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 391 bytes
+stdout: 457 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
-size: 663
-location: clients/tests/test-client.py:test_004()/204
+size: 729
+location: clients/tests/test-client.py:test_004()/210
 cmd: $NMCLI --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 466 bytes
+stdout: 532 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
---------------------------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
 size: 1415
-location: clients/tests/test-client.py:test_004()/205
+location: clients/tests/test-client.py:test_004()/211
 cmd: $NMCLI --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -13312,7 +14062,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 
 <<<
 size: 1502
-location: clients/tests/test-client.py:test_004()/206
+location: clients/tests/test-client.py:test_004()/212
 cmd: $NMCLI --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13328,12 +14078,12 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 
 
 <<<
-size: 6217
-location: clients/tests/test-client.py:test_004()/207
+size: 6754
+location: clients/tests/test-client.py:test_004()/213
 cmd: $NMCLI --pretty --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 6055 bytes
+stdout: 6592 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -13341,6 +14091,7 @@ stdout: 6055 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -13370,6 +14121,10 @@ CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -13380,8 +14135,10 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -13391,6 +14148,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -13400,6 +14158,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -13443,12 +14202,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6280
-location: clients/tests/test-client.py:test_004()/208
+size: 6819
+location: clients/tests/test-client.py:test_004()/214
 cmd: $NMCLI --pretty --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6108 bytes
+stdout: 6647 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -13456,6 +14215,7 @@ stdout: 6108 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -13485,6 +14245,10 @@ CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -13495,8 +14259,10 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -13506,6 +14272,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -13515,6 +14282,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -13559,7 +14327,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2459
-location: clients/tests/test-client.py:test_004()/209
+location: clients/tests/test-client.py:test_004()/215
 cmd: $NMCLI --pretty --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -13604,7 +14372,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2477
-location: clients/tests/test-client.py:test_004()/210
+location: clients/tests/test-client.py:test_004()/216
 cmd: $NMCLI --pretty --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13648,12 +14416,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6355
-location: clients/tests/test-client.py:test_004()/211
+size: 6681
+location: clients/tests/test-client.py:test_004()/217
 cmd: $NMCLI --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 6055 bytes
+stdout: 6381 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -13661,6 +14429,7 @@ stdout: 6055 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -13700,8 +14469,10 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -13711,6 +14482,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -13720,6 +14492,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -13763,12 +14536,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6418
-location: clients/tests/test-client.py:test_004()/212
+size: 6745
+location: clients/tests/test-client.py:test_004()/218
 cmd: $NMCLI --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6108 bytes
+stdout: 6435 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -13776,6 +14549,7 @@ stdout: 6108 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -13815,8 +14589,10 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -13826,6 +14602,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -13835,6 +14612,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -13879,7 +14657,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1905
-location: clients/tests/test-client.py:test_004()/213
+location: clients/tests/test-client.py:test_004()/219
 cmd: $NMCLI --pretty --color yes dev lldp list ifname eth0
 lang: C
 returncode: 0
@@ -13915,7 +14693,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 
 <<<
 size: 1919
-location: clients/tests/test-client.py:test_004()/214
+location: clients/tests/test-client.py:test_004()/220
 cmd: $NMCLI --pretty --color yes dev lldp list ifname eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -13950,12 +14728,104 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 -------------------------------------------------------------------------------
 
 <<<
-size: 2390
-location: clients/tests/test-client.py:test_004()/215
+size: 2778
+location: clients/tests/test-client.py:test_004()/221
+cmd: $NMCLI --pretty --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: C
+returncode: 0
+stdout: 2398 bytes
+>>>
+===============================================================================
+                      Connection profile details (con-1)
+===============================================================================
+connection.id:                          con-1
+-------------------------------------------------------------------------------
+connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
+-------------------------------------------------------------------------------
+connection.type:                        802-3-ethernet
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+
+===============================================================================
+                    Connection profile details (con-vpn-1)
+===============================================================================
+connection.id:                          con-vpn-1
+-------------------------------------------------------------------------------
+connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
+-------------------------------------------------------------------------------
+connection.type:                        vpn
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+vpn.user-name:                          --
+-------------------------------------------------------------------------------
+
+===============================================================================
+                     Connection profile details (con-xx1)
+===============================================================================
+connection.id:                          con-xx1
+-------------------------------------------------------------------------------
+connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
+-------------------------------------------------------------------------------
+connection.type:                        802-11-wireless
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+
+<<<
+size: 2803
+location: clients/tests/test-client.py:test_004()/222
+cmd: $NMCLI --pretty --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2413 bytes
+>>>
+===============================================================================
+                     Szczegóły profilu połączenia (con-1)
+===============================================================================
+connection.id:                          con-1
+-------------------------------------------------------------------------------
+connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
+-------------------------------------------------------------------------------
+connection.type:                        802-3-ethernet
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+
+===============================================================================
+                   Szczegóły profilu połączenia (con-vpn-1)
+===============================================================================
+connection.id:                          con-vpn-1
+-------------------------------------------------------------------------------
+connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
+-------------------------------------------------------------------------------
+connection.type:                        vpn
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+vpn.user-name:                          --
+-------------------------------------------------------------------------------
+
+===============================================================================
+                    Szczegóły profilu połączenia (con-xx1)
+===============================================================================
+connection.id:                          con-xx1
+-------------------------------------------------------------------------------
+connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
+-------------------------------------------------------------------------------
+connection.type:                        802-11-wireless
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+
+<<<
+size: 2498
+location: clients/tests/test-client.py:test_004()/223
 cmd: $NMCLI --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2250 bytes
+stdout: 2358 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -13995,10 +14865,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -14020,8 +14892,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -14036,6 +14910,7 @@ proxy.pac-script:
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -14055,12 +14930,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2400
-location: clients/tests/test-client.py:test_004()/216
+size: 2508
+location: clients/tests/test-client.py:test_004()/224
 cmd: $NMCLI --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2250 bytes
+stdout: 2358 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -14100,10 +14975,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -14125,8 +15002,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -14141,6 +15020,7 @@ proxy.pac-script:
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -14160,12 +15040,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2390
-location: clients/tests/test-client.py:test_004()/217
+size: 2498
+location: clients/tests/test-client.py:test_004()/225
 cmd: $NMCLI --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2250 bytes
+stdout: 2358 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -14205,10 +15085,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -14230,8 +15112,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -14246,6 +15130,7 @@ proxy.pac-script:
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -14265,12 +15150,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2400
-location: clients/tests/test-client.py:test_004()/218
+size: 2508
+location: clients/tests/test-client.py:test_004()/226
 cmd: $NMCLI --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2250 bytes
+stdout: 2358 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -14310,10 +15195,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -14335,8 +15222,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -14351,6 +15240,7 @@ proxy.pac-script:
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -14370,12 +15260,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 1838
-location: clients/tests/test-client.py:test_004()/219
+size: 1928
+location: clients/tests/test-client.py:test_004()/227
 cmd: $NMCLI --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1691 bytes
+stdout: 1781 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -14415,10 +15305,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -14440,8 +15332,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -14455,12 +15349,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 1848
-location: clients/tests/test-client.py:test_004()/220
+size: 1938
+location: clients/tests/test-client.py:test_004()/228
 cmd: $NMCLI --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1691 bytes
+stdout: 1781 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -14500,10 +15394,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -14525,8 +15421,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -14541,7 +15439,7 @@ proxy.pac-script:
 
 <<<
 size: 317
-location: clients/tests/test-client.py:test_004()/221
+location: clients/tests/test-client.py:test_004()/229
 cmd: $NMCLI --terse -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -14556,7 +15454,7 @@ vpn.timeout:0
 
 <<<
 size: 327
-location: clients/tests/test-client.py:test_004()/222
+location: clients/tests/test-client.py:test_004()/230
 cmd: $NMCLI --terse -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14570,16 +15468,17 @@ vpn.persistent:no
 vpn.timeout:0
 
 <<<
-size: 520
-location: clients/tests/test-client.py:test_004()/223
+size: 538
+location: clients/tests/test-client.py:test_004()/231
 cmd: $NMCLI --terse -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 370 bytes
+stdout: 388 bytes
 >>>
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -14591,16 +15490,17 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 530
-location: clients/tests/test-client.py:test_004()/224
+size: 548
+location: clients/tests/test-client.py:test_004()/232
 cmd: $NMCLI --terse -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 370 bytes
+stdout: 388 bytes
 >>>
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -14613,7 +15513,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 264
-location: clients/tests/test-client.py:test_004()/225
+location: clients/tests/test-client.py:test_004()/233
 cmd: $NMCLI --terse dev s
 lang: C
 returncode: 0
@@ -14627,7 +15527,7 @@ wlan1:wifi:unavailable:
 
 <<<
 size: 274
-location: clients/tests/test-client.py:test_004()/226
+location: clients/tests/test-client.py:test_004()/234
 cmd: $NMCLI --terse dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14641,7 +15541,7 @@ wlan1:wifi:unavailable:
 
 <<<
 size: 662
-location: clients/tests/test-client.py:test_004()/227
+location: clients/tests/test-client.py:test_004()/235
 cmd: $NMCLI --terse -f all dev status
 lang: C
 returncode: 0
@@ -14655,7 +15555,7 @@ wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 672
-location: clients/tests/test-client.py:test_004()/228
+location: clients/tests/test-client.py:test_004()/236
 cmd: $NMCLI --terse -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14669,7 +15569,7 @@ wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 4535
-location: clients/tests/test-client.py:test_004()/229
+location: clients/tests/test-client.py:test_004()/237
 cmd: $NMCLI --terse dev show
 lang: C
 returncode: 0
@@ -14815,7 +15715,7 @@ IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
 size: 4545
-location: clients/tests/test-client.py:test_004()/230
+location: clients/tests/test-client.py:test_004()/238
 cmd: $NMCLI --terse dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -14960,16 +15860,17 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 11994
-location: clients/tests/test-client.py:test_004()/231
+size: 12893
+location: clients/tests/test-client.py:test_004()/239
 cmd: $NMCLI --terse -f all dev show
 lang: C
 returncode: 0
-stdout: 11853 bytes
+stdout: 12752 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -14997,6 +15898,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -15007,7 +15911,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -15016,6 +15922,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
 AP[2].CHAN:1
@@ -15024,6 +15931,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
 AP[3].CHAN:1
@@ -15063,6 +15971,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -15090,6 +15999,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.49.34/22
 IP4.ADDRESS[2]:192.168.135.86/19
@@ -15126,6 +16038,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-
 GENERAL.DEVICE:eth1
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -15153,6 +16066,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.127.210/25
 IP4.GATEWAY:192.168.88.4
@@ -15196,6 +16112,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-
 GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -15223,6 +16140,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -15233,7 +16153,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:94:2B:E8:F6:D2:86
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -15285,6 +16207,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -15312,6 +16235,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -15322,6 +16248,7 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 IP4.ADDRESS[1]:192.168.97.124/29
 IP4.ADDRESS[2]:192.168.76.154/18
 IP4.GATEWAY:
@@ -15352,16 +16279,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 12040
-location: clients/tests/test-client.py:test_004()/232
+size: 12939
+location: clients/tests/test-client.py:test_004()/240
 cmd: $NMCLI --terse -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 11889 bytes
+stdout: 12788 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -15389,6 +16317,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -15399,7 +16330,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -15408,6 +16341,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
@@ -15416,6 +16350,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
@@ -15455,6 +16390,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -15482,6 +16418,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.49.34/22
 IP4.ADDRESS[2]:192.168.135.86/19
@@ -15518,6 +16457,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-
 GENERAL.DEVICE:eth1
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -15545,6 +16485,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.127.210/25
 IP4.GATEWAY:192.168.88.4
@@ -15588,6 +16531,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-
 GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -15615,6 +16559,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -15625,7 +16572,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:94:2B:E8:F6:D2:86
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -15677,6 +16626,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -15704,6 +16654,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -15714,6 +16667,7 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 IP4.ADDRESS[1]:192.168.97.124/29
 IP4.ADDRESS[2]:192.168.76.154/18
 IP4.GATEWAY:
@@ -15745,7 +16699,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 877
-location: clients/tests/test-client.py:test_004()/233
+location: clients/tests/test-client.py:test_004()/241
 cmd: $NMCLI --terse dev show wlan0
 lang: C
 returncode: 0
@@ -15778,7 +16732,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 887
-location: clients/tests/test-client.py:test_004()/234
+location: clients/tests/test-client.py:test_004()/242
 cmd: $NMCLI --terse dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -15810,16 +16764,17 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2712
-location: clients/tests/test-client.py:test_004()/235
+size: 2969
+location: clients/tests/test-client.py:test_004()/243
 cmd: $NMCLI --terse -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2566 bytes
+stdout: 2823 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -15847,6 +16802,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -15857,7 +16815,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -15866,6 +16826,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
 AP[2].CHAN:1
@@ -15874,6 +16835,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
 AP[3].CHAN:1
@@ -15911,16 +16873,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2749
-location: clients/tests/test-client.py:test_004()/236
+size: 3006
+location: clients/tests/test-client.py:test_004()/244
 cmd: $NMCLI --terse -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2593 bytes
+stdout: 2850 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -15948,6 +16911,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -15958,7 +16924,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -15967,6 +16935,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
@@ -15975,6 +16944,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
@@ -16012,16 +16982,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1210
-location: clients/tests/test-client.py:test_004()/237
+size: 1298
+location: clients/tests/test-client.py:test_004()/245
 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1029 bytes
+stdout: 1117 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -16056,18 +17027,20 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 
 <<<
-size: 1220
-location: clients/tests/test-client.py:test_004()/238
+size: 1308
+location: clients/tests/test-client.py:test_004()/246
 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1029 bytes
+stdout: 1117 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -16102,18 +17075,20 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 
 <<<
-size: 1210
-location: clients/tests/test-client.py:test_004()/239
+size: 1298
+location: clients/tests/test-client.py:test_004()/247
 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1029 bytes
+stdout: 1117 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -16148,18 +17123,20 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 
 <<<
-size: 1220
-location: clients/tests/test-client.py:test_004()/240
+size: 1308
+location: clients/tests/test-client.py:test_004()/248
 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1029 bytes
+stdout: 1117 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -16194,10 +17171,11 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 
 <<<
 size: 423
-location: clients/tests/test-client.py:test_004()/241
+location: clients/tests/test-client.py:test_004()/249
 cmd: $NMCLI --terse -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -16211,7 +17189,7 @@ wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 433
-location: clients/tests/test-client.py:test_004()/242
+location: clients/tests/test-client.py:test_004()/250
 cmd: $NMCLI --terse -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16225,7 +17203,7 @@ wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 1081
-location: clients/tests/test-client.py:test_004()/243
+location: clients/tests/test-client.py:test_004()/251
 cmd: $NMCLI --terse -f ALL device wifi list
 lang: C
 returncode: 0
@@ -16240,7 +17218,7 @@ AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54
 
 <<<
 size: 1139
-location: clients/tests/test-client.py:test_004()/244
+location: clients/tests/test-client.py:test_004()/252
 cmd: $NMCLI --terse -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16254,38 +17232,38 @@ AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:24
 
 
 <<<
-size: 338
-location: clients/tests/test-client.py:test_004()/245
+size: 430
+location: clients/tests/test-client.py:test_004()/253
 cmd: $NMCLI --terse -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 188 bytes
+stdout: 280 bytes
 >>>
- :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
- :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+ :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 
- :wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
+ :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
 
 
 <<<
-size: 384
-location: clients/tests/test-client.py:test_004()/246
+size: 476
+location: clients/tests/test-client.py:test_004()/254
 cmd: $NMCLI --terse -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 224 bytes
+stdout: 316 bytes
 >>>
- :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
- :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+ :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 
- :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
+ :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
 
 
 <<<
 size: 1194
-location: clients/tests/test-client.py:test_004()/247
+location: clients/tests/test-client.py:test_004()/255
 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -16300,7 +17278,7 @@ AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54
 
 <<<
 size: 1252
-location: clients/tests/test-client.py:test_004()/248
+location: clients/tests/test-client.py:test_004()/256
 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16315,7 +17293,7 @@ AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:24
 
 <<<
 size: 428
-location: clients/tests/test-client.py:test_004()/249
+location: clients/tests/test-client.py:test_004()/257
 cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -16327,7 +17305,7 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54
 
 <<<
 size: 450
-location: clients/tests/test-client.py:test_004()/250
+location: clients/tests/test-client.py:test_004()/258
 cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16338,32 +17316,32 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:24
 
 
 <<<
-size: 224
-location: clients/tests/test-client.py:test_004()/251
+size: 247
+location: clients/tests/test-client.py:test_004()/259
 cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 51 bytes
+stdout: 74 bytes
 >>>
- :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
 
 
 
 <<<
-size: 243
-location: clients/tests/test-client.py:test_004()/252
+size: 266
+location: clients/tests/test-client.py:test_004()/260
 cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 60 bytes
+stdout: 83 bytes
 >>>
- :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
 
 
 
 <<<
 size: 541
-location: clients/tests/test-client.py:test_004()/253
+location: clients/tests/test-client.py:test_004()/261
 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -16375,7 +17353,7 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54
 
 <<<
 size: 563
-location: clients/tests/test-client.py:test_004()/254
+location: clients/tests/test-client.py:test_004()/262
 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16386,16 +17364,17 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:24
 
 
 <<<
-size: 2715
-location: clients/tests/test-client.py:test_004()/255
+size: 2972
+location: clients/tests/test-client.py:test_004()/263
 cmd: $NMCLI --terse -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2566 bytes
+stdout: 2823 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -16423,6 +17402,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -16433,7 +17415,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -16442,6 +17426,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
 AP[2].CHAN:1
@@ -16450,6 +17435,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
 AP[3].CHAN:1
@@ -16487,16 +17473,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2752
-location: clients/tests/test-client.py:test_004()/256
+size: 3009
+location: clients/tests/test-client.py:test_004()/264
 cmd: $NMCLI --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2593 bytes
+stdout: 2850 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -16524,6 +17511,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -16534,7 +17524,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -16543,6 +17535,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
@@ -16551,6 +17544,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
@@ -16589,7 +17583,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 890
-location: clients/tests/test-client.py:test_004()/257
+location: clients/tests/test-client.py:test_004()/265
 cmd: $NMCLI --terse -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -16622,7 +17616,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 900
-location: clients/tests/test-client.py:test_004()/258
+location: clients/tests/test-client.py:test_004()/266
 cmd: $NMCLI --terse -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16654,16 +17648,17 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2853
-location: clients/tests/test-client.py:test_004()/259
+size: 3031
+location: clients/tests/test-client.py:test_004()/267
 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 2566 bytes
+stdout: 2744 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -16701,7 +17696,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -16710,6 +17707,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
 AP[2].CHAN:1
@@ -16718,6 +17716,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
 AP[3].CHAN:1
@@ -16755,16 +17754,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2890
-location: clients/tests/test-client.py:test_004()/260
+size: 3068
+location: clients/tests/test-client.py:test_004()/268
 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2593 bytes
+stdout: 2771 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -16802,7 +17802,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -16811,6 +17813,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
@@ -16819,6 +17822,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
@@ -16857,7 +17861,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 1131
-location: clients/tests/test-client.py:test_004()/261
+location: clients/tests/test-client.py:test_004()/269
 cmd: $NMCLI --terse dev lldp list ifname eth0
 lang: C
 returncode: 0
@@ -16887,7 +17891,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:40 (wlan-access-point,telephone)
 
 <<<
 size: 1141
-location: clients/tests/test-client.py:test_004()/262
+location: clients/tests/test-client.py:test_004()/270
 cmd: $NMCLI --terse dev lldp list ifname eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -16916,12 +17920,60 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION:Test system #3
 NEIGHBOR[2].SYSTEM-CAPABILITIES:40 (wlan-access-point,telephone)
 
 <<<
-size: 2402
-location: clients/tests/test-client.py:test_004()/263
+size: 772
+location: clients/tests/test-client.py:test_004()/271
+cmd: $NMCLI --terse -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: C
+returncode: 0
+stdout: 406 bytes
+>>>
+connection.id:con-1
+connection.uuid:5fcfd6d7-1e63-3332-8826-a7eda103792d
+connection.type:802-3-ethernet
+connection.interface-name:
+
+connection.id:con-vpn-1
+connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
+connection.type:vpn
+connection.interface-name:
+vpn.user-name:
+
+connection.id:con-xx1
+connection.uuid:UUID-con-xx1-REPLACED-REPLACED-REPLA
+connection.type:802-11-wireless
+connection.interface-name:
+
+<<<
+size: 782
+location: clients/tests/test-client.py:test_004()/272
+cmd: $NMCLI --terse -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 406 bytes
+>>>
+connection.id:con-1
+connection.uuid:5fcfd6d7-1e63-3332-8826-a7eda103792d
+connection.type:802-3-ethernet
+connection.interface-name:
+
+connection.id:con-vpn-1
+connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
+connection.type:vpn
+connection.interface-name:
+vpn.user-name:
+
+connection.id:con-xx1
+connection.uuid:UUID-con-xx1-REPLACED-REPLACED-REPLA
+connection.type:802-11-wireless
+connection.interface-name:
+
+<<<
+size: 2510
+location: clients/tests/test-client.py:test_004()/273
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2250 bytes
+stdout: 2358 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -16961,10 +18013,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -16986,8 +18040,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -17002,6 +18058,7 @@ proxy.pac-script:
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -17021,12 +18078,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2412
-location: clients/tests/test-client.py:test_004()/264
+size: 2520
+location: clients/tests/test-client.py:test_004()/274
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2250 bytes
+stdout: 2358 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -17066,10 +18123,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -17091,8 +18150,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -17107,6 +18168,7 @@ proxy.pac-script:
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -17126,12 +18188,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2402
-location: clients/tests/test-client.py:test_004()/265
+size: 2510
+location: clients/tests/test-client.py:test_004()/275
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2250 bytes
+stdout: 2358 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -17171,10 +18233,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -17196,8 +18260,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -17212,6 +18278,7 @@ proxy.pac-script:
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -17231,12 +18298,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2412
-location: clients/tests/test-client.py:test_004()/266
+size: 2520
+location: clients/tests/test-client.py:test_004()/276
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2250 bytes
+stdout: 2358 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -17276,10 +18343,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -17301,8 +18370,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -17317,6 +18388,7 @@ proxy.pac-script:
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -17336,12 +18408,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 1850
-location: clients/tests/test-client.py:test_004()/267
+size: 1940
+location: clients/tests/test-client.py:test_004()/277
 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1691 bytes
+stdout: 1781 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -17381,10 +18453,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -17406,8 +18480,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -17421,12 +18497,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 1860
-location: clients/tests/test-client.py:test_004()/268
+size: 1950
+location: clients/tests/test-client.py:test_004()/278
 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1691 bytes
+stdout: 1781 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -17466,10 +18542,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -17491,8 +18569,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -17507,7 +18587,7 @@ proxy.pac-script:
 
 <<<
 size: 329
-location: clients/tests/test-client.py:test_004()/269
+location: clients/tests/test-client.py:test_004()/279
 cmd: $NMCLI --terse --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -17522,7 +18602,7 @@ vpn.timeout:0
 
 <<<
 size: 339
-location: clients/tests/test-client.py:test_004()/270
+location: clients/tests/test-client.py:test_004()/280
 cmd: $NMCLI --terse --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -17536,16 +18616,17 @@ vpn.persistent:no
 vpn.timeout:0
 
 <<<
-size: 532
-location: clients/tests/test-client.py:test_004()/271
+size: 550
+location: clients/tests/test-client.py:test_004()/281
 cmd: $NMCLI --terse --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 370 bytes
+stdout: 388 bytes
 >>>
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -17557,16 +18638,17 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 542
-location: clients/tests/test-client.py:test_004()/272
+size: 560
+location: clients/tests/test-client.py:test_004()/282
 cmd: $NMCLI --terse --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 370 bytes
+stdout: 388 bytes
 >>>
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -17579,7 +18661,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 436
-location: clients/tests/test-client.py:test_004()/273
+location: clients/tests/test-client.py:test_004()/283
 cmd: $NMCLI --terse --color yes dev s
 lang: C
 returncode: 0
@@ -17593,7 +18675,7 @@ stdout: 295 bytes
 
 <<<
 size: 446
-location: clients/tests/test-client.py:test_004()/274
+location: clients/tests/test-client.py:test_004()/284
 cmd: $NMCLI --terse --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -17607,7 +18689,7 @@ stdout: 295 bytes
 
 <<<
 size: 1034
-location: clients/tests/test-client.py:test_004()/275
+location: clients/tests/test-client.py:test_004()/285
 cmd: $NMCLI --terse --color yes -f all dev status
 lang: C
 returncode: 0
@@ -17621,7 +18703,7 @@ stdout: 881 bytes
 
 <<<
 size: 1044
-location: clients/tests/test-client.py:test_004()/276
+location: clients/tests/test-client.py:test_004()/286
 cmd: $NMCLI --terse --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -17635,7 +18717,7 @@ stdout: 881 bytes
 
 <<<
 size: 4547
-location: clients/tests/test-client.py:test_004()/277
+location: clients/tests/test-client.py:test_004()/287
 cmd: $NMCLI --terse --color yes dev show
 lang: C
 returncode: 0
@@ -17781,7 +18863,7 @@ IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
 size: 4557
-location: clients/tests/test-client.py:test_004()/278
+location: clients/tests/test-client.py:test_004()/288
 cmd: $NMCLI --terse --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -17926,16 +19008,17 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 12294
-location: clients/tests/test-client.py:test_004()/279
+size: 13229
+location: clients/tests/test-client.py:test_004()/289
 cmd: $NMCLI --terse --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 12141 bytes
+stdout: 13076 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -17963,6 +19046,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -17973,7 +19059,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -17982,6 +19070,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
 AP[2].CHAN:1
@@ -17990,6 +19079,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
 AP[3].CHAN:1
@@ -18029,6 +19119,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -18056,6 +19147,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.49.34/22
 IP4.ADDRESS[2]:192.168.135.86/19
@@ -18092,6 +19186,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-
 GENERAL.DEVICE:eth1
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -18119,6 +19214,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.127.210/25
 IP4.GATEWAY:192.168.88.4
@@ -18162,6 +19260,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-
 GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -18189,6 +19288,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -18199,7 +19301,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:94:2B:E8:F6:D2:86
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -18251,6 +19355,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -18278,6 +19383,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -18288,6 +19396,7 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 IP4.ADDRESS[1]:192.168.97.124/29
 IP4.ADDRESS[2]:192.168.76.154/18
 IP4.GATEWAY:
@@ -18318,16 +19427,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 12340
-location: clients/tests/test-client.py:test_004()/280
+size: 13275
+location: clients/tests/test-client.py:test_004()/290
 cmd: $NMCLI --terse --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 12177 bytes
+stdout: 13112 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -18355,6 +19465,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -18365,7 +19478,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -18374,6 +19489,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
@@ -18382,6 +19498,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
@@ -18421,6 +19538,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -18448,6 +19566,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.49.34/22
 IP4.ADDRESS[2]:192.168.135.86/19
@@ -18484,6 +19605,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-
 GENERAL.DEVICE:eth1
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -18511,6 +19633,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.127.210/25
 IP4.GATEWAY:192.168.88.4
@@ -18554,6 +19679,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-
 GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -18581,6 +19707,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -18591,7 +19720,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:94:2B:E8:F6:D2:86
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -18643,6 +19774,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -18670,6 +19802,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -18680,6 +19815,7 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 IP4.ADDRESS[1]:192.168.97.124/29
 IP4.ADDRESS[2]:192.168.76.154/18
 IP4.GATEWAY:
@@ -18711,7 +19847,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 889
-location: clients/tests/test-client.py:test_004()/281
+location: clients/tests/test-client.py:test_004()/291
 cmd: $NMCLI --terse --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -18744,7 +19880,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 899
-location: clients/tests/test-client.py:test_004()/282
+location: clients/tests/test-client.py:test_004()/292
 cmd: $NMCLI --terse --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -18776,16 +19912,17 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2940
-location: clients/tests/test-client.py:test_004()/283
+size: 3224
+location: clients/tests/test-client.py:test_004()/293
 cmd: $NMCLI --terse --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2782 bytes
+stdout: 3066 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -18813,6 +19950,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -18823,7 +19963,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -18832,6 +19974,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
 AP[2].CHAN:1
@@ -18840,6 +19983,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
 AP[3].CHAN:1
@@ -18877,16 +20021,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2977
-location: clients/tests/test-client.py:test_004()/284
+size: 3261
+location: clients/tests/test-client.py:test_004()/294
 cmd: $NMCLI --terse --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2809 bytes
+stdout: 3093 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -18914,6 +20059,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -18924,7 +20072,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -18933,6 +20083,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
@@ -18941,6 +20092,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
@@ -18978,16 +20130,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1222
-location: clients/tests/test-client.py:test_004()/285
+size: 1310
+location: clients/tests/test-client.py:test_004()/295
 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1029 bytes
+stdout: 1117 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -19022,18 +20175,20 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 
 <<<
-size: 1232
-location: clients/tests/test-client.py:test_004()/286
+size: 1320
+location: clients/tests/test-client.py:test_004()/296
 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1029 bytes
+stdout: 1117 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -19068,18 +20223,20 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 
 <<<
-size: 1222
-location: clients/tests/test-client.py:test_004()/287
+size: 1310
+location: clients/tests/test-client.py:test_004()/297
 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1029 bytes
+stdout: 1117 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -19114,18 +20271,20 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 
 <<<
-size: 1232
-location: clients/tests/test-client.py:test_004()/288
+size: 1320
+location: clients/tests/test-client.py:test_004()/298
 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1029 bytes
+stdout: 1117 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -19160,10 +20319,11 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 
 <<<
 size: 555
-location: clients/tests/test-client.py:test_004()/289
+location: clients/tests/test-client.py:test_004()/299
 cmd: $NMCLI --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -19177,7 +20337,7 @@ stdout: 391 bytes
 
 <<<
 size: 565
-location: clients/tests/test-client.py:test_004()/290
+location: clients/tests/test-client.py:test_004()/300
 cmd: $NMCLI --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -19191,7 +20351,7 @@ stdout: 391 bytes
 
 <<<
 size: 1706
-location: clients/tests/test-client.py:test_004()/291
+location: clients/tests/test-client.py:test_004()/301
 cmd: $NMCLI --terse --color yes -f ALL device wifi list
 lang: C
 returncode: 0
@@ -19206,7 +20366,7 @@ stdout: 1546 bytes
 
 <<<
 size: 1764
-location: clients/tests/test-client.py:test_004()/292
+location: clients/tests/test-client.py:test_004()/302
 cmd: $NMCLI --terse --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -19220,38 +20380,38 @@ stdout: 1594 bytes
 
 
 <<<
-size: 638
-location: clients/tests/test-client.py:test_004()/293
+size: 766
+location: clients/tests/test-client.py:test_004()/303
 cmd: $NMCLI --terse --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 476 bytes
+stdout: 604 bytes
 >>>
- :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
- :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+ :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 
- :wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
+ :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
 
 
 <<<
-size: 684
-location: clients/tests/test-client.py:test_004()/294
+size: 812
+location: clients/tests/test-client.py:test_004()/304
 cmd: $NMCLI --terse --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 512 bytes
+stdout: 640 bytes
 >>>
- :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
- :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+ :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 
- :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
+ :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
 
 
 <<<
 size: 1819
-location: clients/tests/test-client.py:test_004()/295
+location: clients/tests/test-client.py:test_004()/305
 cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -19266,7 +20426,7 @@ stdout: 1546 bytes
 
 <<<
 size: 1877
-location: clients/tests/test-client.py:test_004()/296
+location: clients/tests/test-client.py:test_004()/306
 cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -19281,7 +20441,7 @@ stdout: 1594 bytes
 
 <<<
 size: 593
-location: clients/tests/test-client.py:test_004()/297
+location: clients/tests/test-client.py:test_004()/307
 cmd: $NMCLI --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -19293,7 +20453,7 @@ stdout: 410 bytes
 
 <<<
 size: 615
-location: clients/tests/test-client.py:test_004()/298
+location: clients/tests/test-client.py:test_004()/308
 cmd: $NMCLI --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -19304,32 +20464,32 @@ stdout: 422 bytes
 
 
 <<<
-size: 309
-location: clients/tests/test-client.py:test_004()/299
+size: 341
+location: clients/tests/test-client.py:test_004()/309
 cmd: $NMCLI --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 123 bytes
+stdout: 155 bytes
 >>>
- :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
 
 
 
 <<<
-size: 328
-location: clients/tests/test-client.py:test_004()/300
+size: 360
+location: clients/tests/test-client.py:test_004()/310
 cmd: $NMCLI --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 132 bytes
+stdout: 164 bytes
 >>>
- :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
 
 
 
 <<<
 size: 706
-location: clients/tests/test-client.py:test_004()/301
+location: clients/tests/test-client.py:test_004()/311
 cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -19341,7 +20501,7 @@ stdout: 410 bytes
 
 <<<
 size: 728
-location: clients/tests/test-client.py:test_004()/302
+location: clients/tests/test-client.py:test_004()/312
 cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -19352,16 +20512,17 @@ stdout: 422 bytes
 
 
 <<<
-size: 2943
-location: clients/tests/test-client.py:test_004()/303
+size: 3227
+location: clients/tests/test-client.py:test_004()/313
 cmd: $NMCLI --terse --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2782 bytes
+stdout: 3066 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -19389,6 +20550,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -19399,7 +20563,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -19408,6 +20574,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
 AP[2].CHAN:1
@@ -19416,6 +20583,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
 AP[3].CHAN:1
@@ -19453,16 +20621,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2980
-location: clients/tests/test-client.py:test_004()/304
+size: 3264
+location: clients/tests/test-client.py:test_004()/314
 cmd: $NMCLI --terse --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2809 bytes
+stdout: 3093 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -19490,6 +20659,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -19500,7 +20672,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -19509,6 +20683,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
@@ -19517,6 +20692,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
@@ -19555,7 +20731,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 902
-location: clients/tests/test-client.py:test_004()/305
+location: clients/tests/test-client.py:test_004()/315
 cmd: $NMCLI --terse --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -19588,7 +20764,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 912
-location: clients/tests/test-client.py:test_004()/306
+location: clients/tests/test-client.py:test_004()/316
 cmd: $NMCLI --terse --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -19620,16 +20796,17 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 3081
-location: clients/tests/test-client.py:test_004()/307
+size: 3286
+location: clients/tests/test-client.py:test_004()/317
 cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 2782 bytes
+stdout: 2987 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -19667,7 +20844,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -19676,6 +20855,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
 AP[2].CHAN:1
@@ -19684,6 +20864,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
 AP[3].CHAN:1
@@ -19721,16 +20902,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 3118
-location: clients/tests/test-client.py:test_004()/308
+size: 3323
+location: clients/tests/test-client.py:test_004()/318
 cmd: $NMCLI --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2809 bytes
+stdout: 3014 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -19768,7 +20950,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -19777,6 +20961,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
@@ -19785,6 +20970,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
@@ -19823,7 +21009,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 1143
-location: clients/tests/test-client.py:test_004()/309
+location: clients/tests/test-client.py:test_004()/319
 cmd: $NMCLI --terse --color yes dev lldp list ifname eth0
 lang: C
 returncode: 0
@@ -19853,7 +21039,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:40 (wlan-access-point,telephone)
 
 <<<
 size: 1153
-location: clients/tests/test-client.py:test_004()/310
+location: clients/tests/test-client.py:test_004()/320
 cmd: $NMCLI --terse --color yes dev lldp list ifname eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -19882,21 +21068,69 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION:Test system #3
 NEIGHBOR[2].SYSTEM-CAPABILITIES:40 (wlan-access-point,telephone)
 
 <<<
-size: 3075
-location: clients/tests/test-client.py:test_004()/311
+size: 784
+location: clients/tests/test-client.py:test_004()/321
+cmd: $NMCLI --terse --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: C
+returncode: 0
+stdout: 406 bytes
+>>>
+connection.id:con-1
+connection.uuid:5fcfd6d7-1e63-3332-8826-a7eda103792d
+connection.type:802-3-ethernet
+connection.interface-name:
+
+connection.id:con-vpn-1
+connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
+connection.type:vpn
+connection.interface-name:
+vpn.user-name:
+
+connection.id:con-xx1
+connection.uuid:UUID-con-xx1-REPLACED-REPLACED-REPLA
+connection.type:802-11-wireless
+connection.interface-name:
+
+<<<
+size: 794
+location: clients/tests/test-client.py:test_004()/322
+cmd: $NMCLI --terse --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 406 bytes
+>>>
+connection.id:con-1
+connection.uuid:5fcfd6d7-1e63-3332-8826-a7eda103792d
+connection.type:802-3-ethernet
+connection.interface-name:
+
+connection.id:con-vpn-1
+connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
+connection.type:vpn
+connection.interface-name:
+vpn.user-name:
+
+connection.id:con-xx1
+connection.uuid:UUID-con-xx1-REPLACED-REPLACED-REPLA
+connection.type:802-11-wireless
+connection.interface-name:
+
+<<<
+size: 3223
+location: clients/tests/test-client.py:test_004()/323
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2928 bytes
+stdout: 3076 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              0 (default)   yes                 --             --         no             yes       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  no          0       
@@ -19904,28 +21138,28 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
 
-GROUP    NAME       UUID                                  DEVICES  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE          CFG                                     
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3098
-location: clients/tests/test-client.py:test_004()/312
+size: 3246
+location: clients/tests/test-client.py:test_004()/324
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2941 bytes
+stdout: 3089 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              0 (default)   tak                 --             --         nie            tak       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
@@ -19933,28 +21167,28 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
 
-GROUP    NAME       UUID                                  DEVICES  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3075
-location: clients/tests/test-client.py:test_004()/313
+size: 3223
+location: clients/tests/test-client.py:test_004()/325
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2928 bytes
+stdout: 3076 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              0 (default)   yes                 --             --         no             yes       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  no          0       
@@ -19962,28 +21196,28 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
 
-GROUP    NAME       UUID                                  DEVICES  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE          CFG                                     
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3098
-location: clients/tests/test-client.py:test_004()/314
+size: 3246
+location: clients/tests/test-client.py:test_004()/326
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2941 bytes
+stdout: 3089 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              0 (default)   tak                 --             --         nie            tak       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
@@ -19991,28 +21225,28 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
 
-GROUP    NAME       UUID                                  DEVICES  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 2343
-location: clients/tests/test-client.py:test_004()/315
+size: 2471
+location: clients/tests/test-client.py:test_004()/327
 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2189 bytes
+stdout: 2317 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              0 (default)   yes                 --             --         no             yes       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  no          0       
@@ -20022,21 +21256,21 @@ proxy  none    no            --       --
 
 
 <<<
-size: 2355
-location: clients/tests/test-client.py:test_004()/316
+size: 2483
+location: clients/tests/test-client.py:test_004()/328
 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2191 bytes
+stdout: 2319 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              0 (default)   tak                 --             --         nie            tak       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
@@ -20047,7 +21281,7 @@ proxy  none    nie           --       --
 
 <<<
 size: 407
-location: clients/tests/test-client.py:test_004()/317
+location: clients/tests/test-client.py:test_004()/329
 cmd: $NMCLI --mode tabular -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -20058,7 +21292,7 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 
 <<<
 size: 417
-location: clients/tests/test-client.py:test_004()/318
+location: clients/tests/test-client.py:test_004()/330
 cmd: $NMCLI --mode tabular -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20068,30 +21302,30 @@ name  service-type                            user-name  data
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
 
 <<<
-size: 639
-location: clients/tests/test-client.py:test_004()/319
+size: 659
+location: clients/tests/test-client.py:test_004()/331
 cmd: $NMCLI --mode tabular -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 482 bytes
+stdout: 502 bytes
 >>>
-GROUP    NAME       UUID                                  DEVICES  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 <<<
-size: 651
-location: clients/tests/test-client.py:test_004()/320
+size: 671
+location: clients/tests/test-client.py:test_004()/332
 cmd: $NMCLI --mode tabular -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 484 bytes
+stdout: 504 bytes
 >>>
-GROUP    NAME       UUID                                  DEVICES  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 <<<
 size: 394
-location: clients/tests/test-client.py:test_004()/321
+location: clients/tests/test-client.py:test_004()/333
 cmd: $NMCLI --mode tabular dev s
 lang: C
 returncode: 0
@@ -20106,7 +21340,7 @@ wlan1   wifi      unavailable  --
 
 <<<
 size: 409
-location: clients/tests/test-client.py:test_004()/322
+location: clients/tests/test-client.py:test_004()/334
 cmd: $NMCLI --mode tabular dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20121,7 +21355,7 @@ wlan1   wifi      niedostępne  --
 
 <<<
 size: 1421
-location: clients/tests/test-client.py:test_004()/323
+location: clients/tests/test-client.py:test_004()/335
 cmd: $NMCLI --mode tabular -f all dev status
 lang: C
 returncode: 0
@@ -20136,7 +21370,7 @@ wlan1   wifi      unavailable  unknown           unknown           /org/freedesk
 
 <<<
 size: 1436
-location: clients/tests/test-client.py:test_004()/324
+location: clients/tests/test-client.py:test_004()/336
 cmd: $NMCLI --mode tabular -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20151,7 +21385,7 @@ wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedes
 
 <<<
 size: 6356
-location: clients/tests/test-client.py:test_004()/325
+location: clients/tests/test-client.py:test_004()/337
 cmd: $NMCLI --mode tabular dev show
 lang: C
 returncode: 0
@@ -20300,7 +21534,7 @@ IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0
 
 <<<
 size: 6383
-location: clients/tests/test-client.py:test_004()/326
+location: clients/tests/test-client.py:test_004()/338
 cmd: $NMCLI --mode tabular dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20448,26 +21682,29 @@ GROUP  ADDRESS                        GATEWAY  ROUTE
 IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y 
 
 <<<
-size: 14892
-location: clients/tests/test-client.py:test_004()/327
+size: 15918
+location: clients/tests/test-client.py:test_004()/339
 cmd: $NMCLI --mode tabular -f all dev show
 lang: C
 returncode: 0
-stdout: 14744 bytes
+stdout: 15770 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  yes  yes       no      
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -20484,12 +21721,15 @@ DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              100 Mb/s  no           no    
 
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  yes  yes       no      
+
 NAME              CARRIER  S390-SUBCHANNELS 
 WIRED-PROPERTIES  off      --               
 
@@ -20508,12 +21748,15 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              100 Mb/s  no           no    
 
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  yes  yes       no      
+
 NAME              CARRIER  S390-SUBCHANNELS 
 WIRED-PROPERTIES  off      --               
 
@@ -20532,17 +21775,20 @@ DHCP6  dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  yes  yes       no      
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
 
 GROUP  ADDRESS  GATEWAY         ROUTE                                                                                                                                                  DNS            DOMAIN                                                                                             WINS 
 IP4    --       192.168.57.160  dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69  192.168.61.83  sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar  --   
@@ -20559,16 +21805,19 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  yes  yes       no      
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
-NAME  IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+NAME  IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 GROUP  ADDRESS                                GATEWAY  ROUTE                                                           DNS              DOMAIN                                                                            WINS                          
 IP4    192.168.97.124/29 | 192.168.76.154/18  --       dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551  192.168.107.109  sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar  192.168.60.60 | 192.168.63.92 
@@ -20586,26 +21835,29 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 15051
-location: clients/tests/test-client.py:test_004()/328
+size: 16077
+location: clients/tests/test-client.py:test_004()/340
 cmd: $NMCLI --mode tabular -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 14893 bytes
+stdout: 15919 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  tak  tak       nie     
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -20622,12 +21874,15 @@ DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             100 Mb/s  nie          nie   
 
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  tak  tak       nie     
+
 NAME              CARRIER    S390-SUBCHANNELS 
 WIRED-PROPERTIES  wyłączone  --               
 
@@ -20646,12 +21901,15 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             100 Mb/s  nie          nie   
 
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  tak  tak       nie     
+
 NAME              CARRIER    S390-SUBCHANNELS 
 WIRED-PROPERTIES  wyłączone  --               
 
@@ -20670,17 +21928,20 @@ DHCP6  dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  tak  tak       nie     
 
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
+
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
 
 GROUP  ADDRESS  GATEWAY         ROUTE                                                                                                                                                  DNS            DOMAIN                                                                                             WINS 
 IP4    --       192.168.57.160  dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69  192.168.61.83  sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar  --   
@@ -20697,16 +21958,19 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  tak  tak       nie     
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
-NAME  IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+NAME  IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 GROUP  ADDRESS                                GATEWAY  ROUTE                                                           DNS              DOMAIN                                                                            WINS                          
 IP4    192.168.97.124/29 | 192.168.76.154/18  --       dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551  192.168.107.109  sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar  192.168.60.60 | 192.168.63.92 
@@ -20725,7 +21989,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1125
-location: clients/tests/test-client.py:test_004()/329
+location: clients/tests/test-client.py:test_004()/341
 cmd: $NMCLI --mode tabular dev show wlan0
 lang: C
 returncode: 0
@@ -20760,7 +22024,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1136
-location: clients/tests/test-client.py:test_004()/330
+location: clients/tests/test-client.py:test_004()/342
 cmd: $NMCLI --mode tabular dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20794,26 +22058,29 @@ GROUP  ADDRESS  GATEWAY  ROUTE
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
 <<<
-size: 3019
-location: clients/tests/test-client.py:test_004()/331
+size: 3284
+location: clients/tests/test-client.py:test_004()/343
 cmd: $NMCLI --mode tabular -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2866 bytes
+stdout: 3131 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  yes  yes       no      
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -20831,26 +22098,29 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3082
-location: clients/tests/test-client.py:test_004()/332
+size: 3347
+location: clients/tests/test-client.py:test_004()/344
 cmd: $NMCLI --mode tabular -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2919 bytes
+stdout: 3184 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  tak  tak       nie     
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -20868,76 +22138,76 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 1258
-location: clients/tests/test-client.py:test_004()/333
+size: 1364
+location: clients/tests/test-client.py:test_004()/345
 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1070 bytes
+stdout: 1176 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 HWADDR            
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
 <<<
-size: 1285
-location: clients/tests/test-client.py:test_004()/334
+size: 1391
+location: clients/tests/test-client.py:test_004()/346
 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1087 bytes
+stdout: 1193 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 HWADDR            
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
 <<<
-size: 1258
-location: clients/tests/test-client.py:test_004()/335
+size: 1364
+location: clients/tests/test-client.py:test_004()/347
 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1070 bytes
+stdout: 1176 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 HWADDR            
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
 <<<
-size: 1285
-location: clients/tests/test-client.py:test_004()/336
+size: 1391
+location: clients/tests/test-client.py:test_004()/348
 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1087 bytes
+stdout: 1193 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 HWADDR            
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
 <<<
 size: 525
-location: clients/tests/test-client.py:test_004()/337
+location: clients/tests/test-client.py:test_004()/349
 cmd: $NMCLI --mode tabular -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -20952,7 +22222,7 @@ wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 535
-location: clients/tests/test-client.py:test_004()/338
+location: clients/tests/test-client.py:test_004()/350
 cmd: $NMCLI --mode tabular -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -20967,7 +22237,7 @@ wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 1995
-location: clients/tests/test-client.py:test_004()/339
+location: clients/tests/test-client.py:test_004()/351
 cmd: $NMCLI --mode tabular -f ALL device wifi list
 lang: C
 returncode: 0
@@ -20985,7 +22255,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 2063
-location: clients/tests/test-client.py:test_004()/340
+location: clients/tests/test-client.py:test_004()/352
 cmd: $NMCLI --mode tabular -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21002,44 +22272,44 @@ AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
 <<<
-size: 629
-location: clients/tests/test-client.py:test_004()/341
+size: 750
+location: clients/tests/test-client.py:test_004()/353
 cmd: $NMCLI --mode tabular -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 472 bytes
+stdout: 593 bytes
 >>>
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
 
-IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 <<<
-size: 689
-location: clients/tests/test-client.py:test_004()/342
+size: 810
+location: clients/tests/test-client.py:test_004()/354
 cmd: $NMCLI --mode tabular -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 522 bytes
+stdout: 643 bytes
 >>>
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
 
-IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 <<<
 size: 2108
-location: clients/tests/test-client.py:test_004()/343
+location: clients/tests/test-client.py:test_004()/355
 cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -21057,7 +22327,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 2176
-location: clients/tests/test-client.py:test_004()/344
+location: clients/tests/test-client.py:test_004()/356
 cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21075,7 +22345,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 748
-location: clients/tests/test-client.py:test_004()/345
+location: clients/tests/test-client.py:test_004()/357
 cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -21088,7 +22358,7 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MH
 
 <<<
 size: 776
-location: clients/tests/test-client.py:test_004()/346
+location: clients/tests/test-client.py:test_004()/358
 cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21100,34 +22370,34 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1
 
 
 <<<
-size: 321
-location: clients/tests/test-client.py:test_004()/347
+size: 359
+location: clients/tests/test-client.py:test_004()/359
 cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 140 bytes
+stdout: 178 bytes
 >>>
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
-size: 347
-location: clients/tests/test-client.py:test_004()/348
+size: 385
+location: clients/tests/test-client.py:test_004()/360
 cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 156 bytes
+stdout: 194 bytes
 >>>
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
 size: 861
-location: clients/tests/test-client.py:test_004()/349
+location: clients/tests/test-client.py:test_004()/361
 cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -21140,7 +22410,7 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MH
 
 <<<
 size: 889
-location: clients/tests/test-client.py:test_004()/350
+location: clients/tests/test-client.py:test_004()/362
 cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21152,26 +22422,29 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1
 
 
 <<<
-size: 3022
-location: clients/tests/test-client.py:test_004()/351
+size: 3287
+location: clients/tests/test-client.py:test_004()/363
 cmd: $NMCLI --mode tabular -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2866 bytes
+stdout: 3131 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  yes  yes       no      
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
+
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -21189,26 +22462,29 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3085
-location: clients/tests/test-client.py:test_004()/352
+size: 3350
+location: clients/tests/test-client.py:test_004()/364
 cmd: $NMCLI --mode tabular -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2919 bytes
+stdout: 3184 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  tak  tak       nie     
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -21227,7 +22503,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1138
-location: clients/tests/test-client.py:test_004()/353
+location: clients/tests/test-client.py:test_004()/365
 cmd: $NMCLI --mode tabular -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -21262,7 +22538,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1149
-location: clients/tests/test-client.py:test_004()/354
+location: clients/tests/test-client.py:test_004()/366
 cmd: $NMCLI --mode tabular -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21296,26 +22572,26 @@ GROUP  ADDRESS  GATEWAY  ROUTE
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
 <<<
-size: 3160
-location: clients/tests/test-client.py:test_004()/355
+size: 3342
+location: clients/tests/test-client.py:test_004()/367
 cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 2866 bytes
+stdout: 3048 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -21333,26 +22609,26 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3223
-location: clients/tests/test-client.py:test_004()/356
+size: 3405
+location: clients/tests/test-client.py:test_004()/368
 cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2919 bytes
+stdout: 3101 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -21371,7 +22647,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1140
-location: clients/tests/test-client.py:test_004()/357
+location: clients/tests/test-client.py:test_004()/369
 cmd: $NMCLI --mode tabular dev lldp list ifname eth0
 lang: C
 returncode: 0
@@ -21384,7 +22660,7 @@ eth0    00:11:22:33:44:22  port1              GigabitEthernet #3  test3.example.
 
 <<<
 size: 1150
-location: clients/tests/test-client.py:test_004()/358
+location: clients/tests/test-client.py:test_004()/370
 cmd: $NMCLI --mode tabular dev lldp list ifname eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21396,21 +22672,119 @@ eth0    chassis1           44:44:44:44:44:44  GigabitEthernet #2  test2.example.
 eth0    00:11:22:33:44:22  port1              GigabitEthernet #3  test3.example.com  Test system #3      40 (wlan-access-point,telephone)                                                                                                            
 
 <<<
-size: 3087
-location: clients/tests/test-client.py:test_004()/359
+size: 865
+location: clients/tests/test-client.py:test_004()/371
+cmd: $NMCLI --mode tabular -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: C
+returncode: 0
+stdout: 492 bytes
+>>>
+id    
+con-1 
+
+uuid                                 
+5fcfd6d7-1e63-3332-8826-a7eda103792d 
+
+type           
+802-3-ethernet 
+
+interface-name 
+--             
+
+
+id        
+con-vpn-1 
+
+uuid                                 
+UUID-con-vpn-1-REPLACED-REPLACED-REP 
+
+type 
+vpn  
+
+interface-name 
+--             
+
+user-name 
+--        
+
+id      
+con-xx1 
+
+uuid                                 
+UUID-con-xx1-REPLACED-REPLACED-REPLA 
+
+type            
+802-11-wireless 
+
+interface-name 
+--             
+
+
+<<<
+size: 875
+location: clients/tests/test-client.py:test_004()/372
+cmd: $NMCLI --mode tabular -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 492 bytes
+>>>
+id    
+con-1 
+
+uuid                                 
+5fcfd6d7-1e63-3332-8826-a7eda103792d 
+
+type           
+802-3-ethernet 
+
+interface-name 
+--             
+
+
+id        
+con-vpn-1 
+
+uuid                                 
+UUID-con-vpn-1-REPLACED-REPLACED-REP 
+
+type 
+vpn  
+
+interface-name 
+--             
+
+user-name 
+--        
+
+id      
+con-xx1 
+
+uuid                                 
+UUID-con-xx1-REPLACED-REPLACED-REPLA 
+
+type            
+802-11-wireless 
+
+interface-name 
+--             
+
+
+<<<
+size: 3235
+location: clients/tests/test-client.py:test_004()/373
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2928 bytes
+stdout: 3076 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              0 (default)   yes                 --             --         no             yes       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  no          0       
@@ -21418,28 +22792,28 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
 
-GROUP    NAME       UUID                                  DEVICES  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE          CFG                                     
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3110
-location: clients/tests/test-client.py:test_004()/360
+size: 3258
+location: clients/tests/test-client.py:test_004()/374
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2941 bytes
+stdout: 3089 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              0 (default)   tak                 --             --         nie            tak       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
@@ -21447,28 +22821,28 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
 
-GROUP    NAME       UUID                                  DEVICES  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3087
-location: clients/tests/test-client.py:test_004()/361
+size: 3235
+location: clients/tests/test-client.py:test_004()/375
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2928 bytes
+stdout: 3076 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              0 (default)   yes                 --             --         no             yes       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  no          0       
@@ -21476,28 +22850,28 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
 
-GROUP    NAME       UUID                                  DEVICES  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE          CFG                                     
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3110
-location: clients/tests/test-client.py:test_004()/362
+size: 3258
+location: clients/tests/test-client.py:test_004()/376
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2941 bytes
+stdout: 3089 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              0 (default)   tak                 --             --         nie            tak       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
@@ -21505,28 +22879,28 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
 
-GROUP    NAME       UUID                                  DEVICES  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 2355
-location: clients/tests/test-client.py:test_004()/363
+size: 2483
+location: clients/tests/test-client.py:test_004()/377
 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2189 bytes
+stdout: 2317 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered  lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              0 (default)   yes                 --             --         no             yes       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  no          0       
@@ -21536,21 +22910,21 @@ proxy  none    no            --       --
 
 
 <<<
-size: 2367
-location: clients/tests/test-client.py:test_004()/364
+size: 2495
+location: clients/tests/test-client.py:test_004()/378
 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2191 bytes
+stdout: 2319 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  read-only  permissions  zone  master  slave-type  autoconnect-slaves  secondaries  gateway-ping-timeout  metered   lldp     mdns          llmnr         wait-device-timeout 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              0 (default)   tak                 --             --         nie            tak       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
@@ -21561,7 +22935,7 @@ proxy  none    nie           --       --
 
 <<<
 size: 419
-location: clients/tests/test-client.py:test_004()/365
+location: clients/tests/test-client.py:test_004()/379
 cmd: $NMCLI --mode tabular --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -21572,7 +22946,7 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 
 <<<
 size: 429
-location: clients/tests/test-client.py:test_004()/366
+location: clients/tests/test-client.py:test_004()/380
 cmd: $NMCLI --mode tabular --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21582,30 +22956,30 @@ name  service-type                            user-name  data
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
 
 <<<
-size: 651
-location: clients/tests/test-client.py:test_004()/367
+size: 671
+location: clients/tests/test-client.py:test_004()/381
 cmd: $NMCLI --mode tabular --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 482 bytes
+stdout: 502 bytes
 >>>
-GROUP    NAME       UUID                                  DEVICES  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 <<<
-size: 663
-location: clients/tests/test-client.py:test_004()/368
+size: 683
+location: clients/tests/test-client.py:test_004()/382
 cmd: $NMCLI --mode tabular --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 484 bytes
+stdout: 504 bytes
 >>>
-GROUP    NAME       UUID                                  DEVICES  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 <<<
 size: 566
-location: clients/tests/test-client.py:test_004()/369
+location: clients/tests/test-client.py:test_004()/383
 cmd: $NMCLI --mode tabular --color yes dev s
 lang: C
 returncode: 0
@@ -21620,7 +22994,7 @@ DEVICE  TYPE      STATE        CONNECTION
 
 <<<
 size: 581
-location: clients/tests/test-client.py:test_004()/370
+location: clients/tests/test-client.py:test_004()/384
 cmd: $NMCLI --mode tabular --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21635,7 +23009,7 @@ DEVICE  TYPE      STATE        CONNECTION
 
 <<<
 size: 1793
-location: clients/tests/test-client.py:test_004()/371
+location: clients/tests/test-client.py:test_004()/385
 cmd: $NMCLI --mode tabular --color yes -f all dev status
 lang: C
 returncode: 0
@@ -21650,7 +23024,7 @@ DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH
 
 <<<
 size: 1808
-location: clients/tests/test-client.py:test_004()/372
+location: clients/tests/test-client.py:test_004()/386
 cmd: $NMCLI --mode tabular --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21665,7 +23039,7 @@ DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH
 
 <<<
 size: 6368
-location: clients/tests/test-client.py:test_004()/373
+location: clients/tests/test-client.py:test_004()/387
 cmd: $NMCLI --mode tabular --color yes dev show
 lang: C
 returncode: 0
@@ -21814,7 +23188,7 @@ IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0
 
 <<<
 size: 6395
-location: clients/tests/test-client.py:test_004()/374
+location: clients/tests/test-client.py:test_004()/388
 cmd: $NMCLI --mode tabular --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -21962,26 +23336,29 @@ GROUP  ADDRESS                        GATEWAY  ROUTE
 IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y 
 
 <<<
-size: 15228
-location: clients/tests/test-client.py:test_004()/375
+size: 16290
+location: clients/tests/test-client.py:test_004()/389
 cmd: $NMCLI --mode tabular --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 15068 bytes
+stdout: 16130 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  yes  yes       no      
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -21998,12 +23375,15 @@ DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              100 Mb/s  no           no    
 
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  yes  yes       no      
+
 NAME              CARRIER  S390-SUBCHANNELS 
 WIRED-PROPERTIES  off      --               
 
@@ -22022,12 +23402,15 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              100 Mb/s  no           no    
 
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  yes  yes       no      
+
 NAME              CARRIER  S390-SUBCHANNELS 
 WIRED-PROPERTIES  off      --               
 
@@ -22046,17 +23429,20 @@ DHCP6  dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  yes  yes       no      
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
 
 GROUP  ADDRESS  GATEWAY         ROUTE                                                                                                                                                  DNS            DOMAIN                                                                                             WINS 
 IP4    --       192.168.57.160  dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69  192.168.61.83  sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar  --   
@@ -22073,16 +23459,19 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  yes  yes       no      
 
-NAME  IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
+
+NAME  IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 GROUP  ADDRESS                                GATEWAY  ROUTE                                                           DNS              DOMAIN                                                                            WINS                          
 IP4    192.168.97.124/29 | 192.168.76.154/18  --       dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551  192.168.107.109  sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar  192.168.60.60 | 192.168.63.92 
@@ -22100,26 +23489,29 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 15387
-location: clients/tests/test-client.py:test_004()/376
+size: 16449
+location: clients/tests/test-client.py:test_004()/390
 cmd: $NMCLI --mode tabular --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 15217 bytes
+stdout: 16279 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  tak  tak       nie     
 
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
+
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -22136,12 +23528,15 @@ DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             100 Mb/s  nie          nie   
 
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  tak  tak       nie     
+
 NAME              CARRIER    S390-SUBCHANNELS 
 WIRED-PROPERTIES  wyłączone  --               
 
@@ -22160,12 +23555,15 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             100 Mb/s  nie          nie   
 
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  tak  tak       nie     
+
 NAME              CARRIER    S390-SUBCHANNELS 
 WIRED-PROPERTIES  wyłączone  --               
 
@@ -22184,17 +23582,20 @@ DHCP6  dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                        
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 
 
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  tak  tak       nie     
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
 
 GROUP  ADDRESS  GATEWAY         ROUTE                                                                                                                                                  DNS            DOMAIN                                                                                             WINS 
 IP4    --       192.168.57.160  dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69  192.168.61.83  sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar  --   
@@ -22211,16 +23612,19 @@ DHCP6  dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp
 NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-CONNECTIONS                          
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  tak  tak       nie     
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
-NAME  IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+NAME  IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 GROUP  ADDRESS                                GATEWAY  ROUTE                                                           DNS              DOMAIN                                                                            WINS                          
 IP4    192.168.97.124/29 | 192.168.76.154/18  --       dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551  192.168.107.109  sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar  192.168.60.60 | 192.168.63.92 
@@ -22239,7 +23643,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1137
-location: clients/tests/test-client.py:test_004()/377
+location: clients/tests/test-client.py:test_004()/391
 cmd: $NMCLI --mode tabular --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -22274,7 +23678,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1148
-location: clients/tests/test-client.py:test_004()/378
+location: clients/tests/test-client.py:test_004()/392
 cmd: $NMCLI --mode tabular --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22308,26 +23712,29 @@ GROUP  ADDRESS  GATEWAY  ROUTE
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
 <<<
-size: 3274
-location: clients/tests/test-client.py:test_004()/379
+size: 3566
+location: clients/tests/test-client.py:test_004()/393
 cmd: $NMCLI --mode tabular --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 3109 bytes
+stdout: 3401 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  yes  yes       no      
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -22345,26 +23752,29 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3337
-location: clients/tests/test-client.py:test_004()/380
+size: 3629
+location: clients/tests/test-client.py:test_004()/394
 cmd: $NMCLI --mode tabular --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3162 bytes
+stdout: 3454 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  tak  tak       nie     
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -22382,76 +23792,76 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 1270
-location: clients/tests/test-client.py:test_004()/381
+size: 1376
+location: clients/tests/test-client.py:test_004()/395
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1070 bytes
+stdout: 1176 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 HWADDR            
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
 <<<
-size: 1297
-location: clients/tests/test-client.py:test_004()/382
+size: 1403
+location: clients/tests/test-client.py:test_004()/396
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1087 bytes
+stdout: 1193 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 HWADDR            
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
 <<<
-size: 1270
-location: clients/tests/test-client.py:test_004()/383
+size: 1376
+location: clients/tests/test-client.py:test_004()/397
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1070 bytes
+stdout: 1176 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 HWADDR            
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
 <<<
-size: 1297
-location: clients/tests/test-client.py:test_004()/384
+size: 1403
+location: clients/tests/test-client.py:test_004()/398
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1087 bytes
+stdout: 1193 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 HWADDR            
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
 <<<
 size: 657
-location: clients/tests/test-client.py:test_004()/385
+location: clients/tests/test-client.py:test_004()/399
 cmd: $NMCLI --mode tabular --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -22466,7 +23876,7 @@ DEVICE  TYPE      DBUS-PATH
 
 <<<
 size: 667
-location: clients/tests/test-client.py:test_004()/386
+location: clients/tests/test-client.py:test_004()/400
 cmd: $NMCLI --mode tabular --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22481,7 +23891,7 @@ DEVICE  TYPE      DBUS-PATH
 
 <<<
 size: 2619
-location: clients/tests/test-client.py:test_004()/387
+location: clients/tests/test-client.py:test_004()/401
 cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list
 lang: C
 returncode: 0
@@ -22499,7 +23909,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 2687
-location: clients/tests/test-client.py:test_004()/388
+location: clients/tests/test-client.py:test_004()/402
 cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22516,44 +23926,44 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
 <<<
-size: 929
-location: clients/tests/test-client.py:test_004()/389
+size: 1086
+location: clients/tests/test-client.py:test_004()/403
 cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 760 bytes
+stdout: 917 bytes
 >>>
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
 
-IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 <<<
-size: 989
-location: clients/tests/test-client.py:test_004()/390
+size: 1146
+location: clients/tests/test-client.py:test_004()/404
 cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 810 bytes
+stdout: 967 bytes
 >>>
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
 
-IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 <<<
 size: 2732
-location: clients/tests/test-client.py:test_004()/391
+location: clients/tests/test-client.py:test_004()/405
 cmd: $NMCLI --mode tabular --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -22571,7 +23981,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 2800
-location: clients/tests/test-client.py:test_004()/392
+location: clients/tests/test-client.py:test_004()/406
 cmd: $NMCLI --mode tabular --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22589,7 +23999,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 913
-location: clients/tests/test-client.py:test_004()/393
+location: clients/tests/test-client.py:test_004()/407
 cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -22602,7 +24012,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 
 <<<
 size: 941
-location: clients/tests/test-client.py:test_004()/394
+location: clients/tests/test-client.py:test_004()/408
 cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22614,34 +24024,34 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 
 
 <<<
-size: 405
-location: clients/tests/test-client.py:test_004()/395
+size: 452
+location: clients/tests/test-client.py:test_004()/409
 cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 212 bytes
+stdout: 259 bytes
 >>>
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
-size: 431
-location: clients/tests/test-client.py:test_004()/396
+size: 478
+location: clients/tests/test-client.py:test_004()/410
 cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 228 bytes
+stdout: 275 bytes
 >>>
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
 size: 1026
-location: clients/tests/test-client.py:test_004()/397
+location: clients/tests/test-client.py:test_004()/411
 cmd: $NMCLI --mode tabular --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -22654,7 +24064,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 
 <<<
 size: 1054
-location: clients/tests/test-client.py:test_004()/398
+location: clients/tests/test-client.py:test_004()/412
 cmd: $NMCLI --mode tabular --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22666,26 +24076,29 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 
 
 <<<
-size: 3277
-location: clients/tests/test-client.py:test_004()/399
+size: 3569
+location: clients/tests/test-client.py:test_004()/413
 cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 3109 bytes
+stdout: 3401 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  yes  yes       no      
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -22703,26 +24116,29 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3340
-location: clients/tests/test-client.py:test_004()/400
+size: 3632
+location: clients/tests/test-client.py:test_004()/414
 cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3162 bytes
+stdout: 3454 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             UP   LOWER-UP  CARRIER 
+INTERFACE-FLAGS  tak  tak       nie     
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -22741,7 +24157,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1150
-location: clients/tests/test-client.py:test_004()/401
+location: clients/tests/test-client.py:test_004()/415
 cmd: $NMCLI --mode tabular --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -22776,7 +24192,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1161
-location: clients/tests/test-client.py:test_004()/402
+location: clients/tests/test-client.py:test_004()/416
 cmd: $NMCLI --mode tabular --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22810,26 +24226,26 @@ GROUP  ADDRESS  GATEWAY  ROUTE
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
 <<<
-size: 3415
-location: clients/tests/test-client.py:test_004()/403
+size: 3624
+location: clients/tests/test-client.py:test_004()/417
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 3109 bytes
+stdout: 3318 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -22847,26 +24263,26 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3478
-location: clients/tests/test-client.py:test_004()/404
+size: 3687
+location: clients/tests/test-client.py:test_004()/418
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3162 bytes
+stdout: 3371 bytes
 >>>
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  192.168.120.79 
@@ -22885,7 +24301,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1152
-location: clients/tests/test-client.py:test_004()/405
+location: clients/tests/test-client.py:test_004()/419
 cmd: $NMCLI --mode tabular --color yes dev lldp list ifname eth0
 lang: C
 returncode: 0
@@ -22898,7 +24314,7 @@ eth0    00:11:22:33:44:22  port1              GigabitEthernet #3  test3.example.
 
 <<<
 size: 1162
-location: clients/tests/test-client.py:test_004()/406
+location: clients/tests/test-client.py:test_004()/420
 cmd: $NMCLI --mode tabular --color yes dev lldp list ifname eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -22910,12 +24326,110 @@ eth0    chassis1           44:44:44:44:44:44  GigabitEthernet #2  test2.example.
 eth0    00:11:22:33:44:22  port1              GigabitEthernet #3  test3.example.com  Test system #3      40 (wlan-access-point,telephone)                                                                                                            
 
 <<<
-size: 4890
-location: clients/tests/test-client.py:test_004()/407
+size: 877
+location: clients/tests/test-client.py:test_004()/421
+cmd: $NMCLI --mode tabular --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: C
+returncode: 0
+stdout: 492 bytes
+>>>
+id    
+con-1 
+
+uuid                                 
+5fcfd6d7-1e63-3332-8826-a7eda103792d 
+
+type           
+802-3-ethernet 
+
+interface-name 
+--             
+
+
+id        
+con-vpn-1 
+
+uuid                                 
+UUID-con-vpn-1-REPLACED-REPLACED-REP 
+
+type 
+vpn  
+
+interface-name 
+--             
+
+user-name 
+--        
+
+id      
+con-xx1 
+
+uuid                                 
+UUID-con-xx1-REPLACED-REPLACED-REPLA 
+
+type            
+802-11-wireless 
+
+interface-name 
+--             
+
+
+<<<
+size: 887
+location: clients/tests/test-client.py:test_004()/422
+cmd: $NMCLI --mode tabular --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 492 bytes
+>>>
+id    
+con-1 
+
+uuid                                 
+5fcfd6d7-1e63-3332-8826-a7eda103792d 
+
+type           
+802-3-ethernet 
+
+interface-name 
+--             
+
+
+id        
+con-vpn-1 
+
+uuid                                 
+UUID-con-vpn-1-REPLACED-REPLACED-REP 
+
+type 
+vpn  
+
+interface-name 
+--             
+
+user-name 
+--        
+
+id      
+con-xx1 
+
+uuid                                 
+UUID-con-xx1-REPLACED-REPLACED-REPLA 
+
+type            
+802-11-wireless 
+
+interface-name 
+--             
+
+
+<<<
+size: 5112
+location: clients/tests/test-client.py:test_004()/423
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4734 bytes
+stdout: 4956 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
@@ -22924,13 +24438,13 @@ name        id         uuid                                  stable-id  type  in
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              0 (default)   yes                 --             --         no             yes       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -22943,21 +24457,21 @@ proxy  none    no            --       --
 ======================================================================
   Activate connection details (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ======================================================================
-GROUP    NAME       UUID                                  DEVICES  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE          CFG                                     
 --------------------------------------------------------------------------------------------------------------------------------
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4946
-location: clients/tests/test-client.py:test_004()/408
+size: 5168
+location: clients/tests/test-client.py:test_004()/424
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4780 bytes
+stdout: 5002 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -22966,13 +24480,13 @@ name        id         uuid                                  stable-id  type  in
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              0 (default)   tak                 --             --         nie            tak       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -22985,21 +24499,21 @@ proxy  none    nie           --       --
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ===========================================================================
-GROUP    NAME       UUID                                  DEVICES  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 ----------------------------------------------------------------------------------------------------------------------------------
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4890
-location: clients/tests/test-client.py:test_004()/409
+size: 5112
+location: clients/tests/test-client.py:test_004()/425
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4734 bytes
+stdout: 4956 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
@@ -23008,13 +24522,13 @@ name        id         uuid                                  stable-id  type  in
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              0 (default)   yes                 --             --         no             yes       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -23027,21 +24541,21 @@ proxy  none    no            --       --
 ======================================================================
   Activate connection details (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ======================================================================
-GROUP    NAME       UUID                                  DEVICES  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE          CFG                                     
 --------------------------------------------------------------------------------------------------------------------------------
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4946
-location: clients/tests/test-client.py:test_004()/410
+size: 5168
+location: clients/tests/test-client.py:test_004()/426
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4780 bytes
+stdout: 5002 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -23050,13 +24564,13 @@ name        id         uuid                                  stable-id  type  in
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              0 (default)   tak                 --             --         nie            tak       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -23069,21 +24583,21 @@ proxy  none    nie           --       --
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ===========================================================================
-GROUP    NAME       UUID                                  DEVICES  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 ----------------------------------------------------------------------------------------------------------------------------------
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3576
-location: clients/tests/test-client.py:test_004()/411
+size: 3768
+location: clients/tests/test-client.py:test_004()/427
 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3413 bytes
+stdout: 3605 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
@@ -23092,13 +24606,13 @@ name        id         uuid                                  stable-id  type  in
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              0 (default)   yes                 --             --         no             yes       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -23110,12 +24624,12 @@ proxy  none    no            --       --
 
 
 <<<
-size: 3599
-location: clients/tests/test-client.py:test_004()/412
+size: 3791
+location: clients/tests/test-client.py:test_004()/428
 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3426 bytes
+stdout: 3618 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -23124,13 +24638,13 @@ name        id         uuid                                  stable-id  type  in
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              0 (default)   tak                 --             --         nie            tak       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -23143,7 +24657,7 @@ proxy  none    nie           --       --
 
 <<<
 size: 671
-location: clients/tests/test-client.py:test_004()/413
+location: clients/tests/test-client.py:test_004()/429
 cmd: $NMCLI --mode tabular --pretty -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -23158,7 +24672,7 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 
 <<<
 size: 691
-location: clients/tests/test-client.py:test_004()/414
+location: clients/tests/test-client.py:test_004()/430
 cmd: $NMCLI --mode tabular --pretty -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -23172,38 +24686,38 @@ name  service-type                            user-name  data
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
 
 <<<
-size: 1101
-location: clients/tests/test-client.py:test_004()/415
+size: 1131
+location: clients/tests/test-client.py:test_004()/431
 cmd: $NMCLI --mode tabular --pretty -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 935 bytes
+stdout: 965 bytes
 >>>
 ======================================================================
   Activate connection details (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ======================================================================
-GROUP    NAME       UUID                                  DEVICES  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 <<<
-size: 1133
-location: clients/tests/test-client.py:test_004()/416
+size: 1163
+location: clients/tests/test-client.py:test_004()/432
 cmd: $NMCLI --mode tabular --pretty -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 957 bytes
+stdout: 987 bytes
 >>>
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ===========================================================================
-GROUP    NAME       UUID                                  DEVICES  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 <<<
 size: 532
-location: clients/tests/test-client.py:test_004()/417
+location: clients/tests/test-client.py:test_004()/433
 cmd: $NMCLI --mode tabular --pretty dev s
 lang: C
 returncode: 0
@@ -23222,7 +24736,7 @@ wlan1   wifi      unavailable  --
 
 <<<
 size: 540
-location: clients/tests/test-client.py:test_004()/418
+location: clients/tests/test-client.py:test_004()/434
 cmd: $NMCLI --mode tabular --pretty dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -23241,7 +24755,7 @@ wlan1   wifi      niedostępne  --
 
 <<<
 size: 1728
-location: clients/tests/test-client.py:test_004()/419
+location: clients/tests/test-client.py:test_004()/435
 cmd: $NMCLI --mode tabular --pretty -f all dev status
 lang: C
 returncode: 0
@@ -23260,7 +24774,7 @@ wlan1   wifi      unavailable  unknown           unknown           /org/freedesk
 
 <<<
 size: 1736
-location: clients/tests/test-client.py:test_004()/420
+location: clients/tests/test-client.py:test_004()/436
 cmd: $NMCLI --mode tabular --pretty -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -23279,7 +24793,7 @@ wlan1   wifi      niedostępne  nieznane          nieznane          /org/freedes
 
 <<<
 size: 9886
-location: clients/tests/test-client.py:test_004()/421
+location: clients/tests/test-client.py:test_004()/437
 cmd: $NMCLI --mode tabular --pretty dev show
 lang: C
 returncode: 0
@@ -23490,7 +25004,7 @@ IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0
 
 <<<
 size: 10062
-location: clients/tests/test-client.py:test_004()/422
+location: clients/tests/test-client.py:test_004()/438
 cmd: $NMCLI --mode tabular --pretty dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -23700,33 +25214,37 @@ GROUP  ADDRESS                        GATEWAY  ROUTE
 IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y 
 
 <<<
-size: 22639
-location: clients/tests/test-client.py:test_004()/423
+size: 24165
+location: clients/tests/test-client.py:test_004()/439
 cmd: $NMCLI --mode tabular --pretty -f all dev show
 lang: C
 returncode: 0
-stdout: 22482 bytes
+stdout: 24008 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
----------------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  yes  yes       no      
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+-------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-----------------------------------------------------------------------------
-AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-----------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -23751,14 +25269,18 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 =========================
   Device details (eth0)
 =========================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  no              100 Mb/s  no           no    
 
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  yes  yes       no      
+
 NAME              CARRIER  S390-SUBCHANNELS 
 ---------------------------------------------
 WIRED-PROPERTIES  off      --               
@@ -23786,14 +25308,18 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 =========================
   Device details (eth1)
 =========================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  no              100 Mb/s  no           no    
 
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  yes  yes       no      
+
 NAME              CARRIER  S390-SUBCHANNELS 
 ---------------------------------------------
 WIRED-PROPERTIES  off      --               
@@ -23821,21 +25347,25 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 ==========================
   Device details (wlan1)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
----------------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  yes  yes       no      
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+-------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-----------------------------------------------------------------------------
-AP[1]          wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-----------------------------------------------------------------------------------------------
+AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
 
 GROUP  ADDRESS  GATEWAY         ROUTE                                                                                                                                                  DNS            DOMAIN                                                                                             WINS 
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -23860,20 +25390,24 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 ==========================
   Device details (wlan1)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
----------------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  yes  yes       no      
 
-NAME  IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
---------------------------------------------------------------
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+-------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
+
+NAME  IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+---------------------------------------------------------------------
 
 GROUP  ADDRESS                                GATEWAY  ROUTE                                                           DNS              DOMAIN                                                                            WINS                          
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -23896,33 +25430,37 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 23000
-location: clients/tests/test-client.py:test_004()/424
+size: 24526
+location: clients/tests/test-client.py:test_004()/440
 cmd: $NMCLI --mode tabular --pretty -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 22833 bytes
+stdout: 24359 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
------------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  tak  tak       nie     
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+---------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------
-AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -23947,14 +25485,18 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 ==================================
   Informacje o urządzeniu (eth0)
 ==================================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  nie             100 Mb/s  nie          nie   
 
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  tak  tak       nie     
+
 NAME              CARRIER    S390-SUBCHANNELS 
 -----------------------------------------------
 WIRED-PROPERTIES  wyłączone  --               
@@ -23982,14 +25524,18 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 ==================================
   Informacje o urządzeniu (eth1)
 ==================================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  nie             100 Mb/s  nie          nie   
 
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  tak  tak       nie     
+
 NAME              CARRIER    S390-SUBCHANNELS 
 -----------------------------------------------
 WIRED-PROPERTIES  wyłączone  --               
@@ -24017,21 +25563,25 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 ===================================
   Informacje o urządzeniu (wlan1)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
------------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  tak  tak       nie     
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+---------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------
-AP[1]          wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------------
+AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
 
 GROUP  ADDRESS  GATEWAY         ROUTE                                                                                                                                                  DNS            DOMAIN                                                                                             WINS 
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24056,20 +25606,24 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 ===================================
   Informacje o urządzeniu (wlan1)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
------------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  tak  tak       nie     
 
-NAME  IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
---------------------------------------------------------------
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+---------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
+
+NAME  IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+---------------------------------------------------------------------
 
 GROUP  ADDRESS                                GATEWAY  ROUTE                                                           DNS              DOMAIN                                                                            WINS                          
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24093,7 +25647,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1709
-location: clients/tests/test-client.py:test_004()/425
+location: clients/tests/test-client.py:test_004()/441
 cmd: $NMCLI --mode tabular --pretty dev show wlan0
 lang: C
 returncode: 0
@@ -24140,7 +25694,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1749
-location: clients/tests/test-client.py:test_004()/426
+location: clients/tests/test-client.py:test_004()/442
 cmd: $NMCLI --mode tabular --pretty dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24186,33 +25740,37 @@ GROUP  ADDRESS  GATEWAY  ROUTE
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
 <<<
-size: 4469
-location: clients/tests/test-client.py:test_004()/427
+size: 4848
+location: clients/tests/test-client.py:test_004()/443
 cmd: $NMCLI --mode tabular --pretty -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4307 bytes
+stdout: 4686 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
----------------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  yes  yes       no      
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+-------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-----------------------------------------------------------------------------
-AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-----------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24235,33 +25793,37 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 4577
-location: clients/tests/test-client.py:test_004()/428
+size: 4956
+location: clients/tests/test-client.py:test_004()/444
 cmd: $NMCLI --mode tabular --pretty -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4405 bytes
+stdout: 4784 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
------------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  tak  tak       nie     
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+---------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------
-AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24284,100 +25846,100 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 1883
-location: clients/tests/test-client.py:test_004()/429
+size: 2042
+location: clients/tests/test-client.py:test_004()/445
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1686 bytes
+stdout: 1845 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 HWADDR            
 -------------------
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
----------------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+-------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
 <<<
-size: 1947
-location: clients/tests/test-client.py:test_004()/430
+size: 2106
+location: clients/tests/test-client.py:test_004()/446
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1740 bytes
+stdout: 1899 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 HWADDR            
 -------------------
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
------------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+---------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
 <<<
-size: 1883
-location: clients/tests/test-client.py:test_004()/431
+size: 2042
+location: clients/tests/test-client.py:test_004()/447
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1686 bytes
+stdout: 1845 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 HWADDR            
 -------------------
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
----------------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+-------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
 <<<
-size: 1947
-location: clients/tests/test-client.py:test_004()/432
+size: 2106
+location: clients/tests/test-client.py:test_004()/448
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1740 bytes
+stdout: 1899 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 HWADDR            
 -------------------
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
------------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+---------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
 <<<
 size: 681
-location: clients/tests/test-client.py:test_004()/433
+location: clients/tests/test-client.py:test_004()/449
 cmd: $NMCLI --mode tabular --pretty -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -24396,7 +25958,7 @@ wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 684
-location: clients/tests/test-client.py:test_004()/434
+location: clients/tests/test-client.py:test_004()/450
 cmd: $NMCLI --mode tabular --pretty -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24415,7 +25977,7 @@ wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 3036
-location: clients/tests/test-client.py:test_004()/435
+location: clients/tests/test-client.py:test_004()/451
 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list
 lang: C
 returncode: 0
@@ -24445,7 +26007,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 3274
-location: clients/tests/test-client.py:test_004()/436
+location: clients/tests/test-client.py:test_004()/452
 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24474,68 +26036,68 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 <<<
-size: 1162
-location: clients/tests/test-client.py:test_004()/437
+size: 1329
+location: clients/tests/test-client.py:test_004()/453
 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 996 bytes
+stdout: 1162 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------
-        wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-------------------------------------------------------------------------------------------------------------------
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
------------------------------------------------------------------------------------
+IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+------------------------------------------------------------------------------------------
 
 <<<
-size: 1393
-location: clients/tests/test-client.py:test_004()/438
+size: 1559
+location: clients/tests/test-client.py:test_004()/454
 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1216 bytes
+stdout: 1382 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
---------------------------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
---------------------------------------------------------------------------------------------------------------------
-        wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------------------------------
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
-------------------------------------------------------------------------------------------------
+IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+-------------------------------------------------------------------------------------------------------
 
 <<<
 size: 3149
-location: clients/tests/test-client.py:test_004()/439
+location: clients/tests/test-client.py:test_004()/455
 cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -24565,7 +26127,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 3387
-location: clients/tests/test-client.py:test_004()/440
+location: clients/tests/test-client.py:test_004()/456
 cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24595,7 +26157,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 1151
-location: clients/tests/test-client.py:test_004()/441
+location: clients/tests/test-client.py:test_004()/457
 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -24612,7 +26174,7 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MH
 
 <<<
 size: 1239
-location: clients/tests/test-client.py:test_004()/442
+location: clients/tests/test-client.py:test_004()/458
 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24628,42 +26190,42 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1
 
 
 <<<
-size: 509
-location: clients/tests/test-client.py:test_004()/443
+size: 566
+location: clients/tests/test-client.py:test_004()/459
 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 319 bytes
+stdout: 376 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
-size: 594
-location: clients/tests/test-client.py:test_004()/444
+size: 651
+location: clients/tests/test-client.py:test_004()/460
 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 394 bytes
+stdout: 451 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
---------------------------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
 size: 1264
-location: clients/tests/test-client.py:test_004()/445
+location: clients/tests/test-client.py:test_004()/461
 cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -24680,7 +26242,7 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MH
 
 <<<
 size: 1352
-location: clients/tests/test-client.py:test_004()/446
+location: clients/tests/test-client.py:test_004()/462
 cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24696,33 +26258,37 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1
 
 
 <<<
-size: 4472
-location: clients/tests/test-client.py:test_004()/447
+size: 4851
+location: clients/tests/test-client.py:test_004()/463
 cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4307 bytes
+stdout: 4686 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
----------------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  yes  yes       no      
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-----------------------------------------------------------------------------
-AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+-------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
+
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-----------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24745,33 +26311,37 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 4580
-location: clients/tests/test-client.py:test_004()/448
+size: 4959
+location: clients/tests/test-client.py:test_004()/464
 cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4405 bytes
+stdout: 4784 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
------------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  tak  tak       nie     
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+---------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------
-AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24795,7 +26365,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1722
-location: clients/tests/test-client.py:test_004()/449
+location: clients/tests/test-client.py:test_004()/465
 cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -24842,7 +26412,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1762
-location: clients/tests/test-client.py:test_004()/450
+location: clients/tests/test-client.py:test_004()/466
 cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -24888,33 +26458,33 @@ GROUP  ADDRESS  GATEWAY  ROUTE
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
 <<<
-size: 4610
-location: clients/tests/test-client.py:test_004()/451
+size: 4864
+location: clients/tests/test-client.py:test_004()/467
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 4307 bytes
+stdout: 4561 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
----------------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+-------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-----------------------------------------------------------------------------
-AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-----------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24937,33 +26507,33 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 4718
-location: clients/tests/test-client.py:test_004()/452
+size: 4972
+location: clients/tests/test-client.py:test_004()/468
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4405 bytes
+stdout: 4659 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
------------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+---------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------
-AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -24987,7 +26557,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1526
-location: clients/tests/test-client.py:test_004()/453
+location: clients/tests/test-client.py:test_004()/469
 cmd: $NMCLI --mode tabular --pretty dev lldp list ifname eth0
 lang: C
 returncode: 0
@@ -25004,7 +26574,7 @@ eth0    00:11:22:33:44:22  port1              GigabitEthernet #3  test3.example.
 
 <<<
 size: 1550
-location: clients/tests/test-client.py:test_004()/454
+location: clients/tests/test-client.py:test_004()/470
 cmd: $NMCLI --mode tabular --pretty dev lldp list ifname eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -25020,12 +26590,154 @@ eth0    chassis1           44:44:44:44:44:44  GigabitEthernet #2  test2.example.
 eth0    00:11:22:33:44:22  port1              GigabitEthernet #3  test3.example.com  Test system #3      40 (wlan-access-point,telephone)                                                                                                            
 
 <<<
-size: 4902
-location: clients/tests/test-client.py:test_004()/455
+size: 1490
+location: clients/tests/test-client.py:test_004()/471
+cmd: $NMCLI --mode tabular --pretty -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: C
+returncode: 0
+stdout: 1107 bytes
+>>>
+======================================
+  Connection profile details (con-1)
+======================================
+id    
+-------
+con-1 
+
+uuid                                 
+--------------------------------------
+5fcfd6d7-1e63-3332-8826-a7eda103792d 
+
+type           
+----------------
+802-3-ethernet 
+
+interface-name 
+----------------
+--             
+
+
+==========================================
+  Connection profile details (con-vpn-1)
+==========================================
+id        
+-----------
+con-vpn-1 
+
+uuid                                 
+--------------------------------------
+UUID-con-vpn-1-REPLACED-REPLACED-REP 
+
+type 
+------
+vpn  
+
+interface-name 
+----------------
+--             
+
+user-name 
+-----------
+--        
+
+========================================
+  Connection profile details (con-xx1)
+========================================
+id      
+---------
+con-xx1 
+
+uuid                                 
+--------------------------------------
+UUID-con-xx1-REPLACED-REPLACED-REPLA 
+
+type            
+-----------------
+802-11-wireless 
+
+interface-name 
+----------------
+--             
+
+
+<<<
+size: 1530
+location: clients/tests/test-client.py:test_004()/472
+cmd: $NMCLI --mode tabular --pretty -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1137 bytes
+>>>
+========================================
+  Szczegóły profilu połączenia (con-1)
+========================================
+id    
+-------
+con-1 
+
+uuid                                 
+--------------------------------------
+5fcfd6d7-1e63-3332-8826-a7eda103792d 
+
+type           
+----------------
+802-3-ethernet 
+
+interface-name 
+----------------
+--             
+
+
+============================================
+  Szczegóły profilu połączenia (con-vpn-1)
+============================================
+id        
+-----------
+con-vpn-1 
+
+uuid                                 
+--------------------------------------
+UUID-con-vpn-1-REPLACED-REPLACED-REP 
+
+type 
+------
+vpn  
+
+interface-name 
+----------------
+--             
+
+user-name 
+-----------
+--        
+
+==========================================
+  Szczegóły profilu połączenia (con-xx1)
+==========================================
+id      
+---------
+con-xx1 
+
+uuid                                 
+--------------------------------------
+UUID-con-xx1-REPLACED-REPLACED-REPLA 
+
+type            
+-----------------
+802-11-wireless 
+
+interface-name 
+----------------
+--             
+
+
+<<<
+size: 5124
+location: clients/tests/test-client.py:test_004()/473
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4734 bytes
+stdout: 4956 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
@@ -25034,13 +26746,13 @@ name        id         uuid                                  stable-id  type  in
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              0 (default)   yes                 --             --         no             yes       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -25053,21 +26765,21 @@ proxy  none    no            --       --
 ======================================================================
   Activate connection details (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ======================================================================
-GROUP    NAME       UUID                                  DEVICES  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE          CFG                                     
 --------------------------------------------------------------------------------------------------------------------------------
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4958
-location: clients/tests/test-client.py:test_004()/456
+size: 5180
+location: clients/tests/test-client.py:test_004()/474
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4780 bytes
+stdout: 5002 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -25076,13 +26788,13 @@ name        id         uuid                                  stable-id  type  in
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              0 (default)   tak                 --             --         nie            tak       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -25095,21 +26807,21 @@ proxy  none    nie           --       --
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ===========================================================================
-GROUP    NAME       UUID                                  DEVICES  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 ----------------------------------------------------------------------------------------------------------------------------------
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4902
-location: clients/tests/test-client.py:test_004()/457
+size: 5124
+location: clients/tests/test-client.py:test_004()/475
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4734 bytes
+stdout: 4956 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
@@ -25118,13 +26830,13 @@ name        id         uuid                                  stable-id  type  in
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              0 (default)   yes                 --             --         no             yes       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -25137,21 +26849,21 @@ proxy  none    no            --       --
 ======================================================================
   Activate connection details (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ======================================================================
-GROUP    NAME       UUID                                  DEVICES  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE          CFG                                     
 --------------------------------------------------------------------------------------------------------------------------------
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4958
-location: clients/tests/test-client.py:test_004()/458
+size: 5180
+location: clients/tests/test-client.py:test_004()/476
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4780 bytes
+stdout: 5002 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -25160,13 +26872,13 @@ name        id         uuid                                  stable-id  type  in
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              0 (default)   tak                 --             --         nie            tak       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -25179,21 +26891,21 @@ proxy  none    nie           --       --
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ===========================================================================
-GROUP    NAME       UUID                                  DEVICES  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 ----------------------------------------------------------------------------------------------------------------------------------
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3588
-location: clients/tests/test-client.py:test_004()/459
+size: 3780
+location: clients/tests/test-client.py:test_004()/477
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3413 bytes
+stdout: 3605 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
@@ -25202,13 +26914,13 @@ name        id         uuid                                  stable-id  type  in
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          no         --           --    --      --          -1 (default)        --           0                     unknown  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              0 (default)   yes                 --             --         no             yes       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               --              --         0 (default)   yes                 --             --         0x0 (none)           no             yes       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         --         yes                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -25220,12 +26932,12 @@ proxy  none    no            --       --
 
 
 <<<
-size: 3611
-location: clients/tests/test-client.py:test_004()/460
+size: 3803
+location: clients/tests/test-client.py:test_004()/478
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3426 bytes
+stdout: 3618 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -25234,13 +26946,13 @@ name        id         uuid                                  stable-id  type  in
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          nie        --           --    --      --          -1 (default)        --           0                     nieznane  default  -1 (default)  -1 (default)  -1                  
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  never-default  may-fail  dad-timeout  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              0 (default)   tak                 --             --         nie            tak       -1 (default) 
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-timeout  dhcp-send-hostname  dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  dad-timeout  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              --              --         0 (default)   tak                 --             --         0x0 (none)           nie            tak       -1 (default) 
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-send-hostname  dhcp-hostname  token 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  ignore-auto-routes  ignore-auto-dns  never-default  may-fail  ip6-privacy   addr-gen-mode   dhcp-duid  dhcp-iaid  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  token 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         --         tak                 --             0x0 (none)           --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -25253,7 +26965,7 @@ proxy  none    nie           --       --
 
 <<<
 size: 683
-location: clients/tests/test-client.py:test_004()/461
+location: clients/tests/test-client.py:test_004()/479
 cmd: $NMCLI --mode tabular --pretty --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -25268,7 +26980,7 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 
 <<<
 size: 703
-location: clients/tests/test-client.py:test_004()/462
+location: clients/tests/test-client.py:test_004()/480
 cmd: $NMCLI --mode tabular --pretty --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -25282,38 +26994,38 @@ name  service-type                            user-name  data
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
 
 <<<
-size: 1113
-location: clients/tests/test-client.py:test_004()/463
+size: 1143
+location: clients/tests/test-client.py:test_004()/481
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 935 bytes
+stdout: 965 bytes
 >>>
 ======================================================================
   Activate connection details (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ======================================================================
-GROUP    NAME       UUID                                  DEVICES  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 <<<
-size: 1145
-location: clients/tests/test-client.py:test_004()/464
+size: 1175
+location: clients/tests/test-client.py:test_004()/482
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 957 bytes
+stdout: 987 bytes
 >>>
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ===========================================================================
-GROUP    NAME       UUID                                  DEVICES  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    --        aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
 
 <<<
 size: 704
-location: clients/tests/test-client.py:test_004()/465
+location: clients/tests/test-client.py:test_004()/483
 cmd: $NMCLI --mode tabular --pretty --color yes dev s
 lang: C
 returncode: 0
@@ -25332,7 +27044,7 @@ DEVICE  TYPE      STATE        CONNECTION
 
 <<<
 size: 712
-location: clients/tests/test-client.py:test_004()/466
+location: clients/tests/test-client.py:test_004()/484
 cmd: $NMCLI --mode tabular --pretty --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -25351,7 +27063,7 @@ DEVICE  TYPE      STATE        CONNECTION
 
 <<<
 size: 2100
-location: clients/tests/test-client.py:test_004()/467
+location: clients/tests/test-client.py:test_004()/485
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev status
 lang: C
 returncode: 0
@@ -25370,7 +27082,7 @@ DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH
 
 <<<
 size: 2108
-location: clients/tests/test-client.py:test_004()/468
+location: clients/tests/test-client.py:test_004()/486
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -25389,7 +27101,7 @@ DEVICE  TYPE      STATE        IP4-CONNECTIVITY  IP6-CONNECTIVITY  DBUS-PATH
 
 <<<
 size: 9898
-location: clients/tests/test-client.py:test_004()/469
+location: clients/tests/test-client.py:test_004()/487
 cmd: $NMCLI --mode tabular --pretty --color yes dev show
 lang: C
 returncode: 0
@@ -25600,7 +27312,7 @@ IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0
 
 <<<
 size: 10074
-location: clients/tests/test-client.py:test_004()/470
+location: clients/tests/test-client.py:test_004()/488
 cmd: $NMCLI --mode tabular --pretty --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -25810,33 +27522,37 @@ GROUP  ADDRESS                        GATEWAY  ROUTE
 IP6    2001:a::88ca:3654:96b:ab44/89  --       dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = ::  2001:a::2934:bd66:550d:ec19  sear6.fo.x.y 
 
 <<<
-size: 22975
-location: clients/tests/test-client.py:test_004()/471
+size: 24537
+location: clients/tests/test-client.py:test_004()/489
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 22806 bytes
+stdout: 24368 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
----------------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  yes  yes       no      
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+-------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-----------------------------------------------------------------------------
-AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-----------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -25861,14 +27577,18 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 =========================
   Device details (eth0)
 =========================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  no              100 Mb/s  no           no    
 
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  yes  yes       no      
+
 NAME              CARRIER  S390-SUBCHANNELS 
 ---------------------------------------------
 WIRED-PROPERTIES  off      --               
@@ -25896,14 +27616,18 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 =========================
   Device details (eth1)
 =========================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  no              100 Mb/s  no           no    
 
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  yes  yes       no      
+
 NAME              CARRIER  S390-SUBCHANNELS 
 ---------------------------------------------
 WIRED-PROPERTIES  off      --               
@@ -25931,21 +27655,25 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 ==========================
   Device details (wlan1)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
----------------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  yes  yes       no      
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+-------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-----------------------------------------------------------------------------
-AP[1]          wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-----------------------------------------------------------------------------------------------
+AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
 
 GROUP  ADDRESS  GATEWAY         ROUTE                                                                                                                                                  DNS            DOMAIN                                                                                             WINS 
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -25970,20 +27698,24 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 ==========================
   Device details (wlan1)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan1  --        no           yes         yes          no                no                 --            --          --        --        unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
----------------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  yes  yes       no      
 
-NAME  IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
---------------------------------------------------------------
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+-------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
+
+NAME  IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+---------------------------------------------------------------------
 
 GROUP  ADDRESS                                GATEWAY  ROUTE                                                           DNS              DOMAIN                                                                            WINS                          
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26006,33 +27738,37 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 23336
-location: clients/tests/test-client.py:test_004()/472
+size: 24898
+location: clients/tests/test-client.py:test_004()/490
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 23157 bytes
+stdout: 24719 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
------------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  tak  tak       nie     
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+---------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------
-AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26057,14 +27793,18 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 ==================================
   Informacje o urządzeniu (eth0)
 ==================================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth0    ethernet  NMDeviceEthernet  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                AB:B7:BF:E2:48:E8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  nie             100 Mb/s  nie          nie   
 
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  tak  tak       nie     
+
 NAME              CARRIER    S390-SUBCHANNELS 
 -----------------------------------------------
 WIRED-PROPERTIES  wyłączone  --               
@@ -26092,14 +27832,18 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 ==================================
   Informacje o urządzeniu (eth1)
 ==================================
-NAME     DEVICE  TYPE      NM-TYPE           VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  eth1    ethernet  NMDeviceEthernet  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  eth1    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/2  --      --       virtual  --              --                E7:78:B1:93:2B:22  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  nie             100 Mb/s  nie          nie   
 
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  tak  tak       nie     
+
 NAME              CARRIER    S390-SUBCHANNELS 
 -----------------------------------------------
 WIRED-PROPERTIES  wyłączone  --               
@@ -26127,21 +27871,25 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1}  5fcfd6d7-1
 ===================================
   Informacje o urządzeniu (wlan1)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/4  --      --       virtual  --              --                21:E9:64:81:8C:A8  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
------------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  tak  tak       nie     
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+---------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------
-AP[1]          wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------------
+AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
 
 GROUP  ADDRESS  GATEWAY         ROUTE                                                                                                                                                  DNS            DOMAIN                                                                                             WINS 
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26166,20 +27914,24 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 ===================================
   Informacje o urządzeniu (wlan1)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID  CON-PATH  METERED  
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan1   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/5  --      --       virtual  --              --                71:52:AD:63:5C:7C  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan1  --        nie          tak         tak          nie               nie                --            --          --        --        nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
------------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  tak  tak       nie     
 
-NAME  IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
---------------------------------------------------------------
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+---------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
+
+NAME  IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+---------------------------------------------------------------------
 
 GROUP  ADDRESS                                GATEWAY  ROUTE                                                           DNS              DOMAIN                                                                            WINS                          
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26203,7 +27955,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1721
-location: clients/tests/test-client.py:test_004()/473
+location: clients/tests/test-client.py:test_004()/491
 cmd: $NMCLI --mode tabular --pretty --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -26250,7 +28002,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1761
-location: clients/tests/test-client.py:test_004()/474
+location: clients/tests/test-client.py:test_004()/492
 cmd: $NMCLI --mode tabular --pretty --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26296,33 +28048,37 @@ GROUP  ADDRESS  GATEWAY  ROUTE
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
 <<<
-size: 4724
-location: clients/tests/test-client.py:test_004()/475
+size: 5130
+location: clients/tests/test-client.py:test_004()/493
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4550 bytes
+stdout: 4956 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
----------------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  yes  yes       no      
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+-------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-----------------------------------------------------------------------------
-AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-----------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26345,33 +28101,37 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 4832
-location: clients/tests/test-client.py:test_004()/476
+size: 5238
+location: clients/tests/test-client.py:test_004()/494
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4648 bytes
+stdout: 5054 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
------------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  tak  tak       nie     
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+---------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------
-AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26394,100 +28154,100 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 1895
-location: clients/tests/test-client.py:test_004()/477
+size: 2054
+location: clients/tests/test-client.py:test_004()/495
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1686 bytes
+stdout: 1845 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 HWADDR            
 -------------------
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
----------------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+-------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
 <<<
-size: 1959
-location: clients/tests/test-client.py:test_004()/478
+size: 2118
+location: clients/tests/test-client.py:test_004()/496
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1740 bytes
+stdout: 1899 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 HWADDR            
 -------------------
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
------------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+---------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
 <<<
-size: 1895
-location: clients/tests/test-client.py:test_004()/479
+size: 2054
+location: clients/tests/test-client.py:test_004()/497
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1686 bytes
+stdout: 1845 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 HWADDR            
 -------------------
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
----------------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+-------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
 <<<
-size: 1959
-location: clients/tests/test-client.py:test_004()/480
+size: 2118
+location: clients/tests/test-client.py:test_004()/498
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1740 bytes
+stdout: 1899 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 HWADDR            
 -------------------
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
------------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+---------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
 <<<
 size: 813
-location: clients/tests/test-client.py:test_004()/481
+location: clients/tests/test-client.py:test_004()/499
 cmd: $NMCLI --mode tabular --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -26506,7 +28266,7 @@ DEVICE  TYPE      DBUS-PATH
 
 <<<
 size: 816
-location: clients/tests/test-client.py:test_004()/482
+location: clients/tests/test-client.py:test_004()/500
 cmd: $NMCLI --mode tabular --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26525,7 +28285,7 @@ DEVICE  TYPE      DBUS-PATH
 
 <<<
 size: 3660
-location: clients/tests/test-client.py:test_004()/483
+location: clients/tests/test-client.py:test_004()/501
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list
 lang: C
 returncode: 0
@@ -26555,7 +28315,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 3898
-location: clients/tests/test-client.py:test_004()/484
+location: clients/tests/test-client.py:test_004()/502
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26584,68 +28344,68 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 <<<
-size: 1463
-location: clients/tests/test-client.py:test_004()/485
+size: 1665
+location: clients/tests/test-client.py:test_004()/503
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 1284 bytes
+stdout: 1486 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-        wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------
-        wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-------------------------------------------------------------------------------------------------------------------
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
------------------------------------------------------------------------------------
+IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+------------------------------------------------------------------------------------------
 
 <<<
-size: 1693
-location: clients/tests/test-client.py:test_004()/486
+size: 1895
+location: clients/tests/test-client.py:test_004()/504
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1504 bytes
+stdout: 1706 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
---------------------------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-        wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
---------------------------------------------------------------------------------------------------------------------
-        wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------------------------------
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
-------------------------------------------------------------------------------------------------
+IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+-------------------------------------------------------------------------------------------------------
 
 <<<
 size: 3773
-location: clients/tests/test-client.py:test_004()/487
+location: clients/tests/test-client.py:test_004()/505
 cmd: $NMCLI --mode tabular --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -26675,7 +28435,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 4011
-location: clients/tests/test-client.py:test_004()/488
+location: clients/tests/test-client.py:test_004()/506
 cmd: $NMCLI --mode tabular --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26705,7 +28465,7 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 
 <<<
 size: 1317
-location: clients/tests/test-client.py:test_004()/489
+location: clients/tests/test-client.py:test_004()/507
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -26722,7 +28482,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 
 <<<
 size: 1404
-location: clients/tests/test-client.py:test_004()/490
+location: clients/tests/test-client.py:test_004()/508
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26738,42 +28498,42 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 
 
 <<<
-size: 593
-location: clients/tests/test-client.py:test_004()/491
+size: 659
+location: clients/tests/test-client.py:test_004()/509
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 391 bytes
+stdout: 457 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
-size: 678
-location: clients/tests/test-client.py:test_004()/492
+size: 744
+location: clients/tests/test-client.py:test_004()/510
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 466 bytes
+stdout: 532 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
---------------------------------------------------------------------------------------------------------------------
-        wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
 size: 1430
-location: clients/tests/test-client.py:test_004()/493
+location: clients/tests/test-client.py:test_004()/511
 cmd: $NMCLI --mode tabular --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -26790,7 +28550,7 @@ NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ
 
 <<<
 size: 1517
-location: clients/tests/test-client.py:test_004()/494
+location: clients/tests/test-client.py:test_004()/512
 cmd: $NMCLI --mode tabular --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26806,33 +28566,37 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 
 
 <<<
-size: 4727
-location: clients/tests/test-client.py:test_004()/495
+size: 5133
+location: clients/tests/test-client.py:test_004()/513
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4550 bytes
+stdout: 4956 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
----------------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  yes  yes       no      
+
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+-------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-----------------------------------------------------------------------------
-AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-----------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26855,33 +28619,37 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 4835
-location: clients/tests/test-client.py:test_004()/496
+size: 5241
+location: clients/tests/test-client.py:test_004()/514
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4648 bytes
+stdout: 5054 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
------------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             UP   LOWER-UP  CARRIER 
+-----------------------------------------
+INTERFACE-FLAGS  tak  tak       nie     
 
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------
-AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+---------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
+
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26905,7 +28673,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1734
-location: clients/tests/test-client.py:test_004()/497
+location: clients/tests/test-client.py:test_004()/515
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -26952,7 +28720,7 @@ IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 250
 
 <<<
 size: 1774
-location: clients/tests/test-client.py:test_004()/498
+location: clients/tests/test-client.py:test_004()/516
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -26998,33 +28766,33 @@ GROUP  ADDRESS  GATEWAY  ROUTE
 IP6    --       --       dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086  --   sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar 
 
 <<<
-size: 4865
-location: clients/tests/test-client.py:test_004()/499
+size: 5146
+location: clients/tests/test-client.py:test_004()/517
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 4550 bytes
+stdout: 4831 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (unavailable)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --        no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
 
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
----------------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH  IBSS-RSN 
+-------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no    no       
 
-NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-----------------------------------------------------------------------------
-AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+-----------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -27047,33 +28815,33 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 4973
-location: clients/tests/test-client.py:test_004()/500
+size: 5254
+location: clients/tests/test-client.py:test_004()/518
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4648 bytes
+stdout: 4929 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME     DEVICE  TYPE  NM-TYPE       VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
+NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE             REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    20 (niedostępne)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --        nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
 
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
------------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH  IBSS-RSN 
+---------------------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------
-AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            WINS           
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -27097,7 +28865,7 @@ CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-x
 
 <<<
 size: 1538
-location: clients/tests/test-client.py:test_004()/501
+location: clients/tests/test-client.py:test_004()/519
 cmd: $NMCLI --mode tabular --pretty --color yes dev lldp list ifname eth0
 lang: C
 returncode: 0
@@ -27114,7 +28882,7 @@ eth0    00:11:22:33:44:22  port1              GigabitEthernet #3  test3.example.
 
 <<<
 size: 1562
-location: clients/tests/test-client.py:test_004()/502
+location: clients/tests/test-client.py:test_004()/520
 cmd: $NMCLI --mode tabular --pretty --color yes dev lldp list ifname eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27130,100 +28898,242 @@ eth0    chassis1           44:44:44:44:44:44  GigabitEthernet #2  test2.example.
 eth0    00:11:22:33:44:22  port1              GigabitEthernet #3  test3.example.com  Test system #3      40 (wlan-access-point,telephone)                                                                                                            
 
 <<<
-size: 789
-location: clients/tests/test-client.py:test_004()/503
+size: 1502
+location: clients/tests/test-client.py:test_004()/521
+cmd: $NMCLI --mode tabular --pretty --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: C
+returncode: 0
+stdout: 1107 bytes
+>>>
+======================================
+  Connection profile details (con-1)
+======================================
+id    
+-------
+con-1 
+
+uuid                                 
+--------------------------------------
+5fcfd6d7-1e63-3332-8826-a7eda103792d 
+
+type           
+----------------
+802-3-ethernet 
+
+interface-name 
+----------------
+--             
+
+
+==========================================
+  Connection profile details (con-vpn-1)
+==========================================
+id        
+-----------
+con-vpn-1 
+
+uuid                                 
+--------------------------------------
+UUID-con-vpn-1-REPLACED-REPLACED-REP 
+
+type 
+------
+vpn  
+
+interface-name 
+----------------
+--             
+
+user-name 
+-----------
+--        
+
+========================================
+  Connection profile details (con-xx1)
+========================================
+id      
+---------
+con-xx1 
+
+uuid                                 
+--------------------------------------
+UUID-con-xx1-REPLACED-REPLACED-REPLA 
+
+type            
+-----------------
+802-11-wireless 
+
+interface-name 
+----------------
+--             
+
+
+<<<
+size: 1542
+location: clients/tests/test-client.py:test_004()/522
+cmd: $NMCLI --mode tabular --pretty --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1137 bytes
+>>>
+========================================
+  Szczegóły profilu połączenia (con-1)
+========================================
+id    
+-------
+con-1 
+
+uuid                                 
+--------------------------------------
+5fcfd6d7-1e63-3332-8826-a7eda103792d 
+
+type           
+----------------
+802-3-ethernet 
+
+interface-name 
+----------------
+--             
+
+
+============================================
+  Szczegóły profilu połączenia (con-vpn-1)
+============================================
+id        
+-----------
+con-vpn-1 
+
+uuid                                 
+--------------------------------------
+UUID-con-vpn-1-REPLACED-REPLACED-REP 
+
+type 
+------
+vpn  
+
+interface-name 
+----------------
+--             
+
+user-name 
+-----------
+--        
+
+==========================================
+  Szczegóły profilu połączenia (con-xx1)
+==========================================
+id      
+---------
+con-xx1 
+
+uuid                                 
+--------------------------------------
+UUID-con-xx1-REPLACED-REPLACED-REPLA 
+
+type            
+-----------------
+802-11-wireless 
+
+interface-name 
+----------------
+--             
+
+
+<<<
+size: 800
+location: clients/tests/test-client.py:test_004()/523
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 635 bytes
+stdout: 646 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
-ipv4:auto::::0::::-1:0::no:no::0:yes:::no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
-GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 799
-location: clients/tests/test-client.py:test_004()/504
+size: 810
+location: clients/tests/test-client.py:test_004()/524
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 635 bytes
+stdout: 646 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
-ipv4:auto::::0::::-1:0::no:no::0:yes:::no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
-GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 789
-location: clients/tests/test-client.py:test_004()/505
+size: 800
+location: clients/tests/test-client.py:test_004()/525
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 635 bytes
+stdout: 646 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
-ipv4:auto::::0::::-1:0::no:no::0:yes:::no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
-GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 799
-location: clients/tests/test-client.py:test_004()/506
+size: 810
+location: clients/tests/test-client.py:test_004()/526
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 635 bytes
+stdout: 646 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
-ipv4:auto::::0::::-1:0::no:no::0:yes:::no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
-GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 502
-location: clients/tests/test-client.py:test_004()/507
+size: 512
+location: clients/tests/test-client.py:test_004()/527
 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 341 bytes
+stdout: 351 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
-ipv4:auto::::0::::-1:0::no:no::0:yes:::no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 
 <<<
-size: 512
-location: clients/tests/test-client.py:test_004()/508
+size: 522
+location: clients/tests/test-client.py:test_004()/528
 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 341 bytes
+stdout: 351 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
-ipv4:auto::::0::::-1:0::no:no::0:yes:::no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 
 <<<
 size: 256
-location: clients/tests/test-client.py:test_004()/509
+location: clients/tests/test-client.py:test_004()/529
 cmd: $NMCLI --mode tabular --terse -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -27233,7 +29143,7 @@ vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val
 
 <<<
 size: 266
-location: clients/tests/test-client.py:test_004()/510
+location: clients/tests/test-client.py:test_004()/530
 cmd: $NMCLI --mode tabular --terse -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27242,28 +29152,28 @@ stdout: 96 bytes
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 
 <<<
-size: 354
-location: clients/tests/test-client.py:test_004()/511
+size: 355
+location: clients/tests/test-client.py:test_004()/531
 cmd: $NMCLI --mode tabular --terse -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 189 bytes
+stdout: 190 bytes
 >>>
-GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 
 <<<
-size: 364
-location: clients/tests/test-client.py:test_004()/512
+size: 365
+location: clients/tests/test-client.py:test_004()/532
 cmd: $NMCLI --mode tabular --terse -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 189 bytes
+stdout: 190 bytes
 >>>
-GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 
 <<<
 size: 279
-location: clients/tests/test-client.py:test_004()/513
+location: clients/tests/test-client.py:test_004()/533
 cmd: $NMCLI --mode tabular --terse dev s
 lang: C
 returncode: 0
@@ -27277,7 +29187,7 @@ wlan1:wifi:unavailable:
 
 <<<
 size: 289
-location: clients/tests/test-client.py:test_004()/514
+location: clients/tests/test-client.py:test_004()/534
 cmd: $NMCLI --mode tabular --terse dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27291,7 +29201,7 @@ wlan1:wifi:unavailable:
 
 <<<
 size: 677
-location: clients/tests/test-client.py:test_004()/515
+location: clients/tests/test-client.py:test_004()/535
 cmd: $NMCLI --mode tabular --terse -f all dev status
 lang: C
 returncode: 0
@@ -27305,7 +29215,7 @@ wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 687
-location: clients/tests/test-client.py:test_004()/516
+location: clients/tests/test-client.py:test_004()/536
 cmd: $NMCLI --mode tabular --terse -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27319,7 +29229,7 @@ wlan1:wifi:unavailable:unknown:unknown:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 3091
-location: clients/tests/test-client.py:test_004()/517
+location: clients/tests/test-client.py:test_004()/537
 cmd: $NMCLI --mode tabular --terse dev show
 lang: C
 returncode: 0
@@ -27379,7 +29289,7 @@ IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0
 
 <<<
 size: 3101
-location: clients/tests/test-client.py:test_004()/518
+location: clients/tests/test-client.py:test_004()/538
 cmd: $NMCLI --mode tabular --terse dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27438,27 +29348,29 @@ IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168
 IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0/85, nh = \:\:, mt = 2821465568 | dst = 2001\:a\:\:a976\:2488\:f49f\:b48/106, nh = 2001\:a\:\:62ae\:c734\:fc7b\:e931, mt = 2248613879 | dst = 2001\:a\:\:afb7\:4449\:3787\:8bb4/123, nh = \:\::2001\:a\:\:2934\:bd66\:550d\:ec19:sear6.fo.x.y
 
 <<<
-size: 6319
-location: clients/tests/test-client.py:test_004()/519
+size: 6765
+location: clients/tests/test-client.py:test_004()/539
 cmd: $NMCLI --mode tabular --terse -f all dev show
 lang: C
 returncode: 0
-stdout: 6164 bytes
+stdout: 6610 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
-AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+INTERFACE-FLAGS:yes:yes:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
 DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
+INTERFACE-FLAGS:yes:yes:no
 WIRED-PROPERTIES:off:
 IP4:192.168.49.34/22 | 192.168.135.86/19:::192.168.45.230 | 192.168.180.201 | 192.168.253.2:sear4.foo2.bar | sear4.foo1.bar:192.168.163.23 | 192.168.151.246
 DHCP4:dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9
@@ -27466,8 +29378,9 @@ IP6:2001\:a\:\:ed81\:3d7\:c2e9\:df82/99:::2001\:a\:\:2703\:f06\:9619\:d89f | 200
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:eth1:ethernet:NMDeviceEthernet:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown
+GENERAL:eth1:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/2:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
+INTERFACE-FLAGS:yes:yes:no
 WIRED-PROPERTIES:off:
 IP4:192.168.127.210/25:192.168.88.4:dst = 192.168.222.35/19, nh = 192.168.170.142, mt = 3609264321 | dst = 192.168.135.81/32, nh = 192.168.32.11, mt = 1316413247 | dst = 192.168.24.65/26, nh = 192.168.23.163, mt = 3855574583:192.168.16.144 | 192.168.79.53 | 192.168.237.155:sear4.foo4.bar | sear4.foo3.bar | sear4.foo1.bar:192.168.211.91 | 192.168.58.182 | 192.168.114.97
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-1 = val-1 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-3 = val-3 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-5 = val-5 | dhcp-4-opt-7 = val-7 | dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9
@@ -27475,19 +29388,21 @@ IP6:2001\:a\:\:1c1\:c178\:169f\:2b80/93 | 2001\:a\:\:1f79\:e0fb\:87b9\:3cc6/123:
 DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/4:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
-AP[1]: :wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
+INTERFACE-FLAGS:yes:yes:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
+AP[1]: :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
 IP4::192.168.57.160:dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69:192.168.61.83:sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar:
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-1 = val-1 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-6 = val-6 | dhcp-4-opt-7 = val-7 | dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9
 IP6:2001\:a\:\:fa05\:2ab4\:9300\:e8fe/116 | 2001\:a\:\:e9cf\:bd3\:caba\:99b3/86 | 2001\:a\:\:2be6\:44fa\:2c95\:5559/78:2001\:a\:\:4d70\:d91a\:770f\:2319:dst = 2001\:a\:\:3cb2\:719d\:bb00\:b22f/66, nh = 2001\:a\:\:81b1\:58b9\:7237\:3511, mt = 2280277732 | dst = 2001\:a\:\:986f\:983c\:5eb\:1c7d/99, nh = \:\:, mt = 1204008676:2001\:a\:\:85e7\:3d7d\:53e8\:50ac | 2001\:a\:\:1c5\:9cb5\:e86d\:25a5:sear6.foo4.bar | sear6.foo2.bar
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/5:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
+INTERFACE-FLAGS:yes:yes:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
 IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551:192.168.107.109:sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar:192.168.60.60 | 192.168.63.92
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-5 = val-5
 IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0/85, nh = \:\:, mt = 2821465568 | dst = 2001\:a\:\:a976\:2488\:f49f\:b48/106, nh = 2001\:a\:\:62ae\:c734\:fc7b\:e931, mt = 2248613879 | dst = 2001\:a\:\:afb7\:4449\:3787\:8bb4/123, nh = \:\::2001\:a\:\:2934\:bd66\:550d\:ec19:sear6.fo.x.y
@@ -27495,27 +29410,29 @@ DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 6365
-location: clients/tests/test-client.py:test_004()/520
+size: 6811
+location: clients/tests/test-client.py:test_004()/540
 cmd: $NMCLI --mode tabular --terse -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6200 bytes
+stdout: 6646 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
-AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+INTERFACE-FLAGS:yes:yes:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
 DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
+INTERFACE-FLAGS:yes:yes:no
 WIRED-PROPERTIES:off:
 IP4:192.168.49.34/22 | 192.168.135.86/19:::192.168.45.230 | 192.168.180.201 | 192.168.253.2:sear4.foo2.bar | sear4.foo1.bar:192.168.163.23 | 192.168.151.246
 DHCP4:dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9
@@ -27523,8 +29440,9 @@ IP6:2001\:a\:\:ed81\:3d7\:c2e9\:df82/99:::2001\:a\:\:2703\:f06\:9619\:d89f | 200
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:eth1:ethernet:NMDeviceEthernet:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown
+GENERAL:eth1:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/2:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
+INTERFACE-FLAGS:yes:yes:no
 WIRED-PROPERTIES:off:
 IP4:192.168.127.210/25:192.168.88.4:dst = 192.168.222.35/19, nh = 192.168.170.142, mt = 3609264321 | dst = 192.168.135.81/32, nh = 192.168.32.11, mt = 1316413247 | dst = 192.168.24.65/26, nh = 192.168.23.163, mt = 3855574583:192.168.16.144 | 192.168.79.53 | 192.168.237.155:sear4.foo4.bar | sear4.foo3.bar | sear4.foo1.bar:192.168.211.91 | 192.168.58.182 | 192.168.114.97
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-1 = val-1 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-3 = val-3 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-5 = val-5 | dhcp-4-opt-7 = val-7 | dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9
@@ -27532,19 +29450,21 @@ IP6:2001\:a\:\:1c1\:c178\:169f\:2b80/93 | 2001\:a\:\:1f79\:e0fb\:87b9\:3cc6/123:
 DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/4:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
-AP[1]: :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
+INTERFACE-FLAGS:yes:yes:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
+AP[1]: :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
 IP4::192.168.57.160:dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69:192.168.61.83:sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar:
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-1 = val-1 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-6 = val-6 | dhcp-4-opt-7 = val-7 | dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9
 IP6:2001\:a\:\:fa05\:2ab4\:9300\:e8fe/116 | 2001\:a\:\:e9cf\:bd3\:caba\:99b3/86 | 2001\:a\:\:2be6\:44fa\:2c95\:5559/78:2001\:a\:\:4d70\:d91a\:770f\:2319:dst = 2001\:a\:\:3cb2\:719d\:bb00\:b22f/66, nh = 2001\:a\:\:81b1\:58b9\:7237\:3511, mt = 2280277732 | dst = 2001\:a\:\:986f\:983c\:5eb\:1c7d/99, nh = \:\:, mt = 1204008676:2001\:a\:\:85e7\:3d7d\:53e8\:50ac | 2001\:a\:\:1c5\:9cb5\:e86d\:25a5:sear6.foo4.bar | sear6.foo2.bar
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/5:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
+INTERFACE-FLAGS:yes:yes:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
 IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551:192.168.107.109:sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar:192.168.60.60 | 192.168.63.92
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-5 = val-5
 IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0/85, nh = \:\:, mt = 2821465568 | dst = 2001\:a\:\:a976\:2488\:f49f\:b48/106, nh = 2001\:a\:\:62ae\:c734\:fc7b\:e931, mt = 2248613879 | dst = 2001\:a\:\:afb7\:4449\:3787\:8bb4/123, nh = \:\::2001\:a\:\:2934\:bd66\:550d\:ec19:sear6.fo.x.y
@@ -27553,7 +29473,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1
 
 <<<
 size: 599
-location: clients/tests/test-client.py:test_004()/521
+location: clients/tests/test-client.py:test_004()/541
 cmd: $NMCLI --mode tabular --terse dev show wlan0
 lang: C
 returncode: 0
@@ -27571,7 +29491,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se
 
 <<<
 size: 609
-location: clients/tests/test-client.py:test_004()/522
+location: clients/tests/test-client.py:test_004()/542
 cmd: $NMCLI --mode tabular --terse dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27588,19 +29508,20 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
 
 <<<
-size: 1353
-location: clients/tests/test-client.py:test_004()/523
+size: 1494
+location: clients/tests/test-client.py:test_004()/543
 cmd: $NMCLI --mode tabular --terse -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 1192 bytes
+stdout: 1333 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
-AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+INTERFACE-FLAGS:yes:yes:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -27608,19 +29529,20 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1390
-location: clients/tests/test-client.py:test_004()/524
+size: 1531
+location: clients/tests/test-client.py:test_004()/544
 cmd: $NMCLI --mode tabular --terse -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1219 bytes
+stdout: 1360 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
-AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+INTERFACE-FLAGS:yes:yes:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -27628,56 +29550,56 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 563
-location: clients/tests/test-client.py:test_004()/525
+size: 608
+location: clients/tests/test-client.py:test_004()/545
 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 368 bytes
+stdout: 413 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 13\:E0\:74\:85\:7C\:D9
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
 
 <<<
-size: 573
-location: clients/tests/test-client.py:test_004()/526
+size: 618
+location: clients/tests/test-client.py:test_004()/546
 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 368 bytes
+stdout: 413 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 13\:E0\:74\:85\:7C\:D9
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
 
 <<<
-size: 563
-location: clients/tests/test-client.py:test_004()/527
+size: 608
+location: clients/tests/test-client.py:test_004()/547
 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 368 bytes
+stdout: 413 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 13\:E0\:74\:85\:7C\:D9
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
 
 <<<
-size: 573
-location: clients/tests/test-client.py:test_004()/528
+size: 618
+location: clients/tests/test-client.py:test_004()/548
 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 368 bytes
+stdout: 413 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 13\:E0\:74\:85\:7C\:D9
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
 
 <<<
 size: 438
-location: clients/tests/test-client.py:test_004()/529
+location: clients/tests/test-client.py:test_004()/549
 cmd: $NMCLI --mode tabular --terse -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -27691,7 +29613,7 @@ wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 448
-location: clients/tests/test-client.py:test_004()/530
+location: clients/tests/test-client.py:test_004()/550
 cmd: $NMCLI --mode tabular --terse -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27705,7 +29627,7 @@ wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 1096
-location: clients/tests/test-client.py:test_004()/531
+location: clients/tests/test-client.py:test_004()/551
 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list
 lang: C
 returncode: 0
@@ -27720,7 +29642,7 @@ AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54
 
 <<<
 size: 1154
-location: clients/tests/test-client.py:test_004()/532
+location: clients/tests/test-client.py:test_004()/552
 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27734,38 +29656,38 @@ AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:24
 
 
 <<<
-size: 353
-location: clients/tests/test-client.py:test_004()/533
+size: 445
+location: clients/tests/test-client.py:test_004()/553
 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 188 bytes
+stdout: 280 bytes
 >>>
- :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
- :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+ :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 
- :wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
+ :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
 
 
 <<<
-size: 399
-location: clients/tests/test-client.py:test_004()/534
+size: 491
+location: clients/tests/test-client.py:test_004()/554
 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 224 bytes
+stdout: 316 bytes
 >>>
- :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
- :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+ :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 
- :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
+ :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
 
 
 <<<
 size: 1209
-location: clients/tests/test-client.py:test_004()/535
+location: clients/tests/test-client.py:test_004()/555
 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -27780,7 +29702,7 @@ AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54
 
 <<<
 size: 1267
-location: clients/tests/test-client.py:test_004()/536
+location: clients/tests/test-client.py:test_004()/556
 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27795,7 +29717,7 @@ AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:24
 
 <<<
 size: 443
-location: clients/tests/test-client.py:test_004()/537
+location: clients/tests/test-client.py:test_004()/557
 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -27807,7 +29729,7 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54
 
 <<<
 size: 465
-location: clients/tests/test-client.py:test_004()/538
+location: clients/tests/test-client.py:test_004()/558
 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27818,32 +29740,32 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:24
 
 
 <<<
-size: 239
-location: clients/tests/test-client.py:test_004()/539
+size: 262
+location: clients/tests/test-client.py:test_004()/559
 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 51 bytes
+stdout: 74 bytes
 >>>
- :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
 
 
 
 <<<
-size: 258
-location: clients/tests/test-client.py:test_004()/540
+size: 281
+location: clients/tests/test-client.py:test_004()/560
 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 60 bytes
+stdout: 83 bytes
 >>>
- :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
 
 
 
 <<<
 size: 556
-location: clients/tests/test-client.py:test_004()/541
+location: clients/tests/test-client.py:test_004()/561
 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -27855,7 +29777,7 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54
 
 <<<
 size: 578
-location: clients/tests/test-client.py:test_004()/542
+location: clients/tests/test-client.py:test_004()/562
 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27866,19 +29788,20 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:24
 
 
 <<<
-size: 1356
-location: clients/tests/test-client.py:test_004()/543
+size: 1497
+location: clients/tests/test-client.py:test_004()/563
 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 1192 bytes
+stdout: 1333 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
-AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+INTERFACE-FLAGS:yes:yes:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -27886,19 +29809,20 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1393
-location: clients/tests/test-client.py:test_004()/544
+size: 1534
+location: clients/tests/test-client.py:test_004()/564
 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1219 bytes
+stdout: 1360 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
-AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+INTERFACE-FLAGS:yes:yes:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -27907,7 +29831,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1
 
 <<<
 size: 612
-location: clients/tests/test-client.py:test_004()/545
+location: clients/tests/test-client.py:test_004()/565
 cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -27925,7 +29849,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se
 
 <<<
 size: 622
-location: clients/tests/test-client.py:test_004()/546
+location: clients/tests/test-client.py:test_004()/566
 cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -27942,19 +29866,19 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
 
 <<<
-size: 1494
-location: clients/tests/test-client.py:test_004()/547
+size: 1608
+location: clients/tests/test-client.py:test_004()/567
 cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 1192 bytes
+stdout: 1306 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
-AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -27962,19 +29886,19 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1531
-location: clients/tests/test-client.py:test_004()/548
+size: 1645
+location: clients/tests/test-client.py:test_004()/568
 cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1219 bytes
+stdout: 1333 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
-AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -27983,7 +29907,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1
 
 <<<
 size: 627
-location: clients/tests/test-client.py:test_004()/549
+location: clients/tests/test-client.py:test_004()/569
 cmd: $NMCLI --mode tabular --terse dev lldp list ifname eth0
 lang: C
 returncode: 0
@@ -27995,7 +29919,7 @@ eth0:00\:11\:22\:33\:44\:22:port1:GigabitEthernet #3:test3.example.com:Test syst
 
 <<<
 size: 637
-location: clients/tests/test-client.py:test_004()/550
+location: clients/tests/test-client.py:test_004()/570
 cmd: $NMCLI --mode tabular --terse dev lldp list ifname eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28006,100 +29930,148 @@ eth0:chassis1:44\:44\:44\:44\:44\:44:GigabitEthernet #2:test2.example.com:Test s
 eth0:00\:11\:22\:33\:44\:22:port1:GigabitEthernet #3:test3.example.com:Test system #3:40 (wlan-access-point,telephone)
 
 <<<
-size: 801
-location: clients/tests/test-client.py:test_004()/551
+size: 557
+location: clients/tests/test-client.py:test_004()/571
+cmd: $NMCLI --mode tabular --terse -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: C
+returncode: 0
+stdout: 176 bytes
+>>>
+con-1
+5fcfd6d7-1e63-3332-8826-a7eda103792d
+802-3-ethernet
+
+
+con-vpn-1
+UUID-con-vpn-1-REPLACED-REPLACED-REP
+vpn
+
+
+
+con-xx1
+UUID-con-xx1-REPLACED-REPLACED-REPLA
+802-11-wireless
+
+
+<<<
+size: 567
+location: clients/tests/test-client.py:test_004()/572
+cmd: $NMCLI --mode tabular --terse -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 176 bytes
+>>>
+con-1
+5fcfd6d7-1e63-3332-8826-a7eda103792d
+802-3-ethernet
+
+
+con-vpn-1
+UUID-con-vpn-1-REPLACED-REPLACED-REP
+vpn
+
+
+
+con-xx1
+UUID-con-xx1-REPLACED-REPLACED-REPLA
+802-11-wireless
+
+
+<<<
+size: 812
+location: clients/tests/test-client.py:test_004()/573
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 635 bytes
+stdout: 646 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
-ipv4:auto::::0::::-1:0::no:no::0:yes:::no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
-GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 811
-location: clients/tests/test-client.py:test_004()/552
+size: 822
+location: clients/tests/test-client.py:test_004()/574
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 635 bytes
+stdout: 646 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
-ipv4:auto::::0::::-1:0::no:no::0:yes:::no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
-GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 801
-location: clients/tests/test-client.py:test_004()/553
+size: 812
+location: clients/tests/test-client.py:test_004()/575
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 635 bytes
+stdout: 646 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
-ipv4:auto::::0::::-1:0::no:no::0:yes:::no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
-GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 811
-location: clients/tests/test-client.py:test_004()/554
+size: 822
+location: clients/tests/test-client.py:test_004()/576
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 635 bytes
+stdout: 646 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
-ipv4:auto::::0::::-1:0::no:no::0:yes:::no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
-GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 514
-location: clients/tests/test-client.py:test_004()/555
+size: 524
+location: clients/tests/test-client.py:test_004()/577
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 341 bytes
+stdout: 351 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
-ipv4:auto::::0::::-1:0::no:no::0:yes:::no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 
 <<<
-size: 524
-location: clients/tests/test-client.py:test_004()/556
+size: 534
+location: clients/tests/test-client.py:test_004()/578
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 341 bytes
+stdout: 351 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1:-1
-ipv4:auto::::0::::-1:0::no:no::0:yes:::no:yes:-1
-ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
+ipv4:auto::::0::::-1:0::no:no:::0:yes:::0x0:no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy:::yes::0x0:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 
 <<<
 size: 268
-location: clients/tests/test-client.py:test_004()/557
+location: clients/tests/test-client.py:test_004()/579
 cmd: $NMCLI --mode tabular --terse --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -28109,7 +30081,7 @@ vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val
 
 <<<
 size: 278
-location: clients/tests/test-client.py:test_004()/558
+location: clients/tests/test-client.py:test_004()/580
 cmd: $NMCLI --mode tabular --terse --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28118,28 +30090,28 @@ stdout: 96 bytes
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 
 <<<
-size: 366
-location: clients/tests/test-client.py:test_004()/559
+size: 367
+location: clients/tests/test-client.py:test_004()/581
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 189 bytes
+stdout: 190 bytes
 >>>
-GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 
 <<<
-size: 376
-location: clients/tests/test-client.py:test_004()/560
+size: 377
+location: clients/tests/test-client.py:test_004()/582
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 189 bytes
+stdout: 190 bytes
 >>>
-GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0::activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
 
 <<<
 size: 451
-location: clients/tests/test-client.py:test_004()/561
+location: clients/tests/test-client.py:test_004()/583
 cmd: $NMCLI --mode tabular --terse --color yes dev s
 lang: C
 returncode: 0
@@ -28153,7 +30125,7 @@ stdout: 295 bytes
 
 <<<
 size: 461
-location: clients/tests/test-client.py:test_004()/562
+location: clients/tests/test-client.py:test_004()/584
 cmd: $NMCLI --mode tabular --terse --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28167,7 +30139,7 @@ stdout: 295 bytes
 
 <<<
 size: 1049
-location: clients/tests/test-client.py:test_004()/563
+location: clients/tests/test-client.py:test_004()/585
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev status
 lang: C
 returncode: 0
@@ -28181,7 +30153,7 @@ stdout: 881 bytes
 
 <<<
 size: 1059
-location: clients/tests/test-client.py:test_004()/564
+location: clients/tests/test-client.py:test_004()/586
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28195,7 +30167,7 @@ stdout: 881 bytes
 
 <<<
 size: 3103
-location: clients/tests/test-client.py:test_004()/565
+location: clients/tests/test-client.py:test_004()/587
 cmd: $NMCLI --mode tabular --terse --color yes dev show
 lang: C
 returncode: 0
@@ -28255,7 +30227,7 @@ IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0
 
 <<<
 size: 3113
-location: clients/tests/test-client.py:test_004()/566
+location: clients/tests/test-client.py:test_004()/588
 cmd: $NMCLI --mode tabular --terse --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28314,27 +30286,29 @@ IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168
 IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0/85, nh = \:\:, mt = 2821465568 | dst = 2001\:a\:\:a976\:2488\:f49f\:b48/106, nh = 2001\:a\:\:62ae\:c734\:fc7b\:e931, mt = 2248613879 | dst = 2001\:a\:\:afb7\:4449\:3787\:8bb4/123, nh = \:\::2001\:a\:\:2934\:bd66\:550d\:ec19:sear6.fo.x.y
 
 <<<
-size: 6655
-location: clients/tests/test-client.py:test_004()/567
+size: 7137
+location: clients/tests/test-client.py:test_004()/589
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 6488 bytes
+stdout: 6970 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
-AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+INTERFACE-FLAGS:yes:yes:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
 DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
+INTERFACE-FLAGS:yes:yes:no
 WIRED-PROPERTIES:off:
 IP4:192.168.49.34/22 | 192.168.135.86/19:::192.168.45.230 | 192.168.180.201 | 192.168.253.2:sear4.foo2.bar | sear4.foo1.bar:192.168.163.23 | 192.168.151.246
 DHCP4:dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9
@@ -28342,8 +30316,9 @@ IP6:2001\:a\:\:ed81\:3d7\:c2e9\:df82/99:::2001\:a\:\:2703\:f06\:9619\:d89f | 200
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:eth1:ethernet:NMDeviceEthernet:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown
+GENERAL:eth1:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/2:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
+INTERFACE-FLAGS:yes:yes:no
 WIRED-PROPERTIES:off:
 IP4:192.168.127.210/25:192.168.88.4:dst = 192.168.222.35/19, nh = 192.168.170.142, mt = 3609264321 | dst = 192.168.135.81/32, nh = 192.168.32.11, mt = 1316413247 | dst = 192.168.24.65/26, nh = 192.168.23.163, mt = 3855574583:192.168.16.144 | 192.168.79.53 | 192.168.237.155:sear4.foo4.bar | sear4.foo3.bar | sear4.foo1.bar:192.168.211.91 | 192.168.58.182 | 192.168.114.97
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-1 = val-1 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-3 = val-3 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-5 = val-5 | dhcp-4-opt-7 = val-7 | dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9
@@ -28351,19 +30326,21 @@ IP6:2001\:a\:\:1c1\:c178\:169f\:2b80/93 | 2001\:a\:\:1f79\:e0fb\:87b9\:3cc6/123:
 DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/4:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
-AP[1]: :wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
+INTERFACE-FLAGS:yes:yes:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
+AP[1]: :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
 IP4::192.168.57.160:dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69:192.168.61.83:sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar:
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-1 = val-1 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-6 = val-6 | dhcp-4-opt-7 = val-7 | dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9
 IP6:2001\:a\:\:fa05\:2ab4\:9300\:e8fe/116 | 2001\:a\:\:e9cf\:bd3\:caba\:99b3/86 | 2001\:a\:\:2be6\:44fa\:2c95\:5559/78:2001\:a\:\:4d70\:d91a\:770f\:2319:dst = 2001\:a\:\:3cb2\:719d\:bb00\:b22f/66, nh = 2001\:a\:\:81b1\:58b9\:7237\:3511, mt = 2280277732 | dst = 2001\:a\:\:986f\:983c\:5eb\:1c7d/99, nh = \:\:, mt = 1204008676:2001\:a\:\:85e7\:3d7d\:53e8\:50ac | 2001\:a\:\:1c5\:9cb5\:e86d\:25a5:sear6.foo4.bar | sear6.foo2.bar
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/5:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
+INTERFACE-FLAGS:yes:yes:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
 IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551:192.168.107.109:sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar:192.168.60.60 | 192.168.63.92
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-5 = val-5
 IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0/85, nh = \:\:, mt = 2821465568 | dst = 2001\:a\:\:a976\:2488\:f49f\:b48/106, nh = 2001\:a\:\:62ae\:c734\:fc7b\:e931, mt = 2248613879 | dst = 2001\:a\:\:afb7\:4449\:3787\:8bb4/123, nh = \:\::2001\:a\:\:2934\:bd66\:550d\:ec19:sear6.fo.x.y
@@ -28371,27 +30348,29 @@ DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 6701
-location: clients/tests/test-client.py:test_004()/568
+size: 7183
+location: clients/tests/test-client.py:test_004()/590
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6524 bytes
+stdout: 7006 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
-AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+INTERFACE-FLAGS:yes:yes:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
 DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:eth0:ethernet:NMDeviceEthernet:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown
+GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::AB\:B7\:BF\:E2\:48\:E8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
+INTERFACE-FLAGS:yes:yes:no
 WIRED-PROPERTIES:off:
 IP4:192.168.49.34/22 | 192.168.135.86/19:::192.168.45.230 | 192.168.180.201 | 192.168.253.2:sear4.foo2.bar | sear4.foo1.bar:192.168.163.23 | 192.168.151.246
 DHCP4:dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9
@@ -28399,8 +30378,9 @@ IP6:2001\:a\:\:ed81\:3d7\:c2e9\:df82/99:::2001\:a\:\:2703\:f06\:9619\:d89f | 200
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:eth1:ethernet:NMDeviceEthernet:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown
+GENERAL:eth1:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/2:::virtual:::E7\:78\:B1\:93\:2B\:22:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:100 Mb/s:no:no
+INTERFACE-FLAGS:yes:yes:no
 WIRED-PROPERTIES:off:
 IP4:192.168.127.210/25:192.168.88.4:dst = 192.168.222.35/19, nh = 192.168.170.142, mt = 3609264321 | dst = 192.168.135.81/32, nh = 192.168.32.11, mt = 1316413247 | dst = 192.168.24.65/26, nh = 192.168.23.163, mt = 3855574583:192.168.16.144 | 192.168.79.53 | 192.168.237.155:sear4.foo4.bar | sear4.foo3.bar | sear4.foo1.bar:192.168.211.91 | 192.168.58.182 | 192.168.114.97
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-1 = val-1 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-3 = val-3 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-5 = val-5 | dhcp-4-opt-7 = val-7 | dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9
@@ -28408,19 +30388,21 @@ IP6:2001\:a\:\:1c1\:c178\:169f\:2b80/93 | 2001\:a\:\:1f79\:e0fb\:87b9\:3cc6/123:
 DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/4:::virtual:::21\:E9\:64\:81\:8C\:A8:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
-AP[1]: :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
+INTERFACE-FLAGS:yes:yes:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
+AP[1]: :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
 IP4::192.168.57.160:dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69:192.168.61.83:sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar:
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-1 = val-1 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-6 = val-6 | dhcp-4-opt-7 = val-7 | dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9
 IP6:2001\:a\:\:fa05\:2ab4\:9300\:e8fe/116 | 2001\:a\:\:e9cf\:bd3\:caba\:99b3/86 | 2001\:a\:\:2be6\:44fa\:2c95\:5559/78:2001\:a\:\:4d70\:d91a\:770f\:2319:dst = 2001\:a\:\:3cb2\:719d\:bb00\:b22f/66, nh = 2001\:a\:\:81b1\:58b9\:7237\:3511, mt = 2280277732 | dst = 2001\:a\:\:986f\:983c\:5eb\:1c7d/99, nh = \:\:, mt = 1204008676:2001\:a\:\:85e7\:3d7d\:53e8\:50ac | 2001\:a\:\:1c5\:9cb5\:e86d\:25a5:sear6.foo4.bar | sear6.foo2.bar
 DHCP6:dhcp-6-opt-0 = val-0 | dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-6-opt-4 = val-4 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp-6-opt-9 = val-9
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
-GENERAL:wlan1:wifi:NMDeviceWifi:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
+GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/5:::virtual:::71\:52\:AD\:63\:5C\:7C:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan1::no:yes:yes:no:no:::::unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
+INTERFACE-FLAGS:yes:yes:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
 IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551:192.168.107.109:sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar:192.168.60.60 | 192.168.63.92
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-5 = val-5
 IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0/85, nh = \:\:, mt = 2821465568 | dst = 2001\:a\:\:a976\:2488\:f49f\:b48/106, nh = 2001\:a\:\:62ae\:c734\:fc7b\:e931, mt = 2248613879 | dst = 2001\:a\:\:afb7\:4449\:3787\:8bb4/123, nh = \:\::2001\:a\:\:2934\:bd66\:550d\:ec19:sear6.fo.x.y
@@ -28429,7 +30411,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1
 
 <<<
 size: 611
-location: clients/tests/test-client.py:test_004()/569
+location: clients/tests/test-client.py:test_004()/591
 cmd: $NMCLI --mode tabular --terse --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -28447,7 +30429,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se
 
 <<<
 size: 621
-location: clients/tests/test-client.py:test_004()/570
+location: clients/tests/test-client.py:test_004()/592
 cmd: $NMCLI --mode tabular --terse --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28464,19 +30446,20 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
 
 <<<
-size: 1608
-location: clients/tests/test-client.py:test_004()/571
+size: 1776
+location: clients/tests/test-client.py:test_004()/593
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 1435 bytes
+stdout: 1603 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
-AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+INTERFACE-FLAGS:yes:yes:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -28484,19 +30467,20 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1645
-location: clients/tests/test-client.py:test_004()/572
+size: 1813
+location: clients/tests/test-client.py:test_004()/594
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1462 bytes
+stdout: 1630 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
-AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+INTERFACE-FLAGS:yes:yes:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -28504,56 +30488,56 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 575
-location: clients/tests/test-client.py:test_004()/573
+size: 620
+location: clients/tests/test-client.py:test_004()/595
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 368 bytes
+stdout: 413 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 13\:E0\:74\:85\:7C\:D9
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
 
 <<<
-size: 585
-location: clients/tests/test-client.py:test_004()/574
+size: 630
+location: clients/tests/test-client.py:test_004()/596
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 368 bytes
+stdout: 413 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 13\:E0\:74\:85\:7C\:D9
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
 
 <<<
-size: 575
-location: clients/tests/test-client.py:test_004()/575
+size: 620
+location: clients/tests/test-client.py:test_004()/597
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 368 bytes
+stdout: 413 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 13\:E0\:74\:85\:7C\:D9
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
 
 <<<
-size: 585
-location: clients/tests/test-client.py:test_004()/576
+size: 630
+location: clients/tests/test-client.py:test_004()/598
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 368 bytes
+stdout: 413 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 13\:E0\:74\:85\:7C\:D9
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
 
 <<<
 size: 570
-location: clients/tests/test-client.py:test_004()/577
+location: clients/tests/test-client.py:test_004()/599
 cmd: $NMCLI --mode tabular --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -28567,7 +30551,7 @@ stdout: 391 bytes
 
 <<<
 size: 580
-location: clients/tests/test-client.py:test_004()/578
+location: clients/tests/test-client.py:test_004()/600
 cmd: $NMCLI --mode tabular --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28581,7 +30565,7 @@ stdout: 391 bytes
 
 <<<
 size: 1721
-location: clients/tests/test-client.py:test_004()/579
+location: clients/tests/test-client.py:test_004()/601
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list
 lang: C
 returncode: 0
@@ -28596,7 +30580,7 @@ stdout: 1546 bytes
 
 <<<
 size: 1779
-location: clients/tests/test-client.py:test_004()/580
+location: clients/tests/test-client.py:test_004()/602
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28610,38 +30594,38 @@ stdout: 1594 bytes
 
 
 <<<
-size: 653
-location: clients/tests/test-client.py:test_004()/581
+size: 781
+location: clients/tests/test-client.py:test_004()/603
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 476 bytes
+stdout: 604 bytes
 >>>
- :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
- :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+ :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 
- :wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
+ :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
 
 
 <<<
-size: 699
-location: clients/tests/test-client.py:test_004()/582
+size: 827
+location: clients/tests/test-client.py:test_004()/604
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 512 bytes
+stdout: 640 bytes
 >>>
- :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
- :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
- :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+ :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 
- :wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
+ :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
 
 
 <<<
 size: 1834
-location: clients/tests/test-client.py:test_004()/583
+location: clients/tests/test-client.py:test_004()/605
 cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -28656,7 +30640,7 @@ stdout: 1546 bytes
 
 <<<
 size: 1892
-location: clients/tests/test-client.py:test_004()/584
+location: clients/tests/test-client.py:test_004()/606
 cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28671,7 +30655,7 @@ stdout: 1594 bytes
 
 <<<
 size: 608
-location: clients/tests/test-client.py:test_004()/585
+location: clients/tests/test-client.py:test_004()/607
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -28683,7 +30667,7 @@ stdout: 410 bytes
 
 <<<
 size: 630
-location: clients/tests/test-client.py:test_004()/586
+location: clients/tests/test-client.py:test_004()/608
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28694,32 +30678,32 @@ stdout: 422 bytes
 
 
 <<<
-size: 324
-location: clients/tests/test-client.py:test_004()/587
+size: 356
+location: clients/tests/test-client.py:test_004()/609
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 123 bytes
+stdout: 155 bytes
 >>>
- :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
 
 
 
 <<<
-size: 343
-location: clients/tests/test-client.py:test_004()/588
+size: 375
+location: clients/tests/test-client.py:test_004()/610
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 132 bytes
+stdout: 164 bytes
 >>>
- :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
 
 
 
 <<<
 size: 721
-location: clients/tests/test-client.py:test_004()/589
+location: clients/tests/test-client.py:test_004()/611
 cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -28731,7 +30715,7 @@ stdout: 410 bytes
 
 <<<
 size: 743
-location: clients/tests/test-client.py:test_004()/590
+location: clients/tests/test-client.py:test_004()/612
 cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28742,19 +30726,20 @@ stdout: 422 bytes
 
 
 <<<
-size: 1611
-location: clients/tests/test-client.py:test_004()/591
+size: 1779
+location: clients/tests/test-client.py:test_004()/613
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 1435 bytes
+stdout: 1603 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
-AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+INTERFACE-FLAGS:yes:yes:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -28762,19 +30747,20 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1648
-location: clients/tests/test-client.py:test_004()/592
+size: 1816
+location: clients/tests/test-client.py:test_004()/614
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1462 bytes
+stdout: 1630 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
-AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+INTERFACE-FLAGS:yes:yes:no
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -28783,7 +30769,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1
 
 <<<
 size: 624
-location: clients/tests/test-client.py:test_004()/593
+location: clients/tests/test-client.py:test_004()/615
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -28801,7 +30787,7 @@ IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::se
 
 <<<
 size: 634
-location: clients/tests/test-client.py:test_004()/594
+location: clients/tests/test-client.py:test_004()/616
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28818,19 +30804,19 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
 
 <<<
-size: 1749
-location: clients/tests/test-client.py:test_004()/595
+size: 1890
+location: clients/tests/test-client.py:test_004()/617
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 1435 bytes
+stdout: 1576 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
-AP[1]: :wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
-AP[3]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -28838,19 +30824,19 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1786
-location: clients/tests/test-client.py:test_004()/596
+size: 1927
+location: clients/tests/test-client.py:test_004()/618
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1462 bytes
+stdout: 1603 bytes
 >>>
-GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
+GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavailable):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
-AP[1]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
-AP[3]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no:no
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar:192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar
@@ -28859,7 +30845,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1
 
 <<<
 size: 639
-location: clients/tests/test-client.py:test_004()/597
+location: clients/tests/test-client.py:test_004()/619
 cmd: $NMCLI --mode tabular --terse --color yes dev lldp list ifname eth0
 lang: C
 returncode: 0
@@ -28871,7 +30857,7 @@ eth0:00\:11\:22\:33\:44\:22:port1:GigabitEthernet #3:test3.example.com:Test syst
 
 <<<
 size: 649
-location: clients/tests/test-client.py:test_004()/598
+location: clients/tests/test-client.py:test_004()/620
 cmd: $NMCLI --mode tabular --terse --color yes dev lldp list ifname eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -28882,12 +30868,60 @@ eth0:chassis1:44\:44\:44\:44\:44\:44:GigabitEthernet #2:test2.example.com:Test s
 eth0:00\:11\:22\:33\:44\:22:port1:GigabitEthernet #3:test3.example.com:Test system #3:40 (wlan-access-point,telephone)
 
 <<<
-size: 4745
-location: clients/tests/test-client.py:test_004()/599
+size: 569
+location: clients/tests/test-client.py:test_004()/621
+cmd: $NMCLI --mode tabular --terse --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: C
+returncode: 0
+stdout: 176 bytes
+>>>
+con-1
+5fcfd6d7-1e63-3332-8826-a7eda103792d
+802-3-ethernet
+
+
+con-vpn-1
+UUID-con-vpn-1-REPLACED-REPLACED-REP
+vpn
+
+
+
+con-xx1
+UUID-con-xx1-REPLACED-REPLACED-REPLA
+802-11-wireless
+
+
+<<<
+size: 579
+location: clients/tests/test-client.py:test_004()/622
+cmd: $NMCLI --mode tabular --terse --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 176 bytes
+>>>
+con-1
+5fcfd6d7-1e63-3332-8826-a7eda103792d
+802-3-ethernet
+
+
+con-vpn-1
+UUID-con-vpn-1-REPLACED-REPLACED-REP
+vpn
+
+
+
+con-xx1
+UUID-con-xx1-REPLACED-REPLACED-REPLA
+802-11-wireless
+
+
+<<<
+size: 4976
+location: clients/tests/test-client.py:test_004()/623
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4596 bytes
+stdout: 4827 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -28927,10 +30961,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -28952,8 +30988,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -28968,6 +31006,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -28987,12 +31026,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4775
-location: clients/tests/test-client.py:test_004()/600
+size: 5006
+location: clients/tests/test-client.py:test_004()/624
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4616 bytes
+stdout: 4847 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -29032,10 +31071,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -29057,8 +31098,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -29073,6 +31116,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -29092,12 +31136,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4745
-location: clients/tests/test-client.py:test_004()/601
+size: 4976
+location: clients/tests/test-client.py:test_004()/625
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4596 bytes
+stdout: 4827 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -29137,10 +31181,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -29162,8 +31208,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -29178,6 +31226,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -29197,12 +31246,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4775
-location: clients/tests/test-client.py:test_004()/602
+size: 5006
+location: clients/tests/test-client.py:test_004()/626
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4616 bytes
+stdout: 4847 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -29242,10 +31291,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -29267,8 +31318,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -29283,6 +31336,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -29302,12 +31356,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 3664
-location: clients/tests/test-client.py:test_004()/603
+size: 3852
+location: clients/tests/test-client.py:test_004()/627
 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3508 bytes
+stdout: 3696 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -29347,10 +31401,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -29372,8 +31428,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -29387,12 +31445,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3684
-location: clients/tests/test-client.py:test_004()/604
+size: 3872
+location: clients/tests/test-client.py:test_004()/628
 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3518 bytes
+stdout: 3706 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -29432,10 +31490,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -29457,8 +31517,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -29473,7 +31535,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 489
-location: clients/tests/test-client.py:test_004()/605
+location: clients/tests/test-client.py:test_004()/629
 cmd: $NMCLI --mode multiline -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -29488,7 +31550,7 @@ vpn.timeout:                            0
 
 <<<
 size: 500
-location: clients/tests/test-client.py:test_004()/606
+location: clients/tests/test-client.py:test_004()/630
 cmd: $NMCLI --mode multiline -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -29502,16 +31564,17 @@ vpn.persistent:                         nie
 vpn.timeout:                            0
 
 <<<
-size: 826
-location: clients/tests/test-client.py:test_004()/607
+size: 869
+location: clients/tests/test-client.py:test_004()/631
 cmd: $NMCLI --mode multiline -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 667 bytes
+stdout: 710 bytes
 >>>
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -29523,16 +31586,17 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 839
-location: clients/tests/test-client.py:test_004()/608
+size: 882
+location: clients/tests/test-client.py:test_004()/632
 cmd: $NMCLI --mode multiline -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 670 bytes
+stdout: 713 bytes
 >>>
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -29545,7 +31609,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1081
-location: clients/tests/test-client.py:test_004()/609
+location: clients/tests/test-client.py:test_004()/633
 cmd: $NMCLI --mode multiline dev s
 lang: C
 returncode: 0
@@ -29574,7 +31638,7 @@ CONNECTION:                             --
 
 <<<
 size: 1096
-location: clients/tests/test-client.py:test_004()/610
+location: clients/tests/test-client.py:test_004()/634
 cmd: $NMCLI --mode multiline dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -29603,7 +31667,7 @@ CONNECTION:                             --
 
 <<<
 size: 2496
-location: clients/tests/test-client.py:test_004()/611
+location: clients/tests/test-client.py:test_004()/635
 cmd: $NMCLI --mode multiline -f all dev status
 lang: C
 returncode: 0
@@ -29657,7 +31721,7 @@ CON-PATH:                               --
 
 <<<
 size: 2521
-location: clients/tests/test-client.py:test_004()/612
+location: clients/tests/test-client.py:test_004()/636
 cmd: $NMCLI --mode multiline -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -29711,7 +31775,7 @@ CON-PATH:                               --
 
 <<<
 size: 8060
-location: clients/tests/test-client.py:test_004()/613
+location: clients/tests/test-client.py:test_004()/637
 cmd: $NMCLI --mode multiline dev show
 lang: C
 returncode: 0
@@ -29857,7 +31921,7 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
 size: 8091
-location: clients/tests/test-client.py:test_004()/614
+location: clients/tests/test-client.py:test_004()/638
 cmd: $NMCLI --mode multiline dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -30002,16 +32066,17 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
-size: 20802
-location: clients/tests/test-client.py:test_004()/615
+size: 22228
+location: clients/tests/test-client.py:test_004()/639
 cmd: $NMCLI --mode multiline -f all dev show
 lang: C
 returncode: 0
-stdout: 20652 bytes
+stdout: 22078 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -30039,6 +32104,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -30049,7 +32117,9 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -30058,6 +32128,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -30066,6 +32137,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -30105,6 +32177,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -30132,6 +32205,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIRED-PROPERTIES.CARRIER:               off
 IP4.ADDRESS[1]:                         192.168.49.34/22
 IP4.ADDRESS[2]:                         192.168.135.86/19
@@ -30168,6 +32244,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -30195,6 +32272,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIRED-PROPERTIES.CARRIER:               off
 IP4.ADDRESS[1]:                         192.168.127.210/25
 IP4.GATEWAY:                            192.168.88.4
@@ -30238,6 +32318,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -30265,6 +32346,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -30275,7 +32359,9 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 AP[1].IN-USE:                            
+AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -30327,6 +32413,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -30354,6 +32441,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -30364,6 +32454,7 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
 IP4.GATEWAY:                            --
@@ -30394,16 +32485,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 20955
-location: clients/tests/test-client.py:test_004()/616
+size: 22389
+location: clients/tests/test-client.py:test_004()/640
 cmd: $NMCLI --mode multiline -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 20795 bytes
+stdout: 22229 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -30431,6 +32523,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -30441,7 +32536,9 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -30450,6 +32547,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -30458,6 +32556,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -30497,6 +32596,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -30524,6 +32624,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIRED-PROPERTIES.CARRIER:               wyłączone
 IP4.ADDRESS[1]:                         192.168.49.34/22
 IP4.ADDRESS[2]:                         192.168.135.86/19
@@ -30560,6 +32663,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -30587,6 +32691,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIRED-PROPERTIES.CARRIER:               wyłączone
 IP4.ADDRESS[1]:                         192.168.127.210/25
 IP4.GATEWAY:                            192.168.88.4
@@ -30630,6 +32737,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -30657,6 +32765,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -30667,7 +32778,9 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 AP[1].IN-USE:                            
+AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -30719,6 +32832,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -30746,6 +32860,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -30756,6 +32873,7 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
 IP4.GATEWAY:                            --
@@ -30787,7 +32905,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1511
-location: clients/tests/test-client.py:test_004()/617
+location: clients/tests/test-client.py:test_004()/641
 cmd: $NMCLI --mode multiline dev show wlan0
 lang: C
 returncode: 0
@@ -30820,7 +32938,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1522
-location: clients/tests/test-client.py:test_004()/618
+location: clients/tests/test-client.py:test_004()/642
 cmd: $NMCLI --mode multiline dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -30852,16 +32970,17 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 4903
-location: clients/tests/test-client.py:test_004()/619
+size: 5333
+location: clients/tests/test-client.py:test_004()/643
 cmd: $NMCLI --mode multiline -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4748 bytes
+stdout: 5178 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -30889,6 +33008,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -30899,7 +33021,9 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -30908,6 +33032,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -30916,6 +33041,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -30953,16 +33079,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 4959
-location: clients/tests/test-client.py:test_004()/620
+size: 5391
+location: clients/tests/test-client.py:test_004()/644
 cmd: $NMCLI --mode multiline -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4794 bytes
+stdout: 5226 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -30990,6 +33117,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -31000,7 +33130,9 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -31009,6 +33141,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -31017,6 +33150,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -31054,16 +33188,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2016
-location: clients/tests/test-client.py:test_004()/621
+size: 2141
+location: clients/tests/test-client.py:test_004()/645
 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1826 bytes
+stdout: 1951 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -31098,18 +33233,20 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 
 <<<
-size: 2041
-location: clients/tests/test-client.py:test_004()/622
+size: 2167
+location: clients/tests/test-client.py:test_004()/646
 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1841 bytes
+stdout: 1967 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -31144,18 +33281,20 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 
 <<<
-size: 2016
-location: clients/tests/test-client.py:test_004()/623
+size: 2141
+location: clients/tests/test-client.py:test_004()/647
 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1826 bytes
+stdout: 1951 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -31190,18 +33329,20 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 
 <<<
-size: 2041
-location: clients/tests/test-client.py:test_004()/624
+size: 2167
+location: clients/tests/test-client.py:test_004()/648
 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1841 bytes
+stdout: 1967 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -31236,10 +33377,11 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 
 <<<
 size: 1032
-location: clients/tests/test-client.py:test_004()/625
+location: clients/tests/test-client.py:test_004()/649
 cmd: $NMCLI --mode multiline -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -31263,7 +33405,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/
 
 <<<
 size: 1042
-location: clients/tests/test-client.py:test_004()/626
+location: clients/tests/test-client.py:test_004()/650
 cmd: $NMCLI --mode multiline -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -31287,7 +33429,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/
 
 <<<
 size: 3791
-location: clients/tests/test-client.py:test_004()/627
+location: clients/tests/test-client.py:test_004()/651
 cmd: $NMCLI --mode multiline -f ALL device wifi list
 lang: C
 returncode: 0
@@ -31366,7 +33508,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 <<<
 size: 3849
-location: clients/tests/test-client.py:test_004()/628
+location: clients/tests/test-client.py:test_004()/652
 cmd: $NMCLI --mode multiline -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -31444,14 +33586,15 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 1628
-location: clients/tests/test-client.py:test_004()/629
+size: 1860
+location: clients/tests/test-client.py:test_004()/653
 cmd: $NMCLI --mode multiline -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 1468 bytes
+stdout: 1700 bytes
 >>>
 IN-USE:                                  
+BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infra
 CHAN:                                   1
@@ -31460,6 +33603,7 @@ SIGNAL:                                 92
 BARS:                                   ****
 SECURITY:                               WPA1 WPA2
 IN-USE:                                  
+BSSID:                                  61:95:77:AC:1E:4C
 SSID:                                   wlan0-ap-1
 MODE:                                   Infra
 CHAN:                                   1
@@ -31468,6 +33612,7 @@ SIGNAL:                                 81
 BARS:                                   ****
 SECURITY:                               WPA1
 IN-USE:                                  
+BSSID:                                  9B:F6:B7:EC:97:76
 SSID:                                   wlan0-ap-3
 MODE:                                   Infra
 CHAN:                                   1
@@ -31477,6 +33622,7 @@ BARS:                                   **
 SECURITY:                               WPA3
 
 IN-USE:                                  
+BSSID:                                  94:2B:E8:F6:D2:86
 SSID:                                   wlan1-ap-4
 MODE:                                   Infra
 CHAN:                                   1
@@ -31487,14 +33633,15 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 1674
-location: clients/tests/test-client.py:test_004()/630
+size: 1906
+location: clients/tests/test-client.py:test_004()/654
 cmd: $NMCLI --mode multiline -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1504 bytes
+stdout: 1736 bytes
 >>>
 IN-USE:                                  
+BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infrastruktura
 CHAN:                                   1
@@ -31503,6 +33650,7 @@ SIGNAL:                                 92
 BARS:                                   ****
 SECURITY:                               WPA1 WPA2
 IN-USE:                                  
+BSSID:                                  61:95:77:AC:1E:4C
 SSID:                                   wlan0-ap-1
 MODE:                                   Infrastruktura
 CHAN:                                   1
@@ -31511,6 +33659,7 @@ SIGNAL:                                 81
 BARS:                                   ****
 SECURITY:                               WPA1
 IN-USE:                                  
+BSSID:                                  9B:F6:B7:EC:97:76
 SSID:                                   wlan0-ap-3
 MODE:                                   Infrastruktura
 CHAN:                                   1
@@ -31520,6 +33669,7 @@ BARS:                                   **
 SECURITY:                               WPA3
 
 IN-USE:                                  
+BSSID:                                  94:2B:E8:F6:D2:86
 SSID:                                   wlan1-ap-4
 MODE:                                   Infrastruktura
 CHAN:                                   1
@@ -31531,7 +33681,7 @@ SECURITY:                               WPA1 WPA2
 
 <<<
 size: 3904
-location: clients/tests/test-client.py:test_004()/631
+location: clients/tests/test-client.py:test_004()/655
 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -31610,7 +33760,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 <<<
 size: 3962
-location: clients/tests/test-client.py:test_004()/632
+location: clients/tests/test-client.py:test_004()/656
 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -31689,7 +33839,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 <<<
 size: 1112
-location: clients/tests/test-client.py:test_004()/633
+location: clients/tests/test-client.py:test_004()/657
 cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -31717,7 +33867,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 <<<
 size: 1134
-location: clients/tests/test-client.py:test_004()/634
+location: clients/tests/test-client.py:test_004()/658
 cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -31744,14 +33894,15 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 554
-location: clients/tests/test-client.py:test_004()/635
+size: 612
+location: clients/tests/test-client.py:test_004()/659
 cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 371 bytes
+stdout: 429 bytes
 >>>
 IN-USE:                                  
+BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infra
 CHAN:                                   1
@@ -31763,14 +33914,15 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 573
-location: clients/tests/test-client.py:test_004()/636
+size: 631
+location: clients/tests/test-client.py:test_004()/660
 cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 380 bytes
+stdout: 438 bytes
 >>>
 IN-USE:                                  
+BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infrastruktura
 CHAN:                                   1
@@ -31783,7 +33935,7 @@ SECURITY:                               WPA1 WPA2
 
 <<<
 size: 1225
-location: clients/tests/test-client.py:test_004()/637
+location: clients/tests/test-client.py:test_004()/661
 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -31811,7 +33963,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 <<<
 size: 1247
-location: clients/tests/test-client.py:test_004()/638
+location: clients/tests/test-client.py:test_004()/662
 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -31838,16 +33990,17 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 4906
-location: clients/tests/test-client.py:test_004()/639
+size: 5336
+location: clients/tests/test-client.py:test_004()/663
 cmd: $NMCLI --mode multiline -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4748 bytes
+stdout: 5178 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -31875,6 +34028,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -31885,7 +34041,9 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -31894,6 +34052,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -31902,6 +34061,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -31939,16 +34099,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 4962
-location: clients/tests/test-client.py:test_004()/640
+size: 5394
+location: clients/tests/test-client.py:test_004()/664
 cmd: $NMCLI --mode multiline -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4794 bytes
+stdout: 5226 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -31976,6 +34137,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -31986,7 +34150,9 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -31995,6 +34161,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -32003,6 +34170,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -32041,7 +34209,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1524
-location: clients/tests/test-client.py:test_004()/641
+location: clients/tests/test-client.py:test_004()/665
 cmd: $NMCLI --mode multiline -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -32074,7 +34242,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1535
-location: clients/tests/test-client.py:test_004()/642
+location: clients/tests/test-client.py:test_004()/666
 cmd: $NMCLI --mode multiline -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -32106,16 +34274,17 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5044
-location: clients/tests/test-client.py:test_004()/643
+size: 5343
+location: clients/tests/test-client.py:test_004()/667
 cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 4748 bytes
+stdout: 5047 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -32153,7 +34322,9 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -32162,6 +34333,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -32170,6 +34342,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -32207,16 +34380,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5100
-location: clients/tests/test-client.py:test_004()/644
+size: 5400
+location: clients/tests/test-client.py:test_004()/668
 cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4794 bytes
+stdout: 5094 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -32254,7 +34428,9 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -32263,6 +34439,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -32271,6 +34448,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -32309,7 +34487,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1447
-location: clients/tests/test-client.py:test_004()/645
+location: clients/tests/test-client.py:test_004()/669
 cmd: $NMCLI --mode multiline dev lldp list ifname eth0
 lang: C
 returncode: 0
@@ -32339,7 +34517,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 
 <<<
 size: 1457
-location: clients/tests/test-client.py:test_004()/646
+location: clients/tests/test-client.py:test_004()/670
 cmd: $NMCLI --mode multiline dev lldp list ifname eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -32368,12 +34546,60 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION:         Test system #3
 NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 
 <<<
-size: 4757
-location: clients/tests/test-client.py:test_004()/647
+size: 1079
+location: clients/tests/test-client.py:test_004()/671
+cmd: $NMCLI --mode multiline -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: C
+returncode: 0
+stdout: 704 bytes
+>>>
+connection.id:                          con-1
+connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
+connection.type:                        802-3-ethernet
+connection.interface-name:              --
+
+connection.id:                          con-vpn-1
+connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
+connection.type:                        vpn
+connection.interface-name:              --
+vpn.user-name:                          --
+
+connection.id:                          con-xx1
+connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
+connection.type:                        802-11-wireless
+connection.interface-name:              --
+
+<<<
+size: 1089
+location: clients/tests/test-client.py:test_004()/672
+cmd: $NMCLI --mode multiline -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 704 bytes
+>>>
+connection.id:                          con-1
+connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
+connection.type:                        802-3-ethernet
+connection.interface-name:              --
+
+connection.id:                          con-vpn-1
+connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
+connection.type:                        vpn
+connection.interface-name:              --
+vpn.user-name:                          --
+
+connection.id:                          con-xx1
+connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
+connection.type:                        802-11-wireless
+connection.interface-name:              --
+
+<<<
+size: 4988
+location: clients/tests/test-client.py:test_004()/673
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4596 bytes
+stdout: 4827 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -32413,10 +34639,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -32438,8 +34666,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -32454,6 +34684,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -32473,12 +34704,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4787
-location: clients/tests/test-client.py:test_004()/648
+size: 5018
+location: clients/tests/test-client.py:test_004()/674
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4616 bytes
+stdout: 4847 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -32518,10 +34749,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -32543,8 +34776,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -32559,6 +34794,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -32578,12 +34814,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4757
-location: clients/tests/test-client.py:test_004()/649
+size: 4988
+location: clients/tests/test-client.py:test_004()/675
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4596 bytes
+stdout: 4827 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -32623,10 +34859,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -32648,8 +34886,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -32664,6 +34904,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -32683,12 +34924,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4787
-location: clients/tests/test-client.py:test_004()/650
+size: 5018
+location: clients/tests/test-client.py:test_004()/676
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4616 bytes
+stdout: 4847 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -32728,10 +34969,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -32753,8 +34996,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -32769,6 +35014,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -32788,12 +35034,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 3676
-location: clients/tests/test-client.py:test_004()/651
+size: 3864
+location: clients/tests/test-client.py:test_004()/677
 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3508 bytes
+stdout: 3696 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -32833,10 +35079,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -32858,8 +35106,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -32873,12 +35123,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3696
-location: clients/tests/test-client.py:test_004()/652
+size: 3884
+location: clients/tests/test-client.py:test_004()/678
 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3518 bytes
+stdout: 3706 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -32918,10 +35168,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -32943,8 +35195,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
 vpn.user-name:                          --
@@ -32959,7 +35213,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 501
-location: clients/tests/test-client.py:test_004()/653
+location: clients/tests/test-client.py:test_004()/679
 cmd: $NMCLI --mode multiline --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -32974,7 +35228,7 @@ vpn.timeout:                            0
 
 <<<
 size: 512
-location: clients/tests/test-client.py:test_004()/654
+location: clients/tests/test-client.py:test_004()/680
 cmd: $NMCLI --mode multiline --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -32988,16 +35242,17 @@ vpn.persistent:                         nie
 vpn.timeout:                            0
 
 <<<
-size: 838
-location: clients/tests/test-client.py:test_004()/655
+size: 881
+location: clients/tests/test-client.py:test_004()/681
 cmd: $NMCLI --mode multiline --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 667 bytes
+stdout: 710 bytes
 >>>
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -33009,16 +35264,17 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 851
-location: clients/tests/test-client.py:test_004()/656
+size: 894
+location: clients/tests/test-client.py:test_004()/682
 cmd: $NMCLI --mode multiline --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 670 bytes
+stdout: 713 bytes
 >>>
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -33031,7 +35287,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1254
-location: clients/tests/test-client.py:test_004()/657
+location: clients/tests/test-client.py:test_004()/683
 cmd: $NMCLI --mode multiline --color yes dev s
 lang: C
 returncode: 0
@@ -33060,7 +35316,7 @@ CONNECTION:                             --
 
 <<<
 size: 1269
-location: clients/tests/test-client.py:test_004()/658
+location: clients/tests/test-client.py:test_004()/684
 cmd: $NMCLI --mode multiline --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -33089,7 +35345,7 @@ CONNECTION:                             --
 
 <<<
 size: 2868
-location: clients/tests/test-client.py:test_004()/659
+location: clients/tests/test-client.py:test_004()/685
 cmd: $NMCLI --mode multiline --color yes -f all dev status
 lang: C
 returncode: 0
@@ -33143,7 +35399,7 @@ CON-PATH:                               --
 
 <<<
 size: 2893
-location: clients/tests/test-client.py:test_004()/660
+location: clients/tests/test-client.py:test_004()/686
 cmd: $NMCLI --mode multiline --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -33197,7 +35453,7 @@ CON-PATH:                               --
 
 <<<
 size: 8072
-location: clients/tests/test-client.py:test_004()/661
+location: clients/tests/test-client.py:test_004()/687
 cmd: $NMCLI --mode multiline --color yes dev show
 lang: C
 returncode: 0
@@ -33343,7 +35599,7 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
 size: 8103
-location: clients/tests/test-client.py:test_004()/662
+location: clients/tests/test-client.py:test_004()/688
 cmd: $NMCLI --mode multiline --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -33488,16 +35744,17 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
-size: 21102
-location: clients/tests/test-client.py:test_004()/663
+size: 22564
+location: clients/tests/test-client.py:test_004()/689
 cmd: $NMCLI --mode multiline --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 20940 bytes
+stdout: 22402 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -33525,6 +35782,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -33535,7 +35795,9 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -33544,6 +35806,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -33552,6 +35815,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -33591,6 +35855,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -33618,6 +35883,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIRED-PROPERTIES.CARRIER:               off
 IP4.ADDRESS[1]:                         192.168.49.34/22
 IP4.ADDRESS[2]:                         192.168.135.86/19
@@ -33654,6 +35922,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -33681,6 +35950,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIRED-PROPERTIES.CARRIER:               off
 IP4.ADDRESS[1]:                         192.168.127.210/25
 IP4.GATEWAY:                            192.168.88.4
@@ -33724,6 +35996,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -33751,6 +36024,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -33761,7 +36037,9 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 AP[1].IN-USE:                            
+AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -33813,6 +36091,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -33840,6 +36119,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -33850,6 +36132,7 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
 IP4.GATEWAY:                            --
@@ -33880,16 +36163,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 21255
-location: clients/tests/test-client.py:test_004()/664
+size: 22725
+location: clients/tests/test-client.py:test_004()/690
 cmd: $NMCLI --mode multiline --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 21083 bytes
+stdout: 22553 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -33917,6 +36201,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -33927,7 +36214,9 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -33936,6 +36225,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -33944,6 +36234,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -33983,6 +36274,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -34010,6 +36302,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIRED-PROPERTIES.CARRIER:               wyłączone
 IP4.ADDRESS[1]:                         192.168.49.34/22
 IP4.ADDRESS[2]:                         192.168.135.86/19
@@ -34046,6 +36341,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -34073,6 +36369,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIRED-PROPERTIES.CARRIER:               wyłączone
 IP4.ADDRESS[1]:                         192.168.127.210/25
 IP4.GATEWAY:                            192.168.88.4
@@ -34116,6 +36415,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -34143,6 +36443,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -34153,7 +36456,9 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 AP[1].IN-USE:                            
+AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -34205,6 +36510,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -34232,6 +36538,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -34242,6 +36551,7 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
 IP4.GATEWAY:                            --
@@ -34273,7 +36583,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1523
-location: clients/tests/test-client.py:test_004()/665
+location: clients/tests/test-client.py:test_004()/691
 cmd: $NMCLI --mode multiline --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -34306,7 +36616,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1534
-location: clients/tests/test-client.py:test_004()/666
+location: clients/tests/test-client.py:test_004()/692
 cmd: $NMCLI --mode multiline --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -34338,16 +36648,17 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5131
-location: clients/tests/test-client.py:test_004()/667
+size: 5588
+location: clients/tests/test-client.py:test_004()/693
 cmd: $NMCLI --mode multiline --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4964 bytes
+stdout: 5421 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -34375,6 +36686,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -34385,7 +36699,9 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -34394,6 +36710,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -34402,6 +36719,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -34439,16 +36757,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5187
-location: clients/tests/test-client.py:test_004()/668
+size: 5646
+location: clients/tests/test-client.py:test_004()/694
 cmd: $NMCLI --mode multiline --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5010 bytes
+stdout: 5469 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -34476,6 +36795,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -34486,7 +36808,9 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -34495,6 +36819,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -34503,6 +36828,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -34540,16 +36866,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2028
-location: clients/tests/test-client.py:test_004()/669
+size: 2153
+location: clients/tests/test-client.py:test_004()/695
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1826 bytes
+stdout: 1951 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -34584,18 +36911,20 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 
 <<<
-size: 2053
-location: clients/tests/test-client.py:test_004()/670
+size: 2179
+location: clients/tests/test-client.py:test_004()/696
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1841 bytes
+stdout: 1967 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -34630,18 +36959,20 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 
 <<<
-size: 2028
-location: clients/tests/test-client.py:test_004()/671
+size: 2153
+location: clients/tests/test-client.py:test_004()/697
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1826 bytes
+stdout: 1951 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -34676,18 +37007,20 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 
 <<<
-size: 2053
-location: clients/tests/test-client.py:test_004()/672
+size: 2179
+location: clients/tests/test-client.py:test_004()/698
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1841 bytes
+stdout: 1967 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -34722,10 +37055,11 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 
 <<<
 size: 1164
-location: clients/tests/test-client.py:test_004()/673
+location: clients/tests/test-client.py:test_004()/699
 cmd: $NMCLI --mode multiline --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -34749,7 +37083,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Devi
 
 <<<
 size: 1174
-location: clients/tests/test-client.py:test_004()/674
+location: clients/tests/test-client.py:test_004()/700
 cmd: $NMCLI --mode multiline --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -34773,7 +37107,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Devi
 
 <<<
 size: 4415
-location: clients/tests/test-client.py:test_004()/675
+location: clients/tests/test-client.py:test_004()/701
 cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list
 lang: C
 returncode: 0
@@ -34852,7 +37186,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 <<<
 size: 4473
-location: clients/tests/test-client.py:test_004()/676
+location: clients/tests/test-client.py:test_004()/702
 cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -34930,14 +37264,15 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 1928
-location: clients/tests/test-client.py:test_004()/677
+size: 2196
+location: clients/tests/test-client.py:test_004()/703
 cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 1756 bytes
+stdout: 2024 bytes
 >>>
 IN-USE:                                  
+BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infra
 CHAN:                                   1
@@ -34946,6 +37281,7 @@ SIGNAL:                                 92
 BARS:                                   ****
 SECURITY:                               WPA1 WPA2
 IN-USE:                                  
+BSSID:                                  61:95:77:AC:1E:4C
 SSID:                                   wlan0-ap-1
 MODE:                                   Infra
 CHAN:                                   1
@@ -34954,6 +37290,7 @@ SIGNAL:                                 81
 BARS:                                   ****
 SECURITY:                               WPA1
 IN-USE:                                  
+BSSID:                                  9B:F6:B7:EC:97:76
 SSID:                                   wlan0-ap-3
 MODE:                                   Infra
 CHAN:                                   1
@@ -34963,6 +37300,7 @@ BARS:                                   **  
 SECURITY:                               WPA3
 
 IN-USE:                                  
+BSSID:                                  94:2B:E8:F6:D2:86
 SSID:                                   wlan1-ap-4
 MODE:                                   Infra
 CHAN:                                   1
@@ -34973,14 +37311,15 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 1974
-location: clients/tests/test-client.py:test_004()/678
+size: 2242
+location: clients/tests/test-client.py:test_004()/704
 cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1792 bytes
+stdout: 2060 bytes
 >>>
 IN-USE:                                  
+BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infrastruktura
 CHAN:                                   1
@@ -34989,6 +37328,7 @@ SIGNAL:                                 92
 BARS:                                   ****
 SECURITY:                               WPA1 WPA2
 IN-USE:                                  
+BSSID:                                  61:95:77:AC:1E:4C
 SSID:                                   wlan0-ap-1
 MODE:                                   Infrastruktura
 CHAN:                                   1
@@ -34997,6 +37337,7 @@ SIGNAL:                                 81
 BARS:                                   ****
 SECURITY:                               WPA1
 IN-USE:                                  
+BSSID:                                  9B:F6:B7:EC:97:76
 SSID:                                   wlan0-ap-3
 MODE:                                   Infrastruktura
 CHAN:                                   1
@@ -35006,6 +37347,7 @@ BARS:                                   **  
 SECURITY:                               WPA3
 
 IN-USE:                                  
+BSSID:                                  94:2B:E8:F6:D2:86
 SSID:                                   wlan1-ap-4
 MODE:                                   Infrastruktura
 CHAN:                                   1
@@ -35017,7 +37359,7 @@ SECURITY:                               WPA1 WPA2
 
 <<<
 size: 4528
-location: clients/tests/test-client.py:test_004()/679
+location: clients/tests/test-client.py:test_004()/705
 cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -35096,7 +37438,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 <<<
 size: 4586
-location: clients/tests/test-client.py:test_004()/680
+location: clients/tests/test-client.py:test_004()/706
 cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -35175,7 +37517,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 <<<
 size: 1278
-location: clients/tests/test-client.py:test_004()/681
+location: clients/tests/test-client.py:test_004()/707
 cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -35203,7 +37545,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 <<<
 size: 1300
-location: clients/tests/test-client.py:test_004()/682
+location: clients/tests/test-client.py:test_004()/708
 cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -35230,14 +37572,15 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 638
-location: clients/tests/test-client.py:test_004()/683
+size: 705
+location: clients/tests/test-client.py:test_004()/709
 cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 443 bytes
+stdout: 510 bytes
 >>>
 IN-USE:                                  
+BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infra
 CHAN:                                   1
@@ -35249,14 +37592,15 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 657
-location: clients/tests/test-client.py:test_004()/684
+size: 724
+location: clients/tests/test-client.py:test_004()/710
 cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 452 bytes
+stdout: 519 bytes
 >>>
 IN-USE:                                  
+BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infrastruktura
 CHAN:                                   1
@@ -35269,7 +37613,7 @@ SECURITY:                               WPA1 WPA2
 
 <<<
 size: 1391
-location: clients/tests/test-client.py:test_004()/685
+location: clients/tests/test-client.py:test_004()/711
 cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -35297,7 +37641,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 <<<
 size: 1413
-location: clients/tests/test-client.py:test_004()/686
+location: clients/tests/test-client.py:test_004()/712
 cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -35324,16 +37668,17 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 5134
-location: clients/tests/test-client.py:test_004()/687
+size: 5591
+location: clients/tests/test-client.py:test_004()/713
 cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4964 bytes
+stdout: 5421 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -35361,6 +37706,9 @@ CAPABILITIES.CARRIER-DETECT:            no
 CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -35371,7 +37719,9 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -35380,6 +37730,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -35388,6 +37739,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -35425,16 +37777,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5190
-location: clients/tests/test-client.py:test_004()/688
+size: 5649
+location: clients/tests/test-client.py:test_004()/714
 cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5010 bytes
+stdout: 5469 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -35462,6 +37815,9 @@ CAPABILITIES.CARRIER-DETECT:            nie
 CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -35472,7 +37828,9 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -35481,6 +37839,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -35489,6 +37848,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -35527,7 +37887,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1536
-location: clients/tests/test-client.py:test_004()/689
+location: clients/tests/test-client.py:test_004()/715
 cmd: $NMCLI --mode multiline --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -35560,7 +37920,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 1547
-location: clients/tests/test-client.py:test_004()/690
+location: clients/tests/test-client.py:test_004()/716
 cmd: $NMCLI --mode multiline --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -35592,16 +37952,17 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5272
-location: clients/tests/test-client.py:test_004()/691
+size: 5598
+location: clients/tests/test-client.py:test_004()/717
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 4964 bytes
+stdout: 5290 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -35639,7 +38000,9 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -35648,6 +38011,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -35656,6 +38020,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -35693,16 +38058,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5328
-location: clients/tests/test-client.py:test_004()/692
+size: 5655
+location: clients/tests/test-client.py:test_004()/718
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5010 bytes
+stdout: 5337 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -35740,7 +38106,9 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -35749,6 +38117,7 @@ AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -35757,6 +38126,7 @@ AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -35795,7 +38165,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1459
-location: clients/tests/test-client.py:test_004()/693
+location: clients/tests/test-client.py:test_004()/719
 cmd: $NMCLI --mode multiline --color yes dev lldp list ifname eth0
 lang: C
 returncode: 0
@@ -35825,7 +38195,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 
 <<<
 size: 1469
-location: clients/tests/test-client.py:test_004()/694
+location: clients/tests/test-client.py:test_004()/720
 cmd: $NMCLI --mode multiline --color yes dev lldp list ifname eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -35854,12 +38224,60 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION:         Test system #3
 NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 
 <<<
-size: 5766
-location: clients/tests/test-client.py:test_004()/695
+size: 1091
+location: clients/tests/test-client.py:test_004()/721
+cmd: $NMCLI --mode multiline --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: C
+returncode: 0
+stdout: 704 bytes
+>>>
+connection.id:                          con-1
+connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
+connection.type:                        802-3-ethernet
+connection.interface-name:              --
+
+connection.id:                          con-vpn-1
+connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
+connection.type:                        vpn
+connection.interface-name:              --
+vpn.user-name:                          --
+
+connection.id:                          con-xx1
+connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
+connection.type:                        802-11-wireless
+connection.interface-name:              --
+
+<<<
+size: 1101
+location: clients/tests/test-client.py:test_004()/722
+cmd: $NMCLI --mode multiline --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 704 bytes
+>>>
+connection.id:                          con-1
+connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
+connection.type:                        802-3-ethernet
+connection.interface-name:              --
+
+connection.id:                          con-vpn-1
+connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
+connection.type:                        vpn
+connection.interface-name:              --
+vpn.user-name:                          --
+
+connection.id:                          con-xx1
+connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
+connection.type:                        802-11-wireless
+connection.interface-name:              --
+
+<<<
+size: 5997
+location: clients/tests/test-client.py:test_004()/723
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5608 bytes
+stdout: 5839 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -35903,10 +38321,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -35929,8 +38349,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -35951,6 +38373,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -35972,12 +38395,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5808
-location: clients/tests/test-client.py:test_004()/696
+size: 6039
+location: clients/tests/test-client.py:test_004()/724
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5640 bytes
+stdout: 5871 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -36021,10 +38444,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -36047,8 +38472,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -36069,6 +38496,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -36090,12 +38518,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5766
-location: clients/tests/test-client.py:test_004()/697
+size: 5997
+location: clients/tests/test-client.py:test_004()/725
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5608 bytes
+stdout: 5839 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -36139,10 +38567,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -36165,8 +38595,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -36187,6 +38619,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -36208,12 +38641,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5808
-location: clients/tests/test-client.py:test_004()/698
+size: 6039
+location: clients/tests/test-client.py:test_004()/726
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5640 bytes
+stdout: 5871 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -36257,10 +38690,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -36283,8 +38718,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -36305,6 +38742,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -36326,12 +38764,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 4292
-location: clients/tests/test-client.py:test_004()/699
+size: 4480
+location: clients/tests/test-client.py:test_004()/727
 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4127 bytes
+stdout: 4315 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -36375,10 +38813,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -36401,8 +38841,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -36419,12 +38861,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4317
-location: clients/tests/test-client.py:test_004()/700
+size: 4505
+location: clients/tests/test-client.py:test_004()/728
 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4142 bytes
+stdout: 4330 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -36468,10 +38910,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -36494,8 +38938,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -36513,7 +38959,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 797
-location: clients/tests/test-client.py:test_004()/701
+location: clients/tests/test-client.py:test_004()/729
 cmd: $NMCLI --mode multiline --pretty -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -36532,7 +38978,7 @@ vpn.timeout:                            0
 
 <<<
 size: 813
-location: clients/tests/test-client.py:test_004()/702
+location: clients/tests/test-client.py:test_004()/730
 cmd: $NMCLI --mode multiline --pretty -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -36550,12 +38996,12 @@ vpn.timeout:                            0
 -------------------------------------------------------------------------------
 
 <<<
-size: 1148
-location: clients/tests/test-client.py:test_004()/703
+size: 1192
+location: clients/tests/test-client.py:test_004()/731
 cmd: $NMCLI --mode multiline --pretty -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 980 bytes
+stdout: 1023 bytes
 >>>
 ===============================================================================
       Activate connection details (UUID-con-vpn-1-REPLACED-REPLACED-REP)
@@ -36563,6 +39009,7 @@ stdout: 980 bytes
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -36575,12 +39022,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 1168
-location: clients/tests/test-client.py:test_004()/704
+size: 1212
+location: clients/tests/test-client.py:test_004()/732
 cmd: $NMCLI --mode multiline --pretty -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 990 bytes
+stdout: 1033 bytes
 >>>
 ===============================================================================
     Szczegóły aktywowania połączenia (UUID-con-vpn-1-REPLACED-REPLACED-REP)
@@ -36588,6 +39035,7 @@ stdout: 990 bytes
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -36601,7 +39049,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1700
-location: clients/tests/test-client.py:test_004()/705
+location: clients/tests/test-client.py:test_004()/733
 cmd: $NMCLI --mode multiline --pretty dev s
 lang: C
 returncode: 0
@@ -36638,7 +39086,7 @@ CONNECTION:                             --
 
 <<<
 size: 1715
-location: clients/tests/test-client.py:test_004()/706
+location: clients/tests/test-client.py:test_004()/734
 cmd: $NMCLI --mode multiline --pretty dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -36675,7 +39123,7 @@ CONNECTION:                             --
 
 <<<
 size: 3114
-location: clients/tests/test-client.py:test_004()/707
+location: clients/tests/test-client.py:test_004()/735
 cmd: $NMCLI --mode multiline --pretty -f all dev status
 lang: C
 returncode: 0
@@ -36737,7 +39185,7 @@ CON-PATH:                               --
 
 <<<
 size: 3139
-location: clients/tests/test-client.py:test_004()/708
+location: clients/tests/test-client.py:test_004()/736
 cmd: $NMCLI --mode multiline --pretty -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -36799,7 +39247,7 @@ CON-PATH:                               --
 
 <<<
 size: 12885
-location: clients/tests/test-client.py:test_004()/709
+location: clients/tests/test-client.py:test_004()/737
 cmd: $NMCLI --mode multiline --pretty dev show
 lang: C
 returncode: 0
@@ -37007,7 +39455,7 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
 size: 12949
-location: clients/tests/test-client.py:test_004()/710
+location: clients/tests/test-client.py:test_004()/738
 cmd: $NMCLI --mode multiline --pretty dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -37214,12 +39662,12 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
 <<<
-size: 25386
-location: clients/tests/test-client.py:test_004()/711
+size: 27212
+location: clients/tests/test-client.py:test_004()/739
 cmd: $NMCLI --mode multiline --pretty -f all dev show
 lang: C
 returncode: 0
-stdout: 25227 bytes
+stdout: 27053 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -37227,6 +39675,7 @@ stdout: 25227 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -37256,6 +39705,10 @@ CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -37266,8 +39719,10 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -37277,6 +39732,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -37286,6 +39742,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -37334,6 +39791,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -37363,6 +39821,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               off
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.49.34/22
@@ -37408,6 +39870,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -37437,6 +39900,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               off
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.127.210/25
@@ -37489,6 +39956,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -37518,6 +39986,10 @@ CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -37528,8 +40000,10 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -37590,6 +40064,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -37619,6 +40094,10 @@ CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -37629,6 +40108,7 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
@@ -37665,12 +40145,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 25572
-location: clients/tests/test-client.py:test_004()/712
+size: 27406
+location: clients/tests/test-client.py:test_004()/740
 cmd: $NMCLI --mode multiline --pretty -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 25403 bytes
+stdout: 27237 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -37678,6 +40158,7 @@ stdout: 25403 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -37707,6 +40188,10 @@ CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -37717,8 +40202,10 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -37728,6 +40215,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -37737,6 +40225,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -37785,6 +40274,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -37814,6 +40304,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               wyłączone
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.49.34/22
@@ -37859,6 +40353,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -37888,6 +40383,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               wyłączone
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.127.210/25
@@ -37940,6 +40439,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -37969,6 +40469,10 @@ CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -37979,8 +40483,10 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -38041,6 +40547,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -38070,6 +40577,10 @@ CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -38080,6 +40591,7 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
@@ -38117,7 +40629,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2451
-location: clients/tests/test-client.py:test_004()/713
+location: clients/tests/test-client.py:test_004()/741
 cmd: $NMCLI --mode multiline --pretty dev show wlan0
 lang: C
 returncode: 0
@@ -38162,7 +40674,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2469
-location: clients/tests/test-client.py:test_004()/714
+location: clients/tests/test-client.py:test_004()/742
 cmd: $NMCLI --mode multiline --pretty dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -38206,12 +40718,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6003
-location: clients/tests/test-client.py:test_004()/715
+size: 6513
+location: clients/tests/test-client.py:test_004()/743
 cmd: $NMCLI --mode multiline --pretty -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 5839 bytes
+stdout: 6349 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -38219,6 +40731,7 @@ stdout: 5839 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -38248,6 +40761,10 @@ CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -38258,8 +40775,10 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -38269,6 +40788,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -38278,6 +40798,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -38321,12 +40842,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6066
-location: clients/tests/test-client.py:test_004()/716
+size: 6578
+location: clients/tests/test-client.py:test_004()/744
 cmd: $NMCLI --mode multiline --pretty -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5892 bytes
+stdout: 6404 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -38334,6 +40855,7 @@ stdout: 5892 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -38363,6 +40885,10 @@ CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -38373,8 +40899,10 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -38384,6 +40912,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -38393,6 +40922,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -38436,12 +40966,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 2476
-location: clients/tests/test-client.py:test_004()/717
+size: 2601
+location: clients/tests/test-client.py:test_004()/745
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2277 bytes
+stdout: 2402 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -38449,6 +40979,7 @@ stdout: 2277 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -38485,15 +41016,16 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 
 <<<
-size: 2508
-location: clients/tests/test-client.py:test_004()/718
+size: 2634
+location: clients/tests/test-client.py:test_004()/746
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2299 bytes
+stdout: 2425 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -38501,6 +41033,7 @@ stdout: 2299 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -38537,15 +41070,16 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 
 <<<
-size: 2476
-location: clients/tests/test-client.py:test_004()/719
+size: 2601
+location: clients/tests/test-client.py:test_004()/747
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2277 bytes
+stdout: 2402 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -38553,6 +41087,7 @@ stdout: 2277 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -38589,15 +41124,16 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 
 <<<
-size: 2508
-location: clients/tests/test-client.py:test_004()/720
+size: 2634
+location: clients/tests/test-client.py:test_004()/748
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2299 bytes
+stdout: 2425 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -38605,6 +41141,7 @@ stdout: 2299 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -38641,11 +41178,12 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 
 <<<
 size: 1651
-location: clients/tests/test-client.py:test_004()/721
+location: clients/tests/test-client.py:test_004()/749
 cmd: $NMCLI --mode multiline --pretty -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -38677,7 +41215,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/
 
 <<<
 size: 1661
-location: clients/tests/test-client.py:test_004()/722
+location: clients/tests/test-client.py:test_004()/750
 cmd: $NMCLI --mode multiline --pretty -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -38709,7 +41247,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/
 
 <<<
 size: 4756
-location: clients/tests/test-client.py:test_004()/723
+location: clients/tests/test-client.py:test_004()/751
 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list
 lang: C
 returncode: 0
@@ -38801,7 +41339,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 <<<
 size: 4832
-location: clients/tests/test-client.py:test_004()/724
+location: clients/tests/test-client.py:test_004()/752
 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -38892,17 +41430,18 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 ===============================================================================
 
 <<<
-size: 2593
-location: clients/tests/test-client.py:test_004()/725
+size: 2825
+location: clients/tests/test-client.py:test_004()/753
 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 2424 bytes
+stdout: 2656 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
 ===============================================================================
 IN-USE:                                  
+BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infra
 CHAN:                                   1
@@ -38912,6 +41451,7 @@ BARS:                                   ****
 SECURITY:                               WPA1 WPA2
 -------------------------------------------------------------------------------
 IN-USE:                                  
+BSSID:                                  61:95:77:AC:1E:4C
 SSID:                                   wlan0-ap-1
 MODE:                                   Infra
 CHAN:                                   1
@@ -38921,6 +41461,7 @@ BARS:                                   ****
 SECURITY:                               WPA1
 -------------------------------------------------------------------------------
 IN-USE:                                  
+BSSID:                                  9B:F6:B7:EC:97:76
 SSID:                                   wlan0-ap-3
 MODE:                                   Infra
 CHAN:                                   1
@@ -38934,6 +41475,7 @@ SECURITY:                               WPA3
                             Wi-Fi scan list (wlan1)
 ===============================================================================
 IN-USE:                                  
+BSSID:                                  94:2B:E8:F6:D2:86
 SSID:                                   wlan1-ap-4
 MODE:                                   Infra
 CHAN:                                   1
@@ -38948,17 +41490,18 @@ SECURITY:                               WPA1 WPA2
 ===============================================================================
 
 <<<
-size: 2657
-location: clients/tests/test-client.py:test_004()/726
+size: 2889
+location: clients/tests/test-client.py:test_004()/754
 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2478 bytes
+stdout: 2710 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
 ===============================================================================
 IN-USE:                                  
+BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infrastruktura
 CHAN:                                   1
@@ -38968,6 +41511,7 @@ BARS:                                   ****
 SECURITY:                               WPA1 WPA2
 -------------------------------------------------------------------------------
 IN-USE:                                  
+BSSID:                                  61:95:77:AC:1E:4C
 SSID:                                   wlan0-ap-1
 MODE:                                   Infrastruktura
 CHAN:                                   1
@@ -38977,6 +41521,7 @@ BARS:                                   ****
 SECURITY:                               WPA1
 -------------------------------------------------------------------------------
 IN-USE:                                  
+BSSID:                                  9B:F6:B7:EC:97:76
 SSID:                                   wlan0-ap-3
 MODE:                                   Infrastruktura
 CHAN:                                   1
@@ -38990,6 +41535,7 @@ SECURITY:                               WPA3
                      Lista skanowania sieci Wi-Fi (wlan1)
 ===============================================================================
 IN-USE:                                  
+BSSID:                                  94:2B:E8:F6:D2:86
 SSID:                                   wlan1-ap-4
 MODE:                                   Infrastruktura
 CHAN:                                   1
@@ -39005,7 +41551,7 @@ SECURITY:                               WPA1 WPA2
 
 <<<
 size: 4869
-location: clients/tests/test-client.py:test_004()/727
+location: clients/tests/test-client.py:test_004()/755
 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -39097,7 +41643,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 <<<
 size: 4945
-location: clients/tests/test-client.py:test_004()/728
+location: clients/tests/test-client.py:test_004()/756
 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -39189,7 +41735,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 <<<
 size: 1414
-location: clients/tests/test-client.py:test_004()/729
+location: clients/tests/test-client.py:test_004()/757
 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -39221,7 +41767,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 <<<
 size: 1442
-location: clients/tests/test-client.py:test_004()/730
+location: clients/tests/test-client.py:test_004()/758
 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -39252,17 +41798,18 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 855
-location: clients/tests/test-client.py:test_004()/731
+size: 913
+location: clients/tests/test-client.py:test_004()/759
 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 663 bytes
+stdout: 721 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
 ===============================================================================
 IN-USE:                                  
+BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infra
 CHAN:                                   1
@@ -39275,17 +41822,18 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 880
-location: clients/tests/test-client.py:test_004()/732
+size: 938
+location: clients/tests/test-client.py:test_004()/760
 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 678 bytes
+stdout: 736 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
 ===============================================================================
 IN-USE:                                  
+BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infrastruktura
 CHAN:                                   1
@@ -39299,7 +41847,7 @@ SECURITY:                               WPA1 WPA2
 
 <<<
 size: 1527
-location: clients/tests/test-client.py:test_004()/733
+location: clients/tests/test-client.py:test_004()/761
 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -39331,7 +41879,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 <<<
 size: 1555
-location: clients/tests/test-client.py:test_004()/734
+location: clients/tests/test-client.py:test_004()/762
 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -39362,12 +41910,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 6006
-location: clients/tests/test-client.py:test_004()/735
+size: 6516
+location: clients/tests/test-client.py:test_004()/763
 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 5839 bytes
+stdout: 6349 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -39375,6 +41923,7 @@ stdout: 5839 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -39404,6 +41953,10 @@ CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -39414,8 +41967,10 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -39425,6 +41980,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -39434,6 +41990,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -39477,12 +42034,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6069
-location: clients/tests/test-client.py:test_004()/736
+size: 6581
+location: clients/tests/test-client.py:test_004()/764
 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5892 bytes
+stdout: 6404 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -39490,6 +42047,7 @@ stdout: 5892 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -39519,6 +42077,10 @@ CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -39529,8 +42091,10 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -39540,6 +42104,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -39549,6 +42114,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -39593,7 +42159,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2464
-location: clients/tests/test-client.py:test_004()/737
+location: clients/tests/test-client.py:test_004()/765
 cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -39638,7 +42204,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2482
-location: clients/tests/test-client.py:test_004()/738
+location: clients/tests/test-client.py:test_004()/766
 cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -39682,12 +42248,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6144
-location: clients/tests/test-client.py:test_004()/739
+size: 6443
+location: clients/tests/test-client.py:test_004()/767
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 5839 bytes
+stdout: 6138 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -39695,6 +42261,7 @@ stdout: 5839 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -39734,8 +42301,10 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -39745,6 +42314,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -39754,6 +42324,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -39797,12 +42368,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6207
-location: clients/tests/test-client.py:test_004()/740
+size: 6507
+location: clients/tests/test-client.py:test_004()/768
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5892 bytes
+stdout: 6192 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -39810,6 +42381,7 @@ stdout: 5892 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -39849,8 +42421,10 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -39860,6 +42434,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -39869,6 +42444,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -39913,7 +42489,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1910
-location: clients/tests/test-client.py:test_004()/741
+location: clients/tests/test-client.py:test_004()/769
 cmd: $NMCLI --mode multiline --pretty dev lldp list ifname eth0
 lang: C
 returncode: 0
@@ -39949,7 +42525,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 
 <<<
 size: 1924
-location: clients/tests/test-client.py:test_004()/742
+location: clients/tests/test-client.py:test_004()/770
 cmd: $NMCLI --mode multiline --pretty dev lldp list ifname eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -39984,12 +42560,104 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 -------------------------------------------------------------------------------
 
 <<<
-size: 5778
-location: clients/tests/test-client.py:test_004()/743
+size: 2783
+location: clients/tests/test-client.py:test_004()/771
+cmd: $NMCLI --mode multiline --pretty -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: C
+returncode: 0
+stdout: 2398 bytes
+>>>
+===============================================================================
+                      Connection profile details (con-1)
+===============================================================================
+connection.id:                          con-1
+-------------------------------------------------------------------------------
+connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
+-------------------------------------------------------------------------------
+connection.type:                        802-3-ethernet
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+
+===============================================================================
+                    Connection profile details (con-vpn-1)
+===============================================================================
+connection.id:                          con-vpn-1
+-------------------------------------------------------------------------------
+connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
+-------------------------------------------------------------------------------
+connection.type:                        vpn
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+vpn.user-name:                          --
+-------------------------------------------------------------------------------
+
+===============================================================================
+                     Connection profile details (con-xx1)
+===============================================================================
+connection.id:                          con-xx1
+-------------------------------------------------------------------------------
+connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
+-------------------------------------------------------------------------------
+connection.type:                        802-11-wireless
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+
+<<<
+size: 2808
+location: clients/tests/test-client.py:test_004()/772
+cmd: $NMCLI --mode multiline --pretty -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2413 bytes
+>>>
+===============================================================================
+                     Szczegóły profilu połączenia (con-1)
+===============================================================================
+connection.id:                          con-1
+-------------------------------------------------------------------------------
+connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
+-------------------------------------------------------------------------------
+connection.type:                        802-3-ethernet
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+
+===============================================================================
+                   Szczegóły profilu połączenia (con-vpn-1)
+===============================================================================
+connection.id:                          con-vpn-1
+-------------------------------------------------------------------------------
+connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
+-------------------------------------------------------------------------------
+connection.type:                        vpn
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+vpn.user-name:                          --
+-------------------------------------------------------------------------------
+
+===============================================================================
+                    Szczegóły profilu połączenia (con-xx1)
+===============================================================================
+connection.id:                          con-xx1
+-------------------------------------------------------------------------------
+connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
+-------------------------------------------------------------------------------
+connection.type:                        802-11-wireless
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+
+<<<
+size: 6009
+location: clients/tests/test-client.py:test_004()/773
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5608 bytes
+stdout: 5839 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -40033,10 +42701,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -40059,8 +42729,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -40081,6 +42753,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -40102,12 +42775,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5820
-location: clients/tests/test-client.py:test_004()/744
+size: 6051
+location: clients/tests/test-client.py:test_004()/774
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5640 bytes
+stdout: 5871 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -40151,10 +42824,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -40177,8 +42852,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -40199,6 +42876,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -40220,12 +42898,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5778
-location: clients/tests/test-client.py:test_004()/745
+size: 6009
+location: clients/tests/test-client.py:test_004()/775
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5608 bytes
+stdout: 5839 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -40269,10 +42947,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -40295,8 +42975,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -40317,6 +42999,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -40338,12 +43021,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5820
-location: clients/tests/test-client.py:test_004()/746
+size: 6051
+location: clients/tests/test-client.py:test_004()/776
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5640 bytes
+stdout: 5871 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -40387,10 +43070,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -40413,8 +43098,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -40435,6 +43122,7 @@ proxy.pac-script:                       --
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -40456,12 +43144,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 4304
-location: clients/tests/test-client.py:test_004()/747
+size: 4492
+location: clients/tests/test-client.py:test_004()/777
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4127 bytes
+stdout: 4315 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -40505,10 +43193,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                no
 ipv4.ignore-auto-dns:                   no
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                yes
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     no
 ipv4.may-fail:                          yes
 ipv4.dad-timeout:                       -1 (default)
@@ -40531,8 +43221,10 @@ ipv6.may-fail:                          yes
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                yes
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -40549,12 +43241,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4329
-location: clients/tests/test-client.py:test_004()/748
+size: 4517
+location: clients/tests/test-client.py:test_004()/778
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4142 bytes
+stdout: 4330 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -40598,10 +43290,12 @@ ipv4.routing-rules:                     --
 ipv4.ignore-auto-routes:                nie
 ipv4.ignore-auto-dns:                   nie
 ipv4.dhcp-client-id:                    --
+ipv4.dhcp-iaid:                         --
 ipv4.dhcp-timeout:                      0 (default)
 ipv4.dhcp-send-hostname:                tak
 ipv4.dhcp-hostname:                     --
 ipv4.dhcp-fqdn:                         --
+ipv4.dhcp-hostname-flags:               0x0 (none)
 ipv4.never-default:                     nie
 ipv4.may-fail:                          tak
 ipv4.dad-timeout:                       -1 (default)
@@ -40624,8 +43318,10 @@ ipv6.may-fail:                          tak
 ipv6.ip6-privacy:                       -1 (unknown)
 ipv6.addr-gen-mode:                     stable-privacy
 ipv6.dhcp-duid:                         --
+ipv6.dhcp-iaid:                         --
 ipv6.dhcp-send-hostname:                tak
 ipv6.dhcp-hostname:                     --
+ipv6.dhcp-hostname-flags:               0x0 (none)
 ipv6.token:                             --
 -------------------------------------------------------------------------------
 vpn.service-type:                       org.freedesktop.NetworkManager.openvpn
@@ -40643,7 +43339,7 @@ proxy.pac-script:                       --
 
 <<<
 size: 809
-location: clients/tests/test-client.py:test_004()/749
+location: clients/tests/test-client.py:test_004()/779
 cmd: $NMCLI --mode multiline --pretty --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -40662,7 +43358,7 @@ vpn.timeout:                            0
 
 <<<
 size: 825
-location: clients/tests/test-client.py:test_004()/750
+location: clients/tests/test-client.py:test_004()/780
 cmd: $NMCLI --mode multiline --pretty --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -40680,12 +43376,12 @@ vpn.timeout:                            0
 -------------------------------------------------------------------------------
 
 <<<
-size: 1160
-location: clients/tests/test-client.py:test_004()/751
+size: 1204
+location: clients/tests/test-client.py:test_004()/781
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 980 bytes
+stdout: 1023 bytes
 >>>
 ===============================================================================
       Activate connection details (UUID-con-vpn-1-REPLACED-REPLACED-REP)
@@ -40693,6 +43389,7 @@ stdout: 980 bytes
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          activated
 GENERAL.DEFAULT:                        no
 GENERAL.DEFAULT6:                       no
@@ -40705,12 +43402,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 1180
-location: clients/tests/test-client.py:test_004()/752
+size: 1224
+location: clients/tests/test-client.py:test_004()/782
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 990 bytes
+stdout: 1033 bytes
 >>>
 ===============================================================================
     Szczegóły aktywowania połączenia (UUID-con-vpn-1-REPLACED-REPLACED-REP)
@@ -40718,6 +43415,7 @@ stdout: 990 bytes
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:                        wlan0
+GENERAL.IP-IFACE:                       --
 GENERAL.STATE:                          aktywowano
 GENERAL.DEFAULT:                        nie
 GENERAL.DEFAULT6:                       nie
@@ -40731,7 +43429,7 @@ GENERAL.MASTER-PATH:                    --
 
 <<<
 size: 1872
-location: clients/tests/test-client.py:test_004()/753
+location: clients/tests/test-client.py:test_004()/783
 cmd: $NMCLI --mode multiline --pretty --color yes dev s
 lang: C
 returncode: 0
@@ -40768,7 +43466,7 @@ CONNECTION:                             --
 
 <<<
 size: 1887
-location: clients/tests/test-client.py:test_004()/754
+location: clients/tests/test-client.py:test_004()/784
 cmd: $NMCLI --mode multiline --pretty --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -40805,7 +43503,7 @@ CONNECTION:                             --
 
 <<<
 size: 3486
-location: clients/tests/test-client.py:test_004()/755
+location: clients/tests/test-client.py:test_004()/785
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev status
 lang: C
 returncode: 0
@@ -40867,7 +43565,7 @@ CON-PATH:                               --
 
 <<<
 size: 3511
-location: clients/tests/test-client.py:test_004()/756
+location: clients/tests/test-client.py:test_004()/786
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -40929,7 +43627,7 @@ CON-PATH:                               --
 
 <<<
 size: 12897
-location: clients/tests/test-client.py:test_004()/757
+location: clients/tests/test-client.py:test_004()/787
 cmd: $NMCLI --mode multiline --pretty --color yes dev show
 lang: C
 returncode: 0
@@ -41137,7 +43835,7 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
 size: 12961
-location: clients/tests/test-client.py:test_004()/758
+location: clients/tests/test-client.py:test_004()/788
 cmd: $NMCLI --mode multiline --pretty --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -41344,12 +44042,12 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
 <<<
-size: 25686
-location: clients/tests/test-client.py:test_004()/759
+size: 27548
+location: clients/tests/test-client.py:test_004()/789
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 25515 bytes
+stdout: 27377 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -41357,6 +44055,7 @@ stdout: 25515 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -41386,6 +44085,10 @@ CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -41396,8 +44099,10 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -41407,6 +44112,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -41416,6 +44122,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -41464,6 +44171,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -41493,6 +44201,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               off
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.49.34/22
@@ -41538,6 +44250,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -41567,6 +44280,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               off
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.127.210/25
@@ -41619,6 +44336,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -41648,6 +44366,10 @@ CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -41658,8 +44380,10 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -41720,6 +44444,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -41749,6 +44474,10 @@ CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -41759,6 +44488,7 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
@@ -41795,12 +44525,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 25872
-location: clients/tests/test-client.py:test_004()/760
+size: 27742
+location: clients/tests/test-client.py:test_004()/790
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 25691 bytes
+stdout: 27561 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -41808,6 +44538,7 @@ stdout: 25691 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -41837,6 +44568,10 @@ CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -41847,8 +44582,10 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -41858,6 +44595,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -41867,6 +44605,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -41915,6 +44654,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -41944,6 +44684,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               wyłączone
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.49.34/22
@@ -41989,6 +44733,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         eth1
 GENERAL.TYPE:                           ethernet
 GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -42018,6 +44763,10 @@ CAPABILITIES.SPEED:                     100 Mb/s
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIRED-PROPERTIES.CARRIER:               wyłączone
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.127.210/25
@@ -42070,6 +44819,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -42099,6 +44849,10 @@ CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -42109,8 +44863,10 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -42171,6 +44927,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 GENERAL.DEVICE:                         wlan1
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -42200,6 +44957,10 @@ CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -42210,6 +44971,7 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
@@ -42247,7 +45009,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2463
-location: clients/tests/test-client.py:test_004()/761
+location: clients/tests/test-client.py:test_004()/791
 cmd: $NMCLI --mode multiline --pretty --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -42292,7 +45054,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2481
-location: clients/tests/test-client.py:test_004()/762
+location: clients/tests/test-client.py:test_004()/792
 cmd: $NMCLI --mode multiline --pretty --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -42336,12 +45098,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6231
-location: clients/tests/test-client.py:test_004()/763
+size: 6768
+location: clients/tests/test-client.py:test_004()/793
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 6055 bytes
+stdout: 6592 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -42349,6 +45111,7 @@ stdout: 6055 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -42378,6 +45141,10 @@ CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -42388,8 +45155,10 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -42399,6 +45168,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -42408,6 +45178,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -42451,12 +45222,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6294
-location: clients/tests/test-client.py:test_004()/764
+size: 6833
+location: clients/tests/test-client.py:test_004()/794
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6108 bytes
+stdout: 6647 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -42464,6 +45235,7 @@ stdout: 6108 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -42493,6 +45265,10 @@ CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -42503,8 +45279,10 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -42514,6 +45292,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -42523,6 +45302,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -42566,12 +45346,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 2488
-location: clients/tests/test-client.py:test_004()/765
+size: 2613
+location: clients/tests/test-client.py:test_004()/795
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2277 bytes
+stdout: 2402 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -42579,6 +45359,7 @@ stdout: 2277 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -42615,15 +45396,16 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 
 <<<
-size: 2520
-location: clients/tests/test-client.py:test_004()/766
+size: 2646
+location: clients/tests/test-client.py:test_004()/796
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2299 bytes
+stdout: 2425 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -42631,6 +45413,7 @@ stdout: 2299 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -42667,15 +45450,16 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 
 <<<
-size: 2488
-location: clients/tests/test-client.py:test_004()/767
+size: 2613
+location: clients/tests/test-client.py:test_004()/797
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2277 bytes
+stdout: 2402 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -42683,6 +45467,7 @@ stdout: 2277 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -42719,15 +45504,16 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 
 <<<
-size: 2520
-location: clients/tests/test-client.py:test_004()/768
+size: 2646
+location: clients/tests/test-client.py:test_004()/798
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2299 bytes
+stdout: 2425 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -42735,6 +45521,7 @@ stdout: 2299 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -42771,11 +45558,12 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 
 <<<
 size: 1783
-location: clients/tests/test-client.py:test_004()/769
+location: clients/tests/test-client.py:test_004()/799
 cmd: $NMCLI --mode multiline --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -42807,7 +45595,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Devi
 
 <<<
 size: 1793
-location: clients/tests/test-client.py:test_004()/770
+location: clients/tests/test-client.py:test_004()/800
 cmd: $NMCLI --mode multiline --pretty --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -42839,7 +45627,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Devi
 
 <<<
 size: 5380
-location: clients/tests/test-client.py:test_004()/771
+location: clients/tests/test-client.py:test_004()/801
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list
 lang: C
 returncode: 0
@@ -42931,7 +45719,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 <<<
 size: 5456
-location: clients/tests/test-client.py:test_004()/772
+location: clients/tests/test-client.py:test_004()/802
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -43022,17 +45810,18 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 ===============================================================================
 
 <<<
-size: 2893
-location: clients/tests/test-client.py:test_004()/773
+size: 3161
+location: clients/tests/test-client.py:test_004()/803
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 2712 bytes
+stdout: 2980 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
 ===============================================================================
 IN-USE:                                  
+BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infra
 CHAN:                                   1
@@ -43042,6 +45831,7 @@ BARS:                                   ****
 SECURITY:                               WPA1 WPA2
 -------------------------------------------------------------------------------
 IN-USE:                                  
+BSSID:                                  61:95:77:AC:1E:4C
 SSID:                                   wlan0-ap-1
 MODE:                                   Infra
 CHAN:                                   1
@@ -43051,6 +45841,7 @@ BARS:                                   ****
 SECURITY:                               WPA1
 -------------------------------------------------------------------------------
 IN-USE:                                  
+BSSID:                                  9B:F6:B7:EC:97:76
 SSID:                                   wlan0-ap-3
 MODE:                                   Infra
 CHAN:                                   1
@@ -43064,6 +45855,7 @@ SECURITY:                               WPA3
                             Wi-Fi scan list (wlan1)
 ===============================================================================
 IN-USE:                                  
+BSSID:                                  94:2B:E8:F6:D2:86
 SSID:                                   wlan1-ap-4
 MODE:                                   Infra
 CHAN:                                   1
@@ -43078,17 +45870,18 @@ SECURITY:                               WPA1 WPA2
 ===============================================================================
 
 <<<
-size: 2957
-location: clients/tests/test-client.py:test_004()/774
+size: 3225
+location: clients/tests/test-client.py:test_004()/804
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2766 bytes
+stdout: 3034 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
 ===============================================================================
 IN-USE:                                  
+BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infrastruktura
 CHAN:                                   1
@@ -43098,6 +45891,7 @@ BARS:                                   ****
 SECURITY:                               WPA1 WPA2
 -------------------------------------------------------------------------------
 IN-USE:                                  
+BSSID:                                  61:95:77:AC:1E:4C
 SSID:                                   wlan0-ap-1
 MODE:                                   Infrastruktura
 CHAN:                                   1
@@ -43107,6 +45901,7 @@ BARS:                                   ****
 SECURITY:                               WPA1
 -------------------------------------------------------------------------------
 IN-USE:                                  
+BSSID:                                  9B:F6:B7:EC:97:76
 SSID:                                   wlan0-ap-3
 MODE:                                   Infrastruktura
 CHAN:                                   1
@@ -43120,6 +45915,7 @@ SECURITY:                               WPA3
                      Lista skanowania sieci Wi-Fi (wlan1)
 ===============================================================================
 IN-USE:                                  
+BSSID:                                  94:2B:E8:F6:D2:86
 SSID:                                   wlan1-ap-4
 MODE:                                   Infrastruktura
 CHAN:                                   1
@@ -43135,7 +45931,7 @@ SECURITY:                               WPA1 WPA2
 
 <<<
 size: 5493
-location: clients/tests/test-client.py:test_004()/775
+location: clients/tests/test-client.py:test_004()/805
 cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -43227,7 +46023,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 <<<
 size: 5569
-location: clients/tests/test-client.py:test_004()/776
+location: clients/tests/test-client.py:test_004()/806
 cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -43319,7 +46115,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 <<<
 size: 1579
-location: clients/tests/test-client.py:test_004()/777
+location: clients/tests/test-client.py:test_004()/807
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -43351,7 +46147,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 <<<
 size: 1607
-location: clients/tests/test-client.py:test_004()/778
+location: clients/tests/test-client.py:test_004()/808
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -43382,17 +46178,18 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 939
-location: clients/tests/test-client.py:test_004()/779
+size: 1006
+location: clients/tests/test-client.py:test_004()/809
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 735 bytes
+stdout: 802 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
 ===============================================================================
 IN-USE:                                  
+BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infra
 CHAN:                                   1
@@ -43405,17 +46202,18 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 964
-location: clients/tests/test-client.py:test_004()/780
+size: 1031
+location: clients/tests/test-client.py:test_004()/810
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 750 bytes
+stdout: 817 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
 ===============================================================================
 IN-USE:                                  
+BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infrastruktura
 CHAN:                                   1
@@ -43429,7 +46227,7 @@ SECURITY:                               WPA1 WPA2
 
 <<<
 size: 1692
-location: clients/tests/test-client.py:test_004()/781
+location: clients/tests/test-client.py:test_004()/811
 cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -43461,7 +46259,7 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 <<<
 size: 1720
-location: clients/tests/test-client.py:test_004()/782
+location: clients/tests/test-client.py:test_004()/812
 cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -43492,12 +46290,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 6234
-location: clients/tests/test-client.py:test_004()/783
+size: 6771
+location: clients/tests/test-client.py:test_004()/813
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 6055 bytes
+stdout: 6592 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -43505,6 +46303,7 @@ stdout: 6055 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -43534,6 +46333,10 @@ CAPABILITIES.SPEED:                     unknown
 CAPABILITIES.IS-SOFTWARE:               no
 CAPABILITIES.SRIOV:                     no
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     yes
+INTERFACE-FLAGS.LOWER-UP:               yes
+INTERFACE-FLAGS.CARRIER:                no
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    yes
 WIFI-PROPERTIES.WPA:                    yes
 WIFI-PROPERTIES.WPA2:                   yes
@@ -43544,8 +46347,10 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -43555,6 +46360,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -43564,6 +46370,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -43607,12 +46414,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6297
-location: clients/tests/test-client.py:test_004()/784
+size: 6836
+location: clients/tests/test-client.py:test_004()/814
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6108 bytes
+stdout: 6647 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -43620,6 +46427,7 @@ stdout: 6108 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -43649,6 +46457,10 @@ CAPABILITIES.SPEED:                     nieznane
 CAPABILITIES.IS-SOFTWARE:               nie
 CAPABILITIES.SRIOV:                     nie
 -------------------------------------------------------------------------------
+INTERFACE-FLAGS.UP:                     tak
+INTERFACE-FLAGS.LOWER-UP:               tak
+INTERFACE-FLAGS.CARRIER:                nie
+-------------------------------------------------------------------------------
 WIFI-PROPERTIES.WEP:                    tak
 WIFI-PROPERTIES.WPA:                    tak
 WIFI-PROPERTIES.WPA2:                   tak
@@ -43659,8 +46471,10 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -43670,6 +46484,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -43679,6 +46494,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -43723,7 +46539,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 2476
-location: clients/tests/test-client.py:test_004()/785
+location: clients/tests/test-client.py:test_004()/815
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -43768,7 +46584,7 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
 size: 2494
-location: clients/tests/test-client.py:test_004()/786
+location: clients/tests/test-client.py:test_004()/816
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -43812,12 +46628,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6372
-location: clients/tests/test-client.py:test_004()/787
+size: 6698
+location: clients/tests/test-client.py:test_004()/817
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 6055 bytes
+stdout: 6381 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -43825,6 +46641,7 @@ stdout: 6055 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -43864,8 +46681,10 @@ WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
 WIFI-PROPERTIES.MESH:                   no
+WIFI-PROPERTIES.IBSS-RSN:               no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
 AP[1].CHAN:                             1
@@ -43875,6 +46694,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
 AP[2].CHAN:                             1
@@ -43884,6 +46704,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
 AP[3].CHAN:                             1
@@ -43927,12 +46748,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6435
-location: clients/tests/test-client.py:test_004()/788
+size: 6762
+location: clients/tests/test-client.py:test_004()/818
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6108 bytes
+stdout: 6435 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -43940,6 +46761,7 @@ stdout: 6108 bytes
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
 GENERAL.NM-TYPE:                        NMDeviceWifi
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:                         --
 GENERAL.PRODUCT:                        --
 GENERAL.DRIVER:                         virtual
@@ -43979,8 +46801,10 @@ WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
 WIFI-PROPERTIES.MESH:                   nie
+WIFI-PROPERTIES.IBSS-RSN:               nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
+AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
 AP[1].CHAN:                             1
@@ -43990,6 +46814,7 @@ AP[1].BARS:                             ****
 AP[1].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 AP[2].IN-USE:                            
+AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
 AP[2].CHAN:                             1
@@ -43999,6 +46824,7 @@ AP[2].BARS:                             ****
 AP[2].SECURITY:                         WPA1
 -------------------------------------------------------------------------------
 AP[3].IN-USE:                            
+AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
 AP[3].CHAN:                             1
@@ -44043,7 +46869,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 
 <<<
 size: 1922
-location: clients/tests/test-client.py:test_004()/789
+location: clients/tests/test-client.py:test_004()/819
 cmd: $NMCLI --mode multiline --pretty --color yes dev lldp list ifname eth0
 lang: C
 returncode: 0
@@ -44079,7 +46905,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 
 <<<
 size: 1936
-location: clients/tests/test-client.py:test_004()/790
+location: clients/tests/test-client.py:test_004()/820
 cmd: $NMCLI --mode multiline --pretty --color yes dev lldp list ifname eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -44114,12 +46940,104 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 -------------------------------------------------------------------------------
 
 <<<
-size: 2407
-location: clients/tests/test-client.py:test_004()/791
+size: 2795
+location: clients/tests/test-client.py:test_004()/821
+cmd: $NMCLI --mode multiline --pretty --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: C
+returncode: 0
+stdout: 2398 bytes
+>>>
+===============================================================================
+                      Connection profile details (con-1)
+===============================================================================
+connection.id:                          con-1
+-------------------------------------------------------------------------------
+connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
+-------------------------------------------------------------------------------
+connection.type:                        802-3-ethernet
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+
+===============================================================================
+                    Connection profile details (con-vpn-1)
+===============================================================================
+connection.id:                          con-vpn-1
+-------------------------------------------------------------------------------
+connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
+-------------------------------------------------------------------------------
+connection.type:                        vpn
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+vpn.user-name:                          --
+-------------------------------------------------------------------------------
+
+===============================================================================
+                     Connection profile details (con-xx1)
+===============================================================================
+connection.id:                          con-xx1
+-------------------------------------------------------------------------------
+connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
+-------------------------------------------------------------------------------
+connection.type:                        802-11-wireless
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+
+<<<
+size: 2820
+location: clients/tests/test-client.py:test_004()/822
+cmd: $NMCLI --mode multiline --pretty --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2413 bytes
+>>>
+===============================================================================
+                     Szczegóły profilu połączenia (con-1)
+===============================================================================
+connection.id:                          con-1
+-------------------------------------------------------------------------------
+connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
+-------------------------------------------------------------------------------
+connection.type:                        802-3-ethernet
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+
+===============================================================================
+                   Szczegóły profilu połączenia (con-vpn-1)
+===============================================================================
+connection.id:                          con-vpn-1
+-------------------------------------------------------------------------------
+connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
+-------------------------------------------------------------------------------
+connection.type:                        vpn
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+vpn.user-name:                          --
+-------------------------------------------------------------------------------
+
+===============================================================================
+                    Szczegóły profilu połączenia (con-xx1)
+===============================================================================
+connection.id:                          con-xx1
+-------------------------------------------------------------------------------
+connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
+-------------------------------------------------------------------------------
+connection.type:                        802-11-wireless
+-------------------------------------------------------------------------------
+connection.interface-name:              --
+-------------------------------------------------------------------------------
+
+<<<
+size: 2515
+location: clients/tests/test-client.py:test_004()/823
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2250 bytes
+stdout: 2358 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -44159,10 +47077,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -44184,8 +47104,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -44200,6 +47122,7 @@ proxy.pac-script:
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -44219,12 +47142,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2417
-location: clients/tests/test-client.py:test_004()/792
+size: 2525
+location: clients/tests/test-client.py:test_004()/824
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2250 bytes
+stdout: 2358 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -44264,10 +47187,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -44289,8 +47214,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -44305,6 +47232,7 @@ proxy.pac-script:
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -44324,12 +47252,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2407
-location: clients/tests/test-client.py:test_004()/793
+size: 2515
+location: clients/tests/test-client.py:test_004()/825
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2250 bytes
+stdout: 2358 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -44369,10 +47297,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -44394,8 +47324,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -44410,6 +47342,7 @@ proxy.pac-script:
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -44429,12 +47362,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2417
-location: clients/tests/test-client.py:test_004()/794
+size: 2525
+location: clients/tests/test-client.py:test_004()/826
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2250 bytes
+stdout: 2358 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -44474,10 +47407,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -44499,8 +47434,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -44515,6 +47452,7 @@ proxy.pac-script:
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -44534,12 +47472,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 1855
-location: clients/tests/test-client.py:test_004()/795
+size: 1945
+location: clients/tests/test-client.py:test_004()/827
 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1691 bytes
+stdout: 1781 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -44579,10 +47517,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -44604,8 +47544,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -44619,12 +47561,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 1865
-location: clients/tests/test-client.py:test_004()/796
+size: 1955
+location: clients/tests/test-client.py:test_004()/828
 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1691 bytes
+stdout: 1781 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -44664,10 +47606,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -44689,8 +47633,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -44705,7 +47651,7 @@ proxy.pac-script:
 
 <<<
 size: 334
-location: clients/tests/test-client.py:test_004()/797
+location: clients/tests/test-client.py:test_004()/829
 cmd: $NMCLI --mode multiline --terse -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -44720,7 +47666,7 @@ vpn.timeout:0
 
 <<<
 size: 344
-location: clients/tests/test-client.py:test_004()/798
+location: clients/tests/test-client.py:test_004()/830
 cmd: $NMCLI --mode multiline --terse -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -44734,16 +47680,17 @@ vpn.persistent:no
 vpn.timeout:0
 
 <<<
-size: 537
-location: clients/tests/test-client.py:test_004()/799
+size: 555
+location: clients/tests/test-client.py:test_004()/831
 cmd: $NMCLI --mode multiline --terse -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 370 bytes
+stdout: 388 bytes
 >>>
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -44755,16 +47702,17 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 547
-location: clients/tests/test-client.py:test_004()/800
+size: 565
+location: clients/tests/test-client.py:test_004()/832
 cmd: $NMCLI --mode multiline --terse -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 370 bytes
+stdout: 388 bytes
 >>>
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -44777,7 +47725,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 426
-location: clients/tests/test-client.py:test_004()/801
+location: clients/tests/test-client.py:test_004()/833
 cmd: $NMCLI --mode multiline --terse dev s
 lang: C
 returncode: 0
@@ -44806,7 +47754,7 @@ CONNECTION:
 
 <<<
 size: 436
-location: clients/tests/test-client.py:test_004()/802
+location: clients/tests/test-client.py:test_004()/834
 cmd: $NMCLI --mode multiline --terse dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -44835,7 +47783,7 @@ CONNECTION:
 
 <<<
 size: 1134
-location: clients/tests/test-client.py:test_004()/803
+location: clients/tests/test-client.py:test_004()/835
 cmd: $NMCLI --mode multiline --terse -f all dev status
 lang: C
 returncode: 0
@@ -44889,7 +47837,7 @@ CON-PATH:
 
 <<<
 size: 1144
-location: clients/tests/test-client.py:test_004()/804
+location: clients/tests/test-client.py:test_004()/836
 cmd: $NMCLI --mode multiline --terse -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -44943,7 +47891,7 @@ CON-PATH:
 
 <<<
 size: 4552
-location: clients/tests/test-client.py:test_004()/805
+location: clients/tests/test-client.py:test_004()/837
 cmd: $NMCLI --mode multiline --terse dev show
 lang: C
 returncode: 0
@@ -45089,7 +48037,7 @@ IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
 size: 4562
-location: clients/tests/test-client.py:test_004()/806
+location: clients/tests/test-client.py:test_004()/838
 cmd: $NMCLI --mode multiline --terse dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -45234,16 +48182,17 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 12011
-location: clients/tests/test-client.py:test_004()/807
+size: 12910
+location: clients/tests/test-client.py:test_004()/839
 cmd: $NMCLI --mode multiline --terse -f all dev show
 lang: C
 returncode: 0
-stdout: 11853 bytes
+stdout: 12752 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -45271,6 +48220,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -45281,7 +48233,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -45290,6 +48244,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
 AP[2].CHAN:1
@@ -45298,6 +48253,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
 AP[3].CHAN:1
@@ -45337,6 +48293,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -45364,6 +48321,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.49.34/22
 IP4.ADDRESS[2]:192.168.135.86/19
@@ -45400,6 +48360,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-
 GENERAL.DEVICE:eth1
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -45427,6 +48388,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.127.210/25
 IP4.GATEWAY:192.168.88.4
@@ -45470,6 +48434,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-
 GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -45497,6 +48462,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -45507,7 +48475,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:94:2B:E8:F6:D2:86
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -45559,6 +48529,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -45586,6 +48557,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -45596,6 +48570,7 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 IP4.ADDRESS[1]:192.168.97.124/29
 IP4.ADDRESS[2]:192.168.76.154/18
 IP4.GATEWAY:
@@ -45626,16 +48601,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 12057
-location: clients/tests/test-client.py:test_004()/808
+size: 12956
+location: clients/tests/test-client.py:test_004()/840
 cmd: $NMCLI --mode multiline --terse -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 11889 bytes
+stdout: 12788 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -45663,6 +48639,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -45673,7 +48652,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -45682,6 +48663,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
@@ -45690,6 +48672,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
@@ -45729,6 +48712,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -45756,6 +48740,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.49.34/22
 IP4.ADDRESS[2]:192.168.135.86/19
@@ -45792,6 +48779,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-
 GENERAL.DEVICE:eth1
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -45819,6 +48807,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.127.210/25
 IP4.GATEWAY:192.168.88.4
@@ -45862,6 +48853,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-
 GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -45889,6 +48881,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -45899,7 +48894,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:94:2B:E8:F6:D2:86
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -45951,6 +48948,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -45978,6 +48976,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -45988,6 +48989,7 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 IP4.ADDRESS[1]:192.168.97.124/29
 IP4.ADDRESS[2]:192.168.76.154/18
 IP4.GATEWAY:
@@ -46019,7 +49021,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 894
-location: clients/tests/test-client.py:test_004()/809
+location: clients/tests/test-client.py:test_004()/841
 cmd: $NMCLI --mode multiline --terse dev show wlan0
 lang: C
 returncode: 0
@@ -46052,7 +49054,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 904
-location: clients/tests/test-client.py:test_004()/810
+location: clients/tests/test-client.py:test_004()/842
 cmd: $NMCLI --mode multiline --terse dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -46084,16 +49086,17 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2729
-location: clients/tests/test-client.py:test_004()/811
+size: 2986
+location: clients/tests/test-client.py:test_004()/843
 cmd: $NMCLI --mode multiline --terse -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2566 bytes
+stdout: 2823 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -46121,6 +49124,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -46131,7 +49137,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -46140,6 +49148,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
 AP[2].CHAN:1
@@ -46148,6 +49157,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
 AP[3].CHAN:1
@@ -46185,16 +49195,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2766
-location: clients/tests/test-client.py:test_004()/812
+size: 3023
+location: clients/tests/test-client.py:test_004()/844
 cmd: $NMCLI --mode multiline --terse -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2593 bytes
+stdout: 2850 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -46222,6 +49233,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -46232,7 +49246,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -46241,6 +49257,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
@@ -46249,6 +49266,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
@@ -46286,16 +49304,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1227
-location: clients/tests/test-client.py:test_004()/813
+size: 1315
+location: clients/tests/test-client.py:test_004()/845
 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1029 bytes
+stdout: 1117 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -46330,18 +49349,20 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 
 <<<
-size: 1237
-location: clients/tests/test-client.py:test_004()/814
+size: 1325
+location: clients/tests/test-client.py:test_004()/846
 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1029 bytes
+stdout: 1117 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -46376,18 +49397,20 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 
 <<<
-size: 1227
-location: clients/tests/test-client.py:test_004()/815
+size: 1315
+location: clients/tests/test-client.py:test_004()/847
 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1029 bytes
+stdout: 1117 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -46422,18 +49445,20 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 
 <<<
-size: 1237
-location: clients/tests/test-client.py:test_004()/816
+size: 1325
+location: clients/tests/test-client.py:test_004()/848
 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1029 bytes
+stdout: 1117 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -46468,10 +49493,11 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 
 <<<
 size: 550
-location: clients/tests/test-client.py:test_004()/817
+location: clients/tests/test-client.py:test_004()/849
 cmd: $NMCLI --mode multiline --terse -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -46495,7 +49521,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 560
-location: clients/tests/test-client.py:test_004()/818
+location: clients/tests/test-client.py:test_004()/850
 cmd: $NMCLI --mode multiline --terse -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -46519,7 +49545,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 1547
-location: clients/tests/test-client.py:test_004()/819
+location: clients/tests/test-client.py:test_004()/851
 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list
 lang: C
 returncode: 0
@@ -46598,7 +49624,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 <<<
 size: 1605
-location: clients/tests/test-client.py:test_004()/820
+location: clients/tests/test-client.py:test_004()/852
 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -46676,14 +49702,15 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 547
-location: clients/tests/test-client.py:test_004()/821
+size: 643
+location: clients/tests/test-client.py:test_004()/853
 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 380 bytes
+stdout: 476 bytes
 >>>
 IN-USE: 
+BSSID:C0:E2:BE:E8:EF:B6
 SSID:wlan0-ap-2
 MODE:Infra
 CHAN:1
@@ -46692,6 +49719,7 @@ SIGNAL:92
 BARS:****
 SECURITY:WPA1 WPA2
 IN-USE: 
+BSSID:61:95:77:AC:1E:4C
 SSID:wlan0-ap-1
 MODE:Infra
 CHAN:1
@@ -46700,6 +49728,7 @@ SIGNAL:81
 BARS:****
 SECURITY:WPA1
 IN-USE: 
+BSSID:9B:F6:B7:EC:97:76
 SSID:wlan0-ap-3
 MODE:Infra
 CHAN:1
@@ -46709,6 +49738,7 @@ BARS:**
 SECURITY:WPA3
 
 IN-USE: 
+BSSID:94:2B:E8:F6:D2:86
 SSID:wlan1-ap-4
 MODE:Infra
 CHAN:1
@@ -46719,14 +49749,15 @@ SECURITY:WPA1 WPA2
 
 
 <<<
-size: 593
-location: clients/tests/test-client.py:test_004()/822
+size: 689
+location: clients/tests/test-client.py:test_004()/854
 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 416 bytes
+stdout: 512 bytes
 >>>
 IN-USE: 
+BSSID:C0:E2:BE:E8:EF:B6
 SSID:wlan0-ap-2
 MODE:Infrastruktura
 CHAN:1
@@ -46735,6 +49766,7 @@ SIGNAL:92
 BARS:****
 SECURITY:WPA1 WPA2
 IN-USE: 
+BSSID:61:95:77:AC:1E:4C
 SSID:wlan0-ap-1
 MODE:Infrastruktura
 CHAN:1
@@ -46743,6 +49775,7 @@ SIGNAL:81
 BARS:****
 SECURITY:WPA1
 IN-USE: 
+BSSID:9B:F6:B7:EC:97:76
 SSID:wlan0-ap-3
 MODE:Infrastruktura
 CHAN:1
@@ -46752,6 +49785,7 @@ BARS:**
 SECURITY:WPA3
 
 IN-USE: 
+BSSID:94:2B:E8:F6:D2:86
 SSID:wlan1-ap-4
 MODE:Infrastruktura
 CHAN:1
@@ -46763,7 +49797,7 @@ SECURITY:WPA1 WPA2
 
 <<<
 size: 1660
-location: clients/tests/test-client.py:test_004()/823
+location: clients/tests/test-client.py:test_004()/855
 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -46842,7 +49876,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 <<<
 size: 1718
-location: clients/tests/test-client.py:test_004()/824
+location: clients/tests/test-client.py:test_004()/856
 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -46921,7 +49955,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 <<<
 size: 557
-location: clients/tests/test-client.py:test_004()/825
+location: clients/tests/test-client.py:test_004()/857
 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -46949,7 +49983,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 <<<
 size: 579
-location: clients/tests/test-client.py:test_004()/826
+location: clients/tests/test-client.py:test_004()/858
 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -46976,14 +50010,15 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 <<<
-size: 289
-location: clients/tests/test-client.py:test_004()/827
+size: 314
+location: clients/tests/test-client.py:test_004()/859
 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 99 bytes
+stdout: 123 bytes
 >>>
 IN-USE: 
+BSSID:C0:E2:BE:E8:EF:B6
 SSID:wlan0-ap-2
 MODE:Infra
 CHAN:1
@@ -46995,14 +50030,15 @@ SECURITY:WPA1 WPA2
 
 
 <<<
-size: 309
-location: clients/tests/test-client.py:test_004()/828
+size: 333
+location: clients/tests/test-client.py:test_004()/860
 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 108 bytes
+stdout: 132 bytes
 >>>
 IN-USE: 
+BSSID:C0:E2:BE:E8:EF:B6
 SSID:wlan0-ap-2
 MODE:Infrastruktura
 CHAN:1
@@ -47015,7 +50051,7 @@ SECURITY:WPA1 WPA2
 
 <<<
 size: 670
-location: clients/tests/test-client.py:test_004()/829
+location: clients/tests/test-client.py:test_004()/861
 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -47043,7 +50079,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 <<<
 size: 692
-location: clients/tests/test-client.py:test_004()/830
+location: clients/tests/test-client.py:test_004()/862
 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -47070,16 +50106,17 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 <<<
-size: 2732
-location: clients/tests/test-client.py:test_004()/831
+size: 2989
+location: clients/tests/test-client.py:test_004()/863
 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2566 bytes
+stdout: 2823 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -47107,6 +50144,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -47117,7 +50157,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -47126,6 +50168,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
 AP[2].CHAN:1
@@ -47134,6 +50177,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
 AP[3].CHAN:1
@@ -47171,16 +50215,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2769
-location: clients/tests/test-client.py:test_004()/832
+size: 3026
+location: clients/tests/test-client.py:test_004()/864
 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2593 bytes
+stdout: 2850 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -47208,6 +50253,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -47218,7 +50266,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -47227,6 +50277,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
@@ -47235,6 +50286,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
@@ -47273,7 +50325,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 907
-location: clients/tests/test-client.py:test_004()/833
+location: clients/tests/test-client.py:test_004()/865
 cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -47306,7 +50358,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 917
-location: clients/tests/test-client.py:test_004()/834
+location: clients/tests/test-client.py:test_004()/866
 cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -47338,16 +50390,17 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2870
-location: clients/tests/test-client.py:test_004()/835
+size: 3048
+location: clients/tests/test-client.py:test_004()/867
 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 2566 bytes
+stdout: 2744 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -47385,7 +50438,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -47394,6 +50449,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
 AP[2].CHAN:1
@@ -47402,6 +50458,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
 AP[3].CHAN:1
@@ -47439,16 +50496,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2907
-location: clients/tests/test-client.py:test_004()/836
+size: 3085
+location: clients/tests/test-client.py:test_004()/868
 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2593 bytes
+stdout: 2771 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -47486,7 +50544,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -47495,6 +50555,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
@@ -47503,6 +50564,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
@@ -47541,7 +50603,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 1148
-location: clients/tests/test-client.py:test_004()/837
+location: clients/tests/test-client.py:test_004()/869
 cmd: $NMCLI --mode multiline --terse dev lldp list ifname eth0
 lang: C
 returncode: 0
@@ -47571,7 +50633,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:40 (wlan-access-point,telephone)
 
 <<<
 size: 1158
-location: clients/tests/test-client.py:test_004()/838
+location: clients/tests/test-client.py:test_004()/870
 cmd: $NMCLI --mode multiline --terse dev lldp list ifname eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -47600,12 +50662,60 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION:Test system #3
 NEIGHBOR[2].SYSTEM-CAPABILITIES:40 (wlan-access-point,telephone)
 
 <<<
-size: 2419
-location: clients/tests/test-client.py:test_004()/839
+size: 789
+location: clients/tests/test-client.py:test_004()/871
+cmd: $NMCLI --mode multiline --terse -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: C
+returncode: 0
+stdout: 406 bytes
+>>>
+connection.id:con-1
+connection.uuid:5fcfd6d7-1e63-3332-8826-a7eda103792d
+connection.type:802-3-ethernet
+connection.interface-name:
+
+connection.id:con-vpn-1
+connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
+connection.type:vpn
+connection.interface-name:
+vpn.user-name:
+
+connection.id:con-xx1
+connection.uuid:UUID-con-xx1-REPLACED-REPLACED-REPLA
+connection.type:802-11-wireless
+connection.interface-name:
+
+<<<
+size: 799
+location: clients/tests/test-client.py:test_004()/872
+cmd: $NMCLI --mode multiline --terse -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 406 bytes
+>>>
+connection.id:con-1
+connection.uuid:5fcfd6d7-1e63-3332-8826-a7eda103792d
+connection.type:802-3-ethernet
+connection.interface-name:
+
+connection.id:con-vpn-1
+connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
+connection.type:vpn
+connection.interface-name:
+vpn.user-name:
+
+connection.id:con-xx1
+connection.uuid:UUID-con-xx1-REPLACED-REPLACED-REPLA
+connection.type:802-11-wireless
+connection.interface-name:
+
+<<<
+size: 2527
+location: clients/tests/test-client.py:test_004()/873
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2250 bytes
+stdout: 2358 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47645,10 +50755,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -47670,8 +50782,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -47686,6 +50800,7 @@ proxy.pac-script:
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -47705,12 +50820,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2429
-location: clients/tests/test-client.py:test_004()/840
+size: 2537
+location: clients/tests/test-client.py:test_004()/874
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2250 bytes
+stdout: 2358 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47750,10 +50865,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -47775,8 +50892,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -47791,6 +50910,7 @@ proxy.pac-script:
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -47810,12 +50930,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2419
-location: clients/tests/test-client.py:test_004()/841
+size: 2527
+location: clients/tests/test-client.py:test_004()/875
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2250 bytes
+stdout: 2358 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47855,10 +50975,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -47880,8 +51002,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -47896,6 +51020,7 @@ proxy.pac-script:
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -47915,12 +51040,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2429
-location: clients/tests/test-client.py:test_004()/842
+size: 2537
+location: clients/tests/test-client.py:test_004()/876
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2250 bytes
+stdout: 2358 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47960,10 +51085,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -47985,8 +51112,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -48001,6 +51130,7 @@ proxy.pac-script:
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -48020,12 +51150,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 1867
-location: clients/tests/test-client.py:test_004()/843
+size: 1957
+location: clients/tests/test-client.py:test_004()/877
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1691 bytes
+stdout: 1781 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -48065,10 +51195,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -48090,8 +51222,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -48105,12 +51239,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 1877
-location: clients/tests/test-client.py:test_004()/844
+size: 1967
+location: clients/tests/test-client.py:test_004()/878
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1691 bytes
+stdout: 1781 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -48150,10 +51284,12 @@ ipv4.routing-rules:
 ipv4.ignore-auto-routes:no
 ipv4.ignore-auto-dns:no
 ipv4.dhcp-client-id:
+ipv4.dhcp-iaid:
 ipv4.dhcp-timeout:0
 ipv4.dhcp-send-hostname:yes
 ipv4.dhcp-hostname:
 ipv4.dhcp-fqdn:
+ipv4.dhcp-hostname-flags:0x0
 ipv4.never-default:no
 ipv4.may-fail:yes
 ipv4.dad-timeout:-1
@@ -48175,8 +51311,10 @@ ipv6.may-fail:yes
 ipv6.ip6-privacy:-1
 ipv6.addr-gen-mode:stable-privacy
 ipv6.dhcp-duid:
+ipv6.dhcp-iaid:
 ipv6.dhcp-send-hostname:yes
 ipv6.dhcp-hostname:
+ipv6.dhcp-hostname-flags:0x0
 ipv6.token:
 vpn.service-type:org.freedesktop.NetworkManager.openvpn
 vpn.user-name:
@@ -48191,7 +51329,7 @@ proxy.pac-script:
 
 <<<
 size: 346
-location: clients/tests/test-client.py:test_004()/845
+location: clients/tests/test-client.py:test_004()/879
 cmd: $NMCLI --mode multiline --terse --color yes -f VPN con s con-vpn-1
 lang: C
 returncode: 0
@@ -48206,7 +51344,7 @@ vpn.timeout:0
 
 <<<
 size: 356
-location: clients/tests/test-client.py:test_004()/846
+location: clients/tests/test-client.py:test_004()/880
 cmd: $NMCLI --mode multiline --terse --color yes -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
@@ -48220,16 +51358,17 @@ vpn.persistent:no
 vpn.timeout:0
 
 <<<
-size: 549
-location: clients/tests/test-client.py:test_004()/847
+size: 567
+location: clients/tests/test-client.py:test_004()/881
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 370 bytes
+stdout: 388 bytes
 >>>
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -48241,16 +51380,17 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 559
-location: clients/tests/test-client.py:test_004()/848
+size: 577
+location: clients/tests/test-client.py:test_004()/882
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 370 bytes
+stdout: 388 bytes
 >>>
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
 GENERAL.DEVICES:wlan0
+GENERAL.IP-IFACE:
 GENERAL.STATE:activated
 GENERAL.DEFAULT:no
 GENERAL.DEFAULT6:no
@@ -48263,7 +51403,7 @@ GENERAL.MASTER-PATH:
 
 <<<
 size: 598
-location: clients/tests/test-client.py:test_004()/849
+location: clients/tests/test-client.py:test_004()/883
 cmd: $NMCLI --mode multiline --terse --color yes dev s
 lang: C
 returncode: 0
@@ -48292,7 +51432,7 @@ CONNECTION:
 
 <<<
 size: 608
-location: clients/tests/test-client.py:test_004()/850
+location: clients/tests/test-client.py:test_004()/884
 cmd: $NMCLI --mode multiline --terse --color yes dev s
 lang: pl_PL.UTF-8
 returncode: 0
@@ -48321,7 +51461,7 @@ CONNECTION:
 
 <<<
 size: 1507
-location: clients/tests/test-client.py:test_004()/851
+location: clients/tests/test-client.py:test_004()/885
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev status
 lang: C
 returncode: 0
@@ -48375,7 +51515,7 @@ CON-PATH:
 
 <<<
 size: 1517
-location: clients/tests/test-client.py:test_004()/852
+location: clients/tests/test-client.py:test_004()/886
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev status
 lang: pl_PL.UTF-8
 returncode: 0
@@ -48429,7 +51569,7 @@ CON-PATH:
 
 <<<
 size: 4564
-location: clients/tests/test-client.py:test_004()/853
+location: clients/tests/test-client.py:test_004()/887
 cmd: $NMCLI --mode multiline --terse --color yes dev show
 lang: C
 returncode: 0
@@ -48575,7 +51715,7 @@ IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
 size: 4574
-location: clients/tests/test-client.py:test_004()/854
+location: clients/tests/test-client.py:test_004()/888
 cmd: $NMCLI --mode multiline --terse --color yes dev show
 lang: pl_PL.UTF-8
 returncode: 0
@@ -48720,16 +51860,17 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 12311
-location: clients/tests/test-client.py:test_004()/855
+size: 13246
+location: clients/tests/test-client.py:test_004()/889
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 12141 bytes
+stdout: 13076 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -48757,6 +51898,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -48767,7 +51911,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -48776,6 +51922,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
 AP[2].CHAN:1
@@ -48784,6 +51931,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
 AP[3].CHAN:1
@@ -48823,6 +51971,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -48850,6 +51999,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.49.34/22
 IP4.ADDRESS[2]:192.168.135.86/19
@@ -48886,6 +52038,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-
 GENERAL.DEVICE:eth1
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -48913,6 +52066,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.127.210/25
 IP4.GATEWAY:192.168.88.4
@@ -48956,6 +52112,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-
 GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -48983,6 +52140,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -48993,7 +52153,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:94:2B:E8:F6:D2:86
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -49045,6 +52207,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -49072,6 +52235,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -49082,6 +52248,7 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 IP4.ADDRESS[1]:192.168.97.124/29
 IP4.ADDRESS[2]:192.168.76.154/18
 IP4.GATEWAY:
@@ -49112,16 +52279,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 12357
-location: clients/tests/test-client.py:test_004()/856
+size: 13292
+location: clients/tests/test-client.py:test_004()/890
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 12177 bytes
+stdout: 13112 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -49149,6 +52317,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -49159,7 +52330,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -49168,6 +52341,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
@@ -49176,6 +52350,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
@@ -49215,6 +52390,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/1
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -49242,6 +52418,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.49.34/22
 IP4.ADDRESS[2]:192.168.135.86/19
@@ -49278,6 +52457,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-
 GENERAL.DEVICE:eth1
 GENERAL.TYPE:ethernet
 GENERAL.NM-TYPE:NMDeviceEthernet
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/2
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -49305,6 +52485,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:100 Mb/s
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIRED-PROPERTIES.CARRIER:off
 IP4.ADDRESS[1]:192.168.127.210/25
 IP4.GATEWAY:192.168.88.4
@@ -49348,6 +52531,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-
 GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/4
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -49375,6 +52559,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -49385,7 +52572,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:94:2B:E8:F6:D2:86
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -49437,6 +52626,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 GENERAL.DEVICE:wlan1
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -49464,6 +52654,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -49474,6 +52667,7 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 IP4.ADDRESS[1]:192.168.97.124/29
 IP4.ADDRESS[2]:192.168.76.154/18
 IP4.GATEWAY:
@@ -49505,7 +52699,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 906
-location: clients/tests/test-client.py:test_004()/857
+location: clients/tests/test-client.py:test_004()/891
 cmd: $NMCLI --mode multiline --terse --color yes dev show wlan0
 lang: C
 returncode: 0
@@ -49538,7 +52732,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 916
-location: clients/tests/test-client.py:test_004()/858
+location: clients/tests/test-client.py:test_004()/892
 cmd: $NMCLI --mode multiline --terse --color yes dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -49570,16 +52764,17 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2957
-location: clients/tests/test-client.py:test_004()/859
+size: 3241
+location: clients/tests/test-client.py:test_004()/893
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2782 bytes
+stdout: 3066 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -49607,6 +52802,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -49617,7 +52815,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -49626,6 +52826,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
 AP[2].CHAN:1
@@ -49634,6 +52835,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
 AP[3].CHAN:1
@@ -49671,16 +52873,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2994
-location: clients/tests/test-client.py:test_004()/860
+size: 3278
+location: clients/tests/test-client.py:test_004()/894
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2809 bytes
+stdout: 3093 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -49708,6 +52911,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -49718,7 +52924,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -49727,6 +52935,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
@@ -49735,6 +52944,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
@@ -49772,16 +52982,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1239
-location: clients/tests/test-client.py:test_004()/861
+size: 1327
+location: clients/tests/test-client.py:test_004()/895
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1029 bytes
+stdout: 1117 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -49816,18 +53027,20 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 
 <<<
-size: 1249
-location: clients/tests/test-client.py:test_004()/862
+size: 1337
+location: clients/tests/test-client.py:test_004()/896
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1029 bytes
+stdout: 1117 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -49862,18 +53075,20 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 
 <<<
-size: 1239
-location: clients/tests/test-client.py:test_004()/863
+size: 1327
+location: clients/tests/test-client.py:test_004()/897
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1029 bytes
+stdout: 1117 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -49908,18 +53123,20 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 
 <<<
-size: 1249
-location: clients/tests/test-client.py:test_004()/864
+size: 1337
+location: clients/tests/test-client.py:test_004()/898
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1029 bytes
+stdout: 1117 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -49954,10 +53171,11 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 
 <<<
 size: 682
-location: clients/tests/test-client.py:test_004()/865
+location: clients/tests/test-client.py:test_004()/899
 cmd: $NMCLI --mode multiline --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
@@ -49981,7 +53199,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 692
-location: clients/tests/test-client.py:test_004()/866
+location: clients/tests/test-client.py:test_004()/900
 cmd: $NMCLI --mode multiline --terse --color yes -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
@@ -50005,7 +53223,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
 size: 2171
-location: clients/tests/test-client.py:test_004()/867
+location: clients/tests/test-client.py:test_004()/901
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list
 lang: C
 returncode: 0
@@ -50084,7 +53302,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 <<<
 size: 2229
-location: clients/tests/test-client.py:test_004()/868
+location: clients/tests/test-client.py:test_004()/902
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -50162,14 +53380,15 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 847
-location: clients/tests/test-client.py:test_004()/869
+size: 979
+location: clients/tests/test-client.py:test_004()/903
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 668 bytes
+stdout: 800 bytes
 >>>
 IN-USE: 
+BSSID:C0:E2:BE:E8:EF:B6
 SSID:wlan0-ap-2
 MODE:Infra
 CHAN:1
@@ -50178,6 +53397,7 @@ SIGNAL:92
 BARS:****
 SECURITY:WPA1 WPA2
 IN-USE: 
+BSSID:61:95:77:AC:1E:4C
 SSID:wlan0-ap-1
 MODE:Infra
 CHAN:1
@@ -50186,6 +53406,7 @@ SIGNAL:81
 BARS:****
 SECURITY:WPA1
 IN-USE: 
+BSSID:9B:F6:B7:EC:97:76
 SSID:wlan0-ap-3
 MODE:Infra
 CHAN:1
@@ -50195,6 +53416,7 @@ BARS:**  
 SECURITY:WPA3
 
 IN-USE: 
+BSSID:94:2B:E8:F6:D2:86
 SSID:wlan1-ap-4
 MODE:Infra
 CHAN:1
@@ -50205,14 +53427,15 @@ SECURITY:WPA1 WPA2
 
 
 <<<
-size: 893
-location: clients/tests/test-client.py:test_004()/870
+size: 1025
+location: clients/tests/test-client.py:test_004()/904
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 704 bytes
+stdout: 836 bytes
 >>>
 IN-USE: 
+BSSID:C0:E2:BE:E8:EF:B6
 SSID:wlan0-ap-2
 MODE:Infrastruktura
 CHAN:1
@@ -50221,6 +53444,7 @@ SIGNAL:92
 BARS:****
 SECURITY:WPA1 WPA2
 IN-USE: 
+BSSID:61:95:77:AC:1E:4C
 SSID:wlan0-ap-1
 MODE:Infrastruktura
 CHAN:1
@@ -50229,6 +53453,7 @@ SIGNAL:81
 BARS:****
 SECURITY:WPA1
 IN-USE: 
+BSSID:9B:F6:B7:EC:97:76
 SSID:wlan0-ap-3
 MODE:Infrastruktura
 CHAN:1
@@ -50238,6 +53463,7 @@ BARS:**  
 SECURITY:WPA3
 
 IN-USE: 
+BSSID:94:2B:E8:F6:D2:86
 SSID:wlan1-ap-4
 MODE:Infrastruktura
 CHAN:1
@@ -50249,7 +53475,7 @@ SECURITY:WPA1 WPA2
 
 <<<
 size: 2284
-location: clients/tests/test-client.py:test_004()/871
+location: clients/tests/test-client.py:test_004()/905
 cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
@@ -50328,7 +53554,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 <<<
 size: 2342
-location: clients/tests/test-client.py:test_004()/872
+location: clients/tests/test-client.py:test_004()/906
 cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
@@ -50407,7 +53633,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 <<<
 size: 722
-location: clients/tests/test-client.py:test_004()/873
+location: clients/tests/test-client.py:test_004()/907
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -50435,7 +53661,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 <<<
 size: 744
-location: clients/tests/test-client.py:test_004()/874
+location: clients/tests/test-client.py:test_004()/908
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -50462,14 +53688,15 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 <<<
-size: 374
-location: clients/tests/test-client.py:test_004()/875
+size: 407
+location: clients/tests/test-client.py:test_004()/909
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 171 bytes
+stdout: 204 bytes
 >>>
 IN-USE: 
+BSSID:C0:E2:BE:E8:EF:B6
 SSID:wlan0-ap-2
 MODE:Infra
 CHAN:1
@@ -50481,14 +53708,15 @@ SECURITY:WPA1 WPA2
 
 
 <<<
-size: 393
-location: clients/tests/test-client.py:test_004()/876
+size: 426
+location: clients/tests/test-client.py:test_004()/910
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 180 bytes
+stdout: 213 bytes
 >>>
 IN-USE: 
+BSSID:C0:E2:BE:E8:EF:B6
 SSID:wlan0-ap-2
 MODE:Infrastruktura
 CHAN:1
@@ -50501,7 +53729,7 @@ SECURITY:WPA1 WPA2
 
 <<<
 size: 835
-location: clients/tests/test-client.py:test_004()/877
+location: clients/tests/test-client.py:test_004()/911
 cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
@@ -50529,7 +53757,7 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 <<<
 size: 857
-location: clients/tests/test-client.py:test_004()/878
+location: clients/tests/test-client.py:test_004()/912
 cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
@@ -50556,16 +53784,17 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 <<<
-size: 2960
-location: clients/tests/test-client.py:test_004()/879
+size: 3244
+location: clients/tests/test-client.py:test_004()/913
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2782 bytes
+stdout: 3066 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -50593,6 +53822,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -50603,7 +53835,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -50612,6 +53846,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
 AP[2].CHAN:1
@@ -50620,6 +53855,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
 AP[3].CHAN:1
@@ -50657,16 +53893,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2997
-location: clients/tests/test-client.py:test_004()/880
+size: 3281
+location: clients/tests/test-client.py:test_004()/914
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2809 bytes
+stdout: 3093 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -50694,6 +53931,9 @@ CAPABILITIES.CARRIER-DETECT:no
 CAPABILITIES.SPEED:unknown
 CAPABILITIES.IS-SOFTWARE:no
 CAPABILITIES.SRIOV:no
+INTERFACE-FLAGS.UP:yes
+INTERFACE-FLAGS.LOWER-UP:yes
+INTERFACE-FLAGS.CARRIER:no
 WIFI-PROPERTIES.WEP:yes
 WIFI-PROPERTIES.WPA:yes
 WIFI-PROPERTIES.WPA2:yes
@@ -50704,7 +53944,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -50713,6 +53955,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
@@ -50721,6 +53964,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
@@ -50759,7 +54003,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 919
-location: clients/tests/test-client.py:test_004()/881
+location: clients/tests/test-client.py:test_004()/915
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device show wlan0
 lang: C
 returncode: 0
@@ -50792,7 +54036,7 @@ IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
 size: 929
-location: clients/tests/test-client.py:test_004()/882
+location: clients/tests/test-client.py:test_004()/916
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -50824,16 +54068,17 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 3098
-location: clients/tests/test-client.py:test_004()/883
+size: 3303
+location: clients/tests/test-client.py:test_004()/917
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
-stdout: 2782 bytes
+stdout: 2987 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -50871,7 +54116,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
 AP[1].CHAN:1
@@ -50880,6 +54127,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
 AP[2].CHAN:1
@@ -50888,6 +54136,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
 AP[3].CHAN:1
@@ -50925,16 +54174,17 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 3135
-location: clients/tests/test-client.py:test_004()/884
+size: 3340
+location: clients/tests/test-client.py:test_004()/918
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2809 bytes
+stdout: 3014 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
 GENERAL.NM-TYPE:NMDeviceWifi
+GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/Devices/3
 GENERAL.VENDOR:
 GENERAL.PRODUCT:
 GENERAL.DRIVER:virtual
@@ -50972,7 +54222,9 @@ WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
 WIFI-PROPERTIES.MESH:no
+WIFI-PROPERTIES.IBSS-RSN:no
 AP[1].IN-USE: 
+AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
 AP[1].CHAN:1
@@ -50981,6 +54233,7 @@ AP[1].SIGNAL:92
 AP[1].BARS:****
 AP[1].SECURITY:WPA1 WPA2
 AP[2].IN-USE: 
+AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
 AP[2].CHAN:1
@@ -50989,6 +54242,7 @@ AP[2].SIGNAL:81
 AP[2].BARS:****
 AP[2].SECURITY:WPA1
 AP[3].IN-USE: 
+AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
 AP[3].CHAN:1
@@ -51027,7 +54281,7 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 
 <<<
 size: 1160
-location: clients/tests/test-client.py:test_004()/885
+location: clients/tests/test-client.py:test_004()/919
 cmd: $NMCLI --mode multiline --terse --color yes dev lldp list ifname eth0
 lang: C
 returncode: 0
@@ -51057,7 +54311,7 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:40 (wlan-access-point,telephone)
 
 <<<
 size: 1170
-location: clients/tests/test-client.py:test_004()/886
+location: clients/tests/test-client.py:test_004()/920
 cmd: $NMCLI --mode multiline --terse --color yes dev lldp list ifname eth0
 lang: pl_PL.UTF-8
 returncode: 0
@@ -51086,3 +54340,51 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION:Test system #3
 NEIGHBOR[2].SYSTEM-CAPABILITIES:40 (wlan-access-point,telephone)
 
 <<<
+size: 801
+location: clients/tests/test-client.py:test_004()/921
+cmd: $NMCLI --mode multiline --terse --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: C
+returncode: 0
+stdout: 406 bytes
+>>>
+connection.id:con-1
+connection.uuid:5fcfd6d7-1e63-3332-8826-a7eda103792d
+connection.type:802-3-ethernet
+connection.interface-name:
+
+connection.id:con-vpn-1
+connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
+connection.type:vpn
+connection.interface-name:
+vpn.user-name:
+
+connection.id:con-xx1
+connection.uuid:UUID-con-xx1-REPLACED-REPLACED-REPLA
+connection.type:802-11-wireless
+connection.interface-name:
+
+<<<
+size: 811
+location: clients/tests/test-client.py:test_004()/922
+cmd: $NMCLI --mode multiline --terse --color yes -f connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name connection show 5fcfd6d7-1e63-3332-8826-a7eda103792d UUID-con-vpn-1-REPLACED-REPLACED-REP UUID-con-xx1-REPLACED-REPLACED-REPLA
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 406 bytes
+>>>
+connection.id:con-1
+connection.uuid:5fcfd6d7-1e63-3332-8826-a7eda103792d
+connection.type:802-3-ethernet
+connection.interface-name:
+
+connection.id:con-vpn-1
+connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
+connection.type:vpn
+connection.interface-name:
+vpn.user-name:
+
+connection.id:con-xx1
+connection.uuid:UUID-con-xx1-REPLACED-REPLACED-REPLA
+connection.type:802-11-wireless
+connection.interface-name:
+
+<<<
diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py
index c98db75d..2742824c 100755
--- a/clients/tests/test-client.py
+++ b/clients/tests/test-client.py
@@ -91,10 +91,13 @@ import itertools
 import subprocess
 import shlex
 import re
+import fcntl
 import dbus
 import time
+import random
 import dbus.service
 import dbus.mainloop.glib
+import io
 
 ###############################################################################
 
@@ -171,19 +174,81 @@ class Util:
         return "'" + s.replace("'", "'\"'\"'") + "'"
 
     @staticmethod
-    def popen_wait(p, timeout = None):
-        # wait() has a timeout argument only since 3.3
-        if Util.python_has_version(3, 3):
-            return p.wait(timeout)
-        if timeout is None:
-            return p.wait()
+    def popen_wait(p, timeout = 0):
+        (res, b_stdout, b_stderr) = Util.popen_wait_read(p, timeout = timeout, read_std_pipes = False)
+        return res
+
+    @staticmethod
+    def popen_wait_read(p, timeout = 0, read_std_pipes = True):
         start = NM.utils_get_timestamp_msec()
+        delay = 0.0005
+        b_stdout = b''
+        b_stderr = b''
+        res = None
         while True:
+            if read_std_pipes:
+                b_stdout += Util.buffer_read(p.stdout)
+                b_stderr += Util.buffer_read(p.stderr)
             if p.poll() is not None:
-                return p.returncode
-            if start + (timeout * 1000) < NM.utils_get_timestamp_msec():
-                raise Exception("timeout expired")
-            time.sleep(0.05)
+                res = p.returncode
+                break
+            if timeout == 0:
+                break
+            assert(timeout > 0)
+            remaining = timeout - ((NM.utils_get_timestamp_msec() - start) / 1000.0)
+            if remaining <= 0:
+                break
+            delay = min(delay * 2, remaining, 0.05)
+            time.sleep(delay)
+        return (res, b_stdout, b_stderr)
+
+    @staticmethod
+    def buffer_read(buf):
+        b = b''
+        while True:
+            try:
+                b1 = buf.read()
+            except io.BlockingIOError:
+                b1 = b''
+            except IOError:
+                b1 = b''
+            if not b1:
+                return b
+            b += b1
+
+    @staticmethod
+    def buffer_set_nonblock(buf):
+        fd = buf.fileno()
+        fl = fcntl.fcntl(fd, fcntl.F_GETFL)
+        fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK)
+
+    @staticmethod
+    def random_job(jobs):
+        jobs = list(jobs)
+        l = len(jobs)
+        t = l * (l + 1) / 2
+        while True:
+            # we return a random jobs from the list, but the indexes at the front of
+            # the list are more likely. The idea is, that those jobs were started first,
+            # and are expected to complete first. As we poll, we want to check more frequently
+            # on the elements at the beginning of the list...
+            #
+            # Let's assign probabilities with an arithmetic series.
+            # That is, if there are 16 jobs, then the first gets weighted
+            # with 16, the second with 15, then 14, and so on, until the
+            # last has weight 1. That means, the first element is 16 times
+            # more probable than the last.
+            # Element at idx (starting with 0) is picked with probability
+            #    1 / (l*(l+1)/2) * (l - idx)
+            r = random.random() * t
+            idx = 0
+            rx = 0
+            while True:
+                rx += (l - idx)
+                if rx >= r or idx == l - 1:
+                    yield jobs[idx]
+                    break
+                idx += 1
 
     @staticmethod
     def iter_single(itr, min_num = 1, max_num = 1):
@@ -213,6 +278,9 @@ class Util:
     def replace_text(text, replace_arr):
         if not replace_arr:
             return text
+        needs_encode = Util.python_has_version(3) and Util.is_string(text)
+        if needs_encode:
+            text = text.encode('utf-8')
         text = [text]
         for replace in replace_arr:
             try:
@@ -236,7 +304,17 @@ class Util:
                     text2.append( (v_replace,) )
                     text2.append(t3)
             text = text2
-        return b''.join([(t[0] if isinstance(t, tuple) else t) for t in text])
+        bb = b''.join([(t[0] if isinstance(t, tuple) else t) for t in text])
+        if needs_encode:
+            bb = bb.decode('utf-8')
+        return bb
+
+    @staticmethod
+    def replace_text_sort_list(lst, replace_arr):
+        lst = [ (Util.replace_text(elem, replace_arr), elem) for elem in lst ]
+        lst = sorted(lst)
+        lst = [ tup[1] for tup in lst ]
+        return list(lst)
 
     @staticmethod
     def debug_dbus_interface():
@@ -336,7 +414,7 @@ class NMStubServer:
             if (NM.utils_get_timestamp_msec() - start) >= 4000:
                 p.stdin.close()
                 p.kill()
-                Util.popen_wait(p, 1000)
+                Util.popen_wait(p, 1)
                 raise Exception("after starting stub service the D-Bus name was not claimed in time")
 
         self._nmobj = nmobj
@@ -344,14 +422,17 @@ class NMStubServer:
         self._p = p
 
     def shutdown(self):
+        conn = self._conn
+        p = self._p
         self._nmobj = None
         self._nmiface = None
         self._conn = None
-        self._p.stdin.close()
-        self._p.kill()
-        Util.popen_wait(self._p, 1000)
         self._p = None
-        if self._conn_get_main_object(self._conn) is not None:
+        p.stdin.close()
+        p.kill()
+        if Util.popen_wait(p, 1) is None:
+            raise Exception("Stub service did not exit in time")
+        if self._conn_get_main_object(conn) is not None:
             raise Exception("Stub service is not still here although it should shut down")
 
     class _MethodProxy:
@@ -366,11 +447,8 @@ class NMStubServer:
             if kwargs:
                 # for convenience, we allow the caller to specify arguments
                 # as kwargs. In this case, we construct a a{sv} array as last argument.
-                kwargs2 = {}
                 args = list(args)
-                args.append(kwargs2)
-                for k in kwargs.keys():
-                    kwargs2[k] = kwargs[k]
+                args.append(kwargs)
             return method(*args)
 
     def __getattr__(self, member):
@@ -381,9 +459,16 @@ class NMStubServer:
     def addConnection(self, connection, do_verify_strict = True):
         return self.op_AddConnection(connection, do_verify_strict)
 
+    def findConnections(self, **kwargs):
+        if kwargs:
+            lst = self.op_FindConnections(**kwargs)
+        else:
+            lst = self.op_FindConnections( { } )
+        return list([ (str(elem[0]), str(elem[1]), str(elem[2])) for elem in lst ])
+
     def findConnectionUuid(self, con_id, required = True):
         try:
-            u = Util.iter_single(self.op_FindConnections(con_id = con_id))[1]
+            u = Util.iter_single(self.findConnections(con_id = con_id))[1]
             assert u, ("Invalid uuid %s" % (u))
         except Exception as e:
             if not required:
@@ -409,37 +494,77 @@ class AsyncProcess():
     def __init__(self,
                  args,
                  env,
-                 complete_cb):
-        self._args = args
+                 complete_cb,
+                 max_waittime_msec = 20000):
+        self._args = list(args)
         self._env = env
         self._complete_cb = complete_cb
+        self._max_waittime_msec = max_waittime_msec
 
     def start(self):
         if not hasattr(self, '_p'):
+            self._p_start_timestamp = NM.utils_get_timestamp_msec()
+            self._p_stdout_buf = b''
+            self._p_stderr_buf = b''
             self._p = subprocess.Popen(self._args,
                                        stdout = subprocess.PIPE,
                                        stderr = subprocess.PIPE,
                                        env = self._env)
+            Util.buffer_set_nonblock(self._p.stdout)
+            Util.buffer_set_nonblock(self._p.stderr)
+
+    def _timeout_remaining_time(self):
+        # note that we call this during poll() and wait_and_complete().
+        # we don't know the exact time when the process terminated,
+        # so this is only approximately correct, if we call poll/wait
+        # frequently.
+        # Worst case, we will think that the process did not time out,
+        # when in fact it was running longer than max-waittime.
+        return self._max_waittime_msec - (NM.utils_get_timestamp_msec() - self._p_start_timestamp)
+
+    def poll(self, timeout = 0):
+        self.start()
 
-    def wait(self):
+        (return_code, b_stdout, b_stderr) = Util.popen_wait_read(self._p, timeout)
 
-        self.start()
+        self._p_stdout_buf += b_stdout
+        self._p_stderr_buf += b_stderr
 
-        Util.popen_wait(self._p, 2000)
+        if     return_code is None \
+           and self._timeout_remaining_time() <= 0:
+            raise Exception("process is still running after timeout: %s" % (' '.join(self._args)))
+        return return_code
 
-        (returncode, stdout, stderr) = (self._p.returncode, self._p.stdout.read(), self._p.stderr.read())
+    def wait_and_complete(self):
+        self.start()
 
-        self._p.stdout.close()
-        self._p.stderr.close()
+        p = self._p
         self._p = None
 
-        self._complete_cb(self, returncode, stdout, stderr)
+        (return_code, b_stdout, b_stderr) = Util.popen_wait_read(p, max(0, self._timeout_remaining_time()) / 1000)
+        (stdout, stderr) = (p.stdout.read(), p.stderr.read())
+        p.stdout.close()
+        p.stderr.close()
+
+        stdout = self._p_stdout_buf + b_stdout + stdout
+        stderr = self._p_stderr_buf + b_stderr + stderr
+        del self._p_stdout_buf
+        del self._p_stderr_buf
+
+        if return_code is None:
+            print(stdout)
+            print(stderr)
+            raise Exception("process did not complete in time: %s" % (' '.join(self._args)))
+
+        self._complete_cb(self, return_code, stdout, stderr)
 
 ###############################################################################
 
 class NmTestBase(unittest.TestCase):
     pass
 
+MAX_JOBS = 15
+
 class TestNmcli(NmTestBase):
 
     @staticmethod
@@ -479,6 +604,7 @@ class TestNmcli(NmTestBase):
                      expected_stderr = _DEFAULT_ARG,
                      replace_stdout = None,
                      replace_stderr = None,
+                     replace_cmd = None,
                      sort_lines_stdout = False,
                      extra_env = None,
                      sync_barrier = False):
@@ -493,6 +619,7 @@ class TestNmcli(NmTestBase):
                              expected_stderr,
                              replace_stdout,
                              replace_stderr,
+                             replace_cmd,
                              sort_lines_stdout,
                              extra_env,
                              sync_barrier,
@@ -510,6 +637,7 @@ class TestNmcli(NmTestBase):
                    expected_stderr = _DEFAULT_ARG,
                    replace_stdout = None,
                    replace_stderr = None,
+                   replace_cmd = None,
                    sort_lines_stdout = False,
                    extra_env = None,
                    sync_barrier = None):
@@ -536,6 +664,7 @@ class TestNmcli(NmTestBase):
                              expected_stderr,
                              replace_stdout,
                              replace_stderr,
+                             replace_cmd,
                              sort_lines_stdout,
                              extra_env,
                              sync_barrier,
@@ -551,6 +680,7 @@ class TestNmcli(NmTestBase):
                     expected_stderr,
                     replace_stdout,
                     replace_stderr,
+                    replace_cmd,
                     sort_lines_stdout,
                     extra_env,
                     sync_barrier,
@@ -603,6 +733,7 @@ class TestNmcli(NmTestBase):
         env['TERM'] = 'linux'
         env['ASAN_OPTIONS'] = 'detect_leaks=0'
         env['XDG_CONFIG_HOME'] = PathConfiguration.srcdir()
+        env['NM_TEST_CALLING_NUM'] = str(calling_num)
         if fatal_warnings is _DEFAULT_ARG or fatal_warnings:
             env['G_DEBUG'] = 'fatal-warnings'
 
@@ -612,6 +743,8 @@ class TestNmcli(NmTestBase):
             replace_stdout = list(replace_stdout)
         if replace_stderr is not None:
             replace_stderr = list(replace_stderr)
+        if replace_cmd is not None:
+            replace_cmd = list(replace_cmd)
 
         if check_on_disk is _DEFAULT_ARG:
             check_on_disk = (    expected_returncode is _DEFAULT_ARG
@@ -624,6 +757,9 @@ class TestNmcli(NmTestBase):
         if expected_stderr is _DEFAULT_ARG:
             expected_stderr = None
 
+        results_idx = len(self._results)
+        self._results.append(None)
+
         def complete_cb(async_job,
                         returncode,
                         stdout,
@@ -668,7 +804,8 @@ class TestNmcli(NmTestBase):
                    self.assertEqual(returncode, -5)
 
             if check_on_disk:
-                cmd = '$NMCLI %s' % (' '.join([Util.quote(a) for a in args[1:]])),
+                cmd = '$NMCLI %s' % (' '.join([Util.quote(a) for a in args[1:]]))
+                cmd = Util.replace_text(cmd, replace_cmd)
 
                 content = ('location: %s\n' % (calling_location)).encode('utf8') + \
                           ('cmd: %s\n' % (cmd)).encode('utf8') + \
@@ -685,11 +822,11 @@ class TestNmcli(NmTestBase):
                 content = ('size: %s\n' % (len(content))).encode('utf8') + \
                           content
 
-                self._results.append({
+                self._results[results_idx] = {
                     'test_name'        : test_name,
                     'ignore_l10n_diff' : ignore_l10n_diff,
                     'content'          : content,
-                })
+                }
 
         async_job = AsyncProcess(args = args,
                                  env = env,
@@ -697,20 +834,46 @@ class TestNmcli(NmTestBase):
 
         self._async_jobs.append(async_job)
 
-        if sync_barrier:
-            self.async_wait()
-        else:
-            self.async_start()
+        self.async_start(wait_all = sync_barrier)
+
+    def async_start(self, wait_all = False):
 
-    def async_start(self):
-        # limit number parallel running jobs
-        for async_job in self._async_jobs[0:15]:
-            async_job.start()
+        while True:
+
+            while True:
+                for async_job in list(self._async_jobs[0:MAX_JOBS]):
+                    async_job.start()
+                # start up to MAX_JOBS jobs, but poll() and complete those
+                # that are already exited. Retry, until there are no more
+                # jobs to start, or until MAX_JOBS are running.
+                jobs_running = []
+                for async_job in list(self._async_jobs[0:MAX_JOBS]):
+                    if async_job.poll() is not None:
+                        self._async_jobs.remove(async_job)
+                        async_job.wait_and_complete()
+                        continue
+                    jobs_running.append(async_job)
+                if len(jobs_running) >= len(self._async_jobs):
+                    break
+                if len(jobs_running) >= MAX_JOBS:
+                    break
+
+            if not jobs_running:
+                return
+            if not wait_all:
+                return
+
+            # in a loop, indefinitely poll the running jobs until we find one that
+            # completes. Note that poll() itself will raise an exception if a
+            # jobs times out.
+            for async_job in Util.random_job(jobs_running):
+                if async_job.poll(timeout = 0.03) is not None:
+                    self._async_jobs.remove(async_job)
+                    async_job.wait_and_complete()
+                    break
 
     def async_wait(self):
-        while self._async_jobs:
-            self.async_start()
-            self._async_jobs.pop(0).wait()
+        return self.async_start(wait_all = True)
 
     def _nm_test_pre(self):
         self._calling_num = {}
@@ -889,38 +1052,38 @@ class TestNmcli(NmTestBase):
     def test_003(self):
         self.init_001()
 
-        replace_stdout = []
+        replace_uuids = []
 
-        replace_stdout.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('con-xx1')), 'UUID-con-xx1-REPLACED-REPLACED-REPLA'))
+        replace_uuids.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('con-xx1')), 'UUID-con-xx1-REPLACED-REPLACED-REPLA'))
 
         self.call_nmcli(['c', 'add', 'type', 'ethernet', 'ifname', '*', 'con-name', 'con-xx1'],
-                        replace_stdout = replace_stdout)
+                        replace_stdout = replace_uuids)
 
         self.call_nmcli_l(['c', 's'],
-                          replace_stdout = replace_stdout)
+                          replace_stdout = replace_uuids)
 
-        replace_stdout.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('con-gsm1')), 'UUID-con-gsm1-REPLACED-REPLACED-REPL'))
+        replace_uuids.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('con-gsm1')), 'UUID-con-gsm1-REPLACED-REPLACED-REPL'))
 
         self.call_nmcli(['connection', 'add', 'type', 'gsm', 'autoconnect', 'no', 'con-name', 'con-gsm1', 'ifname', '*', 'apn', 'xyz.con-gsm1', 'serial.baud', '5', 'serial.send-delay', '100', 'serial.pari', '1', 'ipv4.dns-options', ' '],
-                        replace_stdout = replace_stdout)
+                        replace_stdout = replace_uuids)
 
-        replace_stdout.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('ethernet')), 'UUID-ethernet-REPLACED-REPLACED-REPL'))
+        replace_uuids.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('ethernet')), 'UUID-ethernet-REPLACED-REPLACED-REPL'))
 
         self.call_nmcli(['c', 'add', 'type', 'ethernet', 'ifname', '*'],
-                        replace_stdout = replace_stdout)
+                        replace_stdout = replace_uuids)
 
         self.call_nmcli_l(['c', 's'],
-                          replace_stdout = replace_stdout)
+                          replace_stdout = replace_uuids)
 
         self.call_nmcli_l(['-f', 'ALL', 'c', 's'],
-                          replace_stdout = replace_stdout)
+                          replace_stdout = replace_uuids)
 
         self.call_nmcli_l(['--complete-args', '-f', 'ALL', 'c', 's', ''],
-                          replace_stdout = replace_stdout,
+                          replace_stdout = replace_uuids,
                           sort_lines_stdout = True)
 
         self.call_nmcli_l(['con', 's', 'con-gsm1'],
-                          replace_stdout = replace_stdout)
+                          replace_stdout = replace_uuids)
 
         # activate the same profile on multiple devices. Our stub-implmentation
         # is fine with that... although NetworkManager service would reject
@@ -936,37 +1099,41 @@ class TestNmcli(NmTestBase):
             self.call_nmcli(['con', 'up', 'ethernet', 'ifname', dev])
 
             self.call_nmcli_l(['con'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(['-f', 'ALL', 'con'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(['-f', 'ALL', 'con', 's', '-a'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(['-f', 'ACTIVE-PATH,DEVICE,UUID', 'con', 's', '-act'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(['-f', 'UUID,NAME', 'con', 's', '--active'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(['-f', 'ALL', 'con', 's', 'ethernet'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(['-f', 'GENERAL.STATE', 'con', 's', 'ethernet'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(['con', 's', 'ethernet'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
+
+            self.call_nmcli_l(['-f', 'ALL', 'dev', 'status'],
+                              replace_stdout = replace_uuids)
 
+            # test invalid call ('s' abbrevates 'status' and not 'show'
             self.call_nmcli_l(['-f', 'ALL', 'dev', 's', 'eth0'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(['-f', 'ALL', 'dev', 'show', 'eth0'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(['-f', 'ALL', '-t', 'dev', 'show', 'eth0'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
         self.async_wait()
 
@@ -981,30 +1148,30 @@ class TestNmcli(NmTestBase):
 
             for mode in Util.iter_nmcli_output_modes():
                 self.call_nmcli_l(mode + ['-f', 'ALL', 'con'],
-                                  replace_stdout = replace_stdout)
+                                  replace_stdout = replace_uuids)
 
                 self.call_nmcli_l(mode + ['-f', 'UUID,TYPE', 'con'],
-                                  replace_stdout = replace_stdout)
+                                  replace_stdout = replace_uuids)
 
                 self.call_nmcli_l(mode + ['con', 's', 'ethernet'],
-                                  replace_stdout = replace_stdout)
+                                  replace_stdout = replace_uuids)
 
                 self.call_nmcli_l(mode + ['c', 's', '/org/freedesktop/NetworkManager/ActiveConnection/1'],
-                                  replace_stdout = replace_stdout)
+                                  replace_stdout = replace_uuids)
 
                 self.call_nmcli_l(mode + ['-f', 'all', 'dev', 'show', 'eth0'],
-                                  replace_stdout = replace_stdout)
+                                  replace_stdout = replace_uuids)
 
     @nm_test
     def test_004(self):
         self.init_001()
 
-        replace_stdout = []
+        replace_uuids = []
 
-        replace_stdout.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('con-xx1')), 'UUID-con-xx1-REPLACED-REPLACED-REPLA'))
+        replace_uuids.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('con-xx1')), 'UUID-con-xx1-REPLACED-REPLACED-REPLA'))
 
         self.call_nmcli(['c', 'add', 'type', 'wifi', 'ifname', '*', 'ssid', 'foobar', 'con-name', 'con-xx1'],
-                        replace_stdout = replace_stdout)
+                        replace_stdout = replace_uuids)
 
         self.call_nmcli(['connection', 'mod', 'con-xx1', 'ip.gateway', ''])
         self.call_nmcli(['connection', 'mod', 'con-xx1', 'ipv4.gateway', '172.16.0.1'], lang = 'pl')
@@ -1013,29 +1180,29 @@ class TestNmcli(NmTestBase):
         self.call_nmcli(['connection', 'mod', 'con-xx1', '802-11-wireless.band', 'a'])
         self.call_nmcli(['connection', 'mod', 'con-xx1', 'ipv4.addresses', '192.168.77.5/24', 'ipv4.routes', '2.3.4.5/32 192.168.77.1', 'ipv6.addresses', '1:2:3:4::6/64', 'ipv6.routes', '1:2:3:4:5:6::5/128'])
         self.call_nmcli_l(['con', 's', 'con-xx1'],
-                          replace_stdout = replace_stdout)
+                          replace_stdout = replace_uuids)
 
         self.async_wait()
 
-        replace_stdout.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('con-vpn-1')), 'UUID-con-vpn-1-REPLACED-REPLACED-REP'))
+        replace_uuids.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('con-vpn-1')), 'UUID-con-vpn-1-REPLACED-REPLACED-REP'))
 
         self.call_nmcli(['connection', 'add', 'type', 'vpn', 'con-name', 'con-vpn-1', 'ifname', '*', 'vpn-type', 'openvpn', 'vpn.data', 'key1 = val1,   key2  = val2, key3=val3'],
-                        replace_stdout = replace_stdout)
+                        replace_stdout = replace_uuids)
 
         self.call_nmcli_l(['con', 's'],
-                          replace_stdout = replace_stdout)
+                          replace_stdout = replace_uuids)
         self.call_nmcli_l(['con', 's', 'con-vpn-1'],
-                          replace_stdout = replace_stdout)
+                          replace_stdout = replace_uuids)
 
         self.call_nmcli(['con', 'up', 'con-xx1'])
         self.call_nmcli_l(['con', 's'],
-                          replace_stdout = replace_stdout)
+                          replace_stdout = replace_uuids)
 
         self.call_nmcli(['con', 'up', 'con-vpn-1'])
         self.call_nmcli_l(['con', 's'],
-                          replace_stdout = replace_stdout)
+                          replace_stdout = replace_uuids)
         self.call_nmcli_l(['con', 's', 'con-vpn-1'],
-                          replace_stdout = replace_stdout)
+                          replace_stdout = replace_uuids)
 
         self.async_wait()
 
@@ -1043,75 +1210,82 @@ class TestNmcli(NmTestBase):
                              'VpnState',
                              dbus.UInt32(NM.VpnConnectionState.ACTIVATED))
 
+        uuids = Util.replace_text_sort_list([ c[1] for c in self.srv.findConnections() ], replace_uuids)
+
         for mode in Util.iter_nmcli_output_modes():
 
             self.call_nmcli_l(mode + ['con', 's', 'con-vpn-1'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
             self.call_nmcli_l(mode + ['con', 's', 'con-vpn-1'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(mode + ['-f', 'ALL', 'con', 's', 'con-vpn-1'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             # This only filters 'vpn' settings from the connection profile.
             # Contrary to '-f GENERAL' below, it does not show the properties of
             # the activated VPN connection. This is a nmcli bug.
             self.call_nmcli_l(mode + ['-f', 'VPN', 'con', 's', 'con-vpn-1'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(mode + ['-f', 'GENERAL', 'con', 's', 'con-vpn-1'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(mode + ['dev', 's'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(mode + ['-f', 'all', 'dev', 'status'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(mode + ['dev', 'show'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(mode + ['-f', 'all', 'dev', 'show'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(mode + ['dev', 'show', 'wlan0'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(mode + ['-f', 'all', 'dev', 'show', 'wlan0'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(mode + ['-f', 'GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES', 'dev', 'show', 'wlan0'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(mode + ['-f', 'GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES', 'dev', 'show', 'wlan0'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(mode + ['-f', 'DEVICE,TYPE,DBUS-PATH', 'dev'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(mode + ['-f', 'ALL', 'device', 'wifi', 'list' ],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
             self.call_nmcli_l(mode + ['-f', 'COMMON', 'device', 'wifi', 'list' ],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
             self.call_nmcli_l(mode + ['-f', 'NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH',
                               'device', 'wifi', 'list'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
             self.call_nmcli_l(mode + ['-f', 'ALL', 'device', 'wifi', 'list', 'bssid', 'C0:E2:BE:E8:EF:B6'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
             self.call_nmcli_l(mode + ['-f', 'COMMON', 'device', 'wifi', 'list', 'bssid', 'C0:E2:BE:E8:EF:B6'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
             self.call_nmcli_l(mode + ['-f', 'NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH',
                               'device', 'wifi', 'list', 'bssid', 'C0:E2:BE:E8:EF:B6'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
             self.call_nmcli_l(mode + ['-f', 'ALL', 'device', 'show', 'wlan0' ],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
             self.call_nmcli_l(mode + ['-f', 'COMMON', 'device', 'show', 'wlan0' ],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
             self.call_nmcli_l(mode + ['-f', 'GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS', 'device', 'show', 'wlan0' ],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
 
             self.call_nmcli_l(mode + ['dev', 'lldp', 'list', 'ifname', 'eth0'],
-                              replace_stdout = replace_stdout)
+                              replace_stdout = replace_uuids)
+
+            self.call_nmcli_l(mode + ['-f', 'connection.id,connection.uuid,connection.type,connection.interface-name,802-3-ethernet.mac-address,vpn.user-name', 'connection', 'show' ] + uuids,
+                              replace_stdout = replace_uuids,
+                              replace_cmd = replace_uuids)
+
 
 ###############################################################################
 
diff --git a/clients/tui/meson.build b/clients/tui/meson.build
index 837645a6..8948d6ff 100644
--- a/clients/tui/meson.build
+++ b/clients/tui/meson.build
@@ -1,13 +1,6 @@
 name = 'nmtui'
 
-deps = [
-  newt_dep,
-  libnm_core_dep,
-]
-
-cflags = clients_cflags + [
-  '-DG_LOG_DOMAIN="@0@"'.format(name),
-]
+common_c_flags = clients_c_flags + ['-DG_LOG_DOMAIN="@0@"'.format(name)]
 
 subdir('newt')
 
@@ -54,10 +47,9 @@ sources = files(
   'nmt-widget-list.c',
 )
 
-deps += [
-  libnm_dep,
-  libnmc_dep,
+deps = [
   libnmc_base_dep,
+  libnmc_dep,
   libnmt_newt_dep,
 ]
 
@@ -65,7 +57,8 @@ executable(
   name,
   sources,
   dependencies: deps,
-  c_args: cflags,
+  c_args: common_c_flags,
+  link_with: libnm_systemd_logging_stub,
   link_args: ldflags_linker_script_binary,
   link_depends: linker_script_binary,
   install: true,
diff --git a/clients/tui/newt/meson.build b/clients/tui/newt/meson.build
index 5bb713d3..d543f7ea 100644
--- a/clients/tui/newt/meson.build
+++ b/clients/tui/newt/meson.build
@@ -21,15 +21,20 @@ sources = files(
   'nmt-newt-widget.c',
 )
 
+deps = [
+  libnm_nm_default_dep,
+  newt_dep,
+]
+
 libnmt_newt = static_library(
   'nmt-newt',
-  sources: sources + [libnm_enum[1]],
-  include_directories: libnm_inc,
+  sources: sources,
   dependencies: deps,
-  c_args: cflags,
+  c_args: common_c_flags,
 )
 
 libnmt_newt_dep = declare_dependency(
   include_directories: include_directories('.'),
+  dependencies: newt_dep,
   link_with: libnmt_newt,
 )
diff --git a/clients/tui/newt/nmt-newt-button-box.c b/clients/tui/newt/nmt-newt-button-box.c
index c69c1911..4334d418 100644
--- a/clients/tui/newt/nmt-newt-button-box.c
+++ b/clients/tui/newt/nmt-newt-button-box.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/newt/nmt-newt-button-box.h b/clients/tui/newt/nmt-newt-button-box.h
index dc9eb2b3..b9b82a1e 100644
--- a/clients/tui/newt/nmt-newt-button-box.h
+++ b/clients/tui/newt/nmt-newt-button-box.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_BUTTON_BOX_H
diff --git a/clients/tui/newt/nmt-newt-button.c b/clients/tui/newt/nmt-newt-button.c
index 0a720be7..83420d2f 100644
--- a/clients/tui/newt/nmt-newt-button.c
+++ b/clients/tui/newt/nmt-newt-button.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/newt/nmt-newt-button.h b/clients/tui/newt/nmt-newt-button.h
index eb5e2a82..bfcb4996 100644
--- a/clients/tui/newt/nmt-newt-button.h
+++ b/clients/tui/newt/nmt-newt-button.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_BUTTON_H
diff --git a/clients/tui/newt/nmt-newt-checkbox.c b/clients/tui/newt/nmt-newt-checkbox.c
index c5a648e3..95773f20 100644
--- a/clients/tui/newt/nmt-newt-checkbox.c
+++ b/clients/tui/newt/nmt-newt-checkbox.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/newt/nmt-newt-checkbox.h b/clients/tui/newt/nmt-newt-checkbox.h
index 5e1ba768..4cf64198 100644
--- a/clients/tui/newt/nmt-newt-checkbox.h
+++ b/clients/tui/newt/nmt-newt-checkbox.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_CHECKBOX_H
diff --git a/clients/tui/newt/nmt-newt-component.c b/clients/tui/newt/nmt-newt-component.c
index 0123a72a..5a7eec8e 100644
--- a/clients/tui/newt/nmt-newt-component.c
+++ b/clients/tui/newt/nmt-newt-component.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/newt/nmt-newt-component.h b/clients/tui/newt/nmt-newt-component.h
index f86c8cad..9f64a09f 100644
--- a/clients/tui/newt/nmt-newt-component.h
+++ b/clients/tui/newt/nmt-newt-component.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_COMPONENT_H
diff --git a/clients/tui/newt/nmt-newt-container.c b/clients/tui/newt/nmt-newt-container.c
index a081f5c2..7f88397e 100644
--- a/clients/tui/newt/nmt-newt-container.c
+++ b/clients/tui/newt/nmt-newt-container.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/newt/nmt-newt-container.h b/clients/tui/newt/nmt-newt-container.h
index 10fdc640..30939872 100644
--- a/clients/tui/newt/nmt-newt-container.h
+++ b/clients/tui/newt/nmt-newt-container.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_CONTAINER_H
diff --git a/clients/tui/newt/nmt-newt-entry-numeric.c b/clients/tui/newt/nmt-newt-entry-numeric.c
index 032a6174..88d4ceb0 100644
--- a/clients/tui/newt/nmt-newt-entry-numeric.c
+++ b/clients/tui/newt/nmt-newt-entry-numeric.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/newt/nmt-newt-entry-numeric.h b/clients/tui/newt/nmt-newt-entry-numeric.h
index d61bd146..d4c62363 100644
--- a/clients/tui/newt/nmt-newt-entry-numeric.h
+++ b/clients/tui/newt/nmt-newt-entry-numeric.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_ENTRY_NUMERIC_H
diff --git a/clients/tui/newt/nmt-newt-entry.c b/clients/tui/newt/nmt-newt-entry.c
index 4d534ee5..62d40a11 100644
--- a/clients/tui/newt/nmt-newt-entry.c
+++ b/clients/tui/newt/nmt-newt-entry.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/newt/nmt-newt-entry.h b/clients/tui/newt/nmt-newt-entry.h
index 628d733b..d6f5530b 100644
--- a/clients/tui/newt/nmt-newt-entry.h
+++ b/clients/tui/newt/nmt-newt-entry.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_ENTRY_H
diff --git a/clients/tui/newt/nmt-newt-form.c b/clients/tui/newt/nmt-newt-form.c
index a8b53eef..881b6f5d 100644
--- a/clients/tui/newt/nmt-newt-form.c
+++ b/clients/tui/newt/nmt-newt-form.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/newt/nmt-newt-form.h b/clients/tui/newt/nmt-newt-form.h
index 114d5fbc..ed1b0b2e 100644
--- a/clients/tui/newt/nmt-newt-form.h
+++ b/clients/tui/newt/nmt-newt-form.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_FORM_H
diff --git a/clients/tui/newt/nmt-newt-grid.c b/clients/tui/newt/nmt-newt-grid.c
index f9ebd66f..68ac874c 100644
--- a/clients/tui/newt/nmt-newt-grid.c
+++ b/clients/tui/newt/nmt-newt-grid.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/newt/nmt-newt-grid.h b/clients/tui/newt/nmt-newt-grid.h
index 2f92f199..9a209dcc 100644
--- a/clients/tui/newt/nmt-newt-grid.h
+++ b/clients/tui/newt/nmt-newt-grid.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_GRID_H
diff --git a/clients/tui/newt/nmt-newt-hacks.c b/clients/tui/newt/nmt-newt-hacks.c
index 67db7379..9c93b4b5 100644
--- a/clients/tui/newt/nmt-newt-hacks.c
+++ b/clients/tui/newt/nmt-newt-hacks.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/newt/nmt-newt-hacks.h b/clients/tui/newt/nmt-newt-hacks.h
index ec692895..537d0d45 100644
--- a/clients/tui/newt/nmt-newt-hacks.h
+++ b/clients/tui/newt/nmt-newt-hacks.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_HACKS_H
diff --git a/clients/tui/newt/nmt-newt-label.c b/clients/tui/newt/nmt-newt-label.c
index 0f510393..4edd6f8f 100644
--- a/clients/tui/newt/nmt-newt-label.c
+++ b/clients/tui/newt/nmt-newt-label.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/newt/nmt-newt-label.h b/clients/tui/newt/nmt-newt-label.h
index d55a2c48..a997ef9e 100644
--- a/clients/tui/newt/nmt-newt-label.h
+++ b/clients/tui/newt/nmt-newt-label.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_LABEL_H
diff --git a/clients/tui/newt/nmt-newt-listbox.c b/clients/tui/newt/nmt-newt-listbox.c
index 9edb5b31..6d471dff 100644
--- a/clients/tui/newt/nmt-newt-listbox.c
+++ b/clients/tui/newt/nmt-newt-listbox.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/newt/nmt-newt-listbox.h b/clients/tui/newt/nmt-newt-listbox.h
index 331738ab..4783eb96 100644
--- a/clients/tui/newt/nmt-newt-listbox.h
+++ b/clients/tui/newt/nmt-newt-listbox.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_LISTBOX_H
diff --git a/clients/tui/newt/nmt-newt-popup.c b/clients/tui/newt/nmt-newt-popup.c
index 54e4c2a7..08860aec 100644
--- a/clients/tui/newt/nmt-newt-popup.c
+++ b/clients/tui/newt/nmt-newt-popup.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/newt/nmt-newt-popup.h b/clients/tui/newt/nmt-newt-popup.h
index 7c0f120c..d9027b3f 100644
--- a/clients/tui/newt/nmt-newt-popup.h
+++ b/clients/tui/newt/nmt-newt-popup.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_POPUP_H
diff --git a/clients/tui/newt/nmt-newt-section.c b/clients/tui/newt/nmt-newt-section.c
index 6f8064ad..03261d50 100644
--- a/clients/tui/newt/nmt-newt-section.c
+++ b/clients/tui/newt/nmt-newt-section.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/newt/nmt-newt-section.h b/clients/tui/newt/nmt-newt-section.h
index 9cb163d8..c6e1cbfd 100644
--- a/clients/tui/newt/nmt-newt-section.h
+++ b/clients/tui/newt/nmt-newt-section.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_SECTION_H
diff --git a/clients/tui/newt/nmt-newt-separator.c b/clients/tui/newt/nmt-newt-separator.c
index 93a8771a..9ab1dc85 100644
--- a/clients/tui/newt/nmt-newt-separator.c
+++ b/clients/tui/newt/nmt-newt-separator.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/newt/nmt-newt-separator.h b/clients/tui/newt/nmt-newt-separator.h
index 73442b29..17822265 100644
--- a/clients/tui/newt/nmt-newt-separator.h
+++ b/clients/tui/newt/nmt-newt-separator.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_SEPARATOR_H
diff --git a/clients/tui/newt/nmt-newt-stack.c b/clients/tui/newt/nmt-newt-stack.c
index ec68687d..af0f85f3 100644
--- a/clients/tui/newt/nmt-newt-stack.c
+++ b/clients/tui/newt/nmt-newt-stack.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/newt/nmt-newt-stack.h b/clients/tui/newt/nmt-newt-stack.h
index e088ae45..0db7eb11 100644
--- a/clients/tui/newt/nmt-newt-stack.h
+++ b/clients/tui/newt/nmt-newt-stack.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_STACK_H
diff --git a/clients/tui/newt/nmt-newt-textbox.c b/clients/tui/newt/nmt-newt-textbox.c
index 00d2b5cc..945284c8 100644
--- a/clients/tui/newt/nmt-newt-textbox.c
+++ b/clients/tui/newt/nmt-newt-textbox.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/newt/nmt-newt-textbox.h b/clients/tui/newt/nmt-newt-textbox.h
index 563ffe5c..d1710d32 100644
--- a/clients/tui/newt/nmt-newt-textbox.h
+++ b/clients/tui/newt/nmt-newt-textbox.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_TEXTBOX_H
diff --git a/clients/tui/newt/nmt-newt-toggle-button.c b/clients/tui/newt/nmt-newt-toggle-button.c
index da7624d4..e780499c 100644
--- a/clients/tui/newt/nmt-newt-toggle-button.c
+++ b/clients/tui/newt/nmt-newt-toggle-button.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/newt/nmt-newt-toggle-button.h b/clients/tui/newt/nmt-newt-toggle-button.h
index f5b88139..8f5dbaa0 100644
--- a/clients/tui/newt/nmt-newt-toggle-button.h
+++ b/clients/tui/newt/nmt-newt-toggle-button.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_TOGGLE_BUTTON_H
diff --git a/clients/tui/newt/nmt-newt-types.h b/clients/tui/newt/nmt-newt-types.h
index 583c8ff8..8d558f47 100644
--- a/clients/tui/newt/nmt-newt-types.h
+++ b/clients/tui/newt/nmt-newt-types.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_TYPES_H
diff --git a/clients/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c
index 90388ff1..d0ad60e1 100644
--- a/clients/tui/newt/nmt-newt-utils.c
+++ b/clients/tui/newt/nmt-newt-utils.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/newt/nmt-newt-utils.h b/clients/tui/newt/nmt-newt-utils.h
index 4aa78d72..423a4755 100644
--- a/clients/tui/newt/nmt-newt-utils.h
+++ b/clients/tui/newt/nmt-newt-utils.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_UTILS_H
diff --git a/clients/tui/newt/nmt-newt-widget.c b/clients/tui/newt/nmt-newt-widget.c
index 050e94cb..da4f5532 100644
--- a/clients/tui/newt/nmt-newt-widget.c
+++ b/clients/tui/newt/nmt-newt-widget.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/newt/nmt-newt-widget.h b/clients/tui/newt/nmt-newt-widget.h
index f2424282..ededee9d 100644
--- a/clients/tui/newt/nmt-newt-widget.h
+++ b/clients/tui/newt/nmt-newt-widget.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_WIDGET_H
diff --git a/clients/tui/newt/nmt-newt.h b/clients/tui/newt/nmt-newt.h
index 8ec9c895..1a136a59 100644
--- a/clients/tui/newt/nmt-newt.h
+++ b/clients/tui/newt/nmt-newt.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_NEWT_H
diff --git a/clients/tui/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c
index 538b788e..00a34fbf 100644
--- a/clients/tui/nm-editor-bindings.c
+++ b/clients/tui/nm-editor-bindings.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
@@ -601,8 +589,7 @@ get_security_type (NMEditorWirelessSecurityMethodBinding *binding)
 		return "dynamic-wep";
 	}
 
-	if (   !strcmp (key_mgmt, "wpa-none")
-	    || !strcmp (key_mgmt, "wpa-psk"))
+	if (!strcmp (key_mgmt, "wpa-psk"))
 		return "wpa-personal";
 
 	if (!strcmp (key_mgmt, "sae"))
diff --git a/clients/tui/nm-editor-bindings.h b/clients/tui/nm-editor-bindings.h
index 3eee05ce..2301963c 100644
--- a/clients/tui/nm-editor-bindings.h
+++ b/clients/tui/nm-editor-bindings.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NM_EDITOR_BINDINGS_H
diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c
index 9698c1d7..83fd8d3b 100644
--- a/clients/tui/nm-editor-utils.c
+++ b/clients/tui/nm-editor-utils.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2012, 2013 Red Hat, Inc.
+ * Copyright (C) 2012, 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nm-editor-utils.h b/clients/tui/nm-editor-utils.h
index 3631e18f..015170af 100644
--- a/clients/tui/nm-editor-utils.h
+++ b/clients/tui/nm-editor-utils.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2012, 2013 Red Hat, Inc.
+ * Copyright (C) 2012, 2013 Red Hat, Inc.
  */
 
 #ifndef NM_EDITOR_UTILS_H
diff --git a/clients/tui/nmt-address-list.c b/clients/tui/nmt-address-list.c
index d7b4f496..fc400cdc 100644
--- a/clients/tui/nmt-address-list.c
+++ b/clients/tui/nmt-address-list.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-address-list.h b/clients/tui/nmt-address-list.h
index 904353ca..77d276cd 100644
--- a/clients/tui/nmt-address-list.h
+++ b/clients/tui/nmt-address-list.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_ADDRESS_LIST_H
diff --git a/clients/tui/nmt-connect-connection-list.c b/clients/tui/nmt-connect-connection-list.c
index 630d5760..1975b1c6 100644
--- a/clients/tui/nmt-connect-connection-list.c
+++ b/clients/tui/nmt-connect-connection-list.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 - 2017 Red Hat, Inc.
+ * Copyright (C) 2013 - 2017 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-connect-connection-list.h b/clients/tui/nmt-connect-connection-list.h
index f39d454c..e0ba0b05 100644
--- a/clients/tui/nmt-connect-connection-list.h
+++ b/clients/tui/nmt-connect-connection-list.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_CONNECT_CONNECTION_LIST_H
diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c
index 09544da2..67a66f72 100644
--- a/clients/tui/nmt-device-entry.c
+++ b/clients/tui/nmt-device-entry.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-device-entry.h b/clients/tui/nmt-device-entry.h
index 3bc2a92d..4fe2d92e 100644
--- a/clients/tui/nmt-device-entry.h
+++ b/clients/tui/nmt-device-entry.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_DEVICE_ENTRY_H
diff --git a/clients/tui/nmt-edit-connection-list.c b/clients/tui/nmt-edit-connection-list.c
index 314d902b..a33f393a 100644
--- a/clients/tui/nmt-edit-connection-list.c
+++ b/clients/tui/nmt-edit-connection-list.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-edit-connection-list.h b/clients/tui/nmt-edit-connection-list.h
index 45ee010f..7d5e5b89 100644
--- a/clients/tui/nmt-edit-connection-list.h
+++ b/clients/tui/nmt-edit-connection-list.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_EDIT_CONNECTION_LIST_H
diff --git a/clients/tui/nmt-editor-grid.c b/clients/tui/nmt-editor-grid.c
index 38b220ba..a8ceedda 100644
--- a/clients/tui/nmt-editor-grid.c
+++ b/clients/tui/nmt-editor-grid.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-editor-grid.h b/clients/tui/nmt-editor-grid.h
index 3999506b..949cacf9 100644
--- a/clients/tui/nmt-editor-grid.h
+++ b/clients/tui/nmt-editor-grid.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_EDITOR_GRID_H
diff --git a/clients/tui/nmt-editor-page-device.c b/clients/tui/nmt-editor-page-device.c
index effd5f3c..8266fa25 100644
--- a/clients/tui/nmt-editor-page-device.c
+++ b/clients/tui/nmt-editor-page-device.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-editor-page-device.h b/clients/tui/nmt-editor-page-device.h
index 37b41adc..e5450439 100644
--- a/clients/tui/nmt-editor-page-device.h
+++ b/clients/tui/nmt-editor-page-device.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_EDITOR_PAGE_DEVICE_H
diff --git a/clients/tui/nmt-editor-page.c b/clients/tui/nmt-editor-page.c
index 3019d710..96e77fa5 100644
--- a/clients/tui/nmt-editor-page.c
+++ b/clients/tui/nmt-editor-page.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-editor-page.h b/clients/tui/nmt-editor-page.h
index e885692c..e812017e 100644
--- a/clients/tui/nmt-editor-page.h
+++ b/clients/tui/nmt-editor-page.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013-2014 Red Hat, Inc.
+ * Copyright (C) 2013 - 2014 Red Hat, Inc.
  */
 
 #ifndef NMT_EDITOR_PAGE_H
diff --git a/clients/tui/nmt-editor-section.c b/clients/tui/nmt-editor-section.c
index 28d793bf..e92df70d 100644
--- a/clients/tui/nmt-editor-section.c
+++ b/clients/tui/nmt-editor-section.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-editor-section.h b/clients/tui/nmt-editor-section.h
index ee4175e0..633208c8 100644
--- a/clients/tui/nmt-editor-section.h
+++ b/clients/tui/nmt-editor-section.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_EDITOR_SECTION_H
diff --git a/clients/tui/nmt-editor.c b/clients/tui/nmt-editor.c
index 49f0615c..9bc91d2d 100644
--- a/clients/tui/nmt-editor.c
+++ b/clients/tui/nmt-editor.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-editor.h b/clients/tui/nmt-editor.h
index 39289da1..17475f37 100644
--- a/clients/tui/nmt-editor.h
+++ b/clients/tui/nmt-editor.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_EDITOR_H
diff --git a/clients/tui/nmt-ip-entry.c b/clients/tui/nmt-ip-entry.c
index b3b2209b..2b3ade2b 100644
--- a/clients/tui/nmt-ip-entry.c
+++ b/clients/tui/nmt-ip-entry.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-ip-entry.h b/clients/tui/nmt-ip-entry.h
index 0dd4145e..ea8709fc 100644
--- a/clients/tui/nmt-ip-entry.h
+++ b/clients/tui/nmt-ip-entry.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_IP_ENTRY_H
diff --git a/clients/tui/nmt-mac-entry.c b/clients/tui/nmt-mac-entry.c
index f9dc26d0..9f5f1c79 100644
--- a/clients/tui/nmt-mac-entry.c
+++ b/clients/tui/nmt-mac-entry.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-mac-entry.h b/clients/tui/nmt-mac-entry.h
index d755494f..5845c07b 100644
--- a/clients/tui/nmt-mac-entry.h
+++ b/clients/tui/nmt-mac-entry.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_MAC_ENTRY_H
diff --git a/clients/tui/nmt-mtu-entry.c b/clients/tui/nmt-mtu-entry.c
index 82cbe605..c6077a65 100644
--- a/clients/tui/nmt-mtu-entry.c
+++ b/clients/tui/nmt-mtu-entry.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-mtu-entry.h b/clients/tui/nmt-mtu-entry.h
index e13078da..61aaccfc 100644
--- a/clients/tui/nmt-mtu-entry.h
+++ b/clients/tui/nmt-mtu-entry.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_MTU_ENTRY_H
diff --git a/clients/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c
index 11a68eaa..b9cd9a0b 100644
--- a/clients/tui/nmt-page-bond.c
+++ b/clients/tui/nmt-page-bond.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-page-bond.h b/clients/tui/nmt-page-bond.h
index a21bad9c..bd47432e 100644
--- a/clients/tui/nmt-page-bond.h
+++ b/clients/tui/nmt-page-bond.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_PAGE_BOND_H
diff --git a/clients/tui/nmt-page-bridge-port.c b/clients/tui/nmt-page-bridge-port.c
index e014641d..4dacbe49 100644
--- a/clients/tui/nmt-page-bridge-port.c
+++ b/clients/tui/nmt-page-bridge-port.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-page-bridge-port.h b/clients/tui/nmt-page-bridge-port.h
index 5bda6286..dc7cf7f3 100644
--- a/clients/tui/nmt-page-bridge-port.h
+++ b/clients/tui/nmt-page-bridge-port.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_PAGE_BRIDGE_PORT_H
diff --git a/clients/tui/nmt-page-bridge.c b/clients/tui/nmt-page-bridge.c
index 1140e78f..d0a6f9cb 100644
--- a/clients/tui/nmt-page-bridge.c
+++ b/clients/tui/nmt-page-bridge.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-page-bridge.h b/clients/tui/nmt-page-bridge.h
index 8498808e..d143654e 100644
--- a/clients/tui/nmt-page-bridge.h
+++ b/clients/tui/nmt-page-bridge.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_PAGE_BRIDGE_H
diff --git a/clients/tui/nmt-page-dsl.c b/clients/tui/nmt-page-dsl.c
index 2e7b3d82..68aea8d9 100644
--- a/clients/tui/nmt-page-dsl.c
+++ b/clients/tui/nmt-page-dsl.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2014 Red Hat, Inc.
+ * Copyright (C) 2014 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-page-dsl.h b/clients/tui/nmt-page-dsl.h
index 3d078a85..ffdc5370 100644
--- a/clients/tui/nmt-page-dsl.h
+++ b/clients/tui/nmt-page-dsl.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_PAGE_DSL_H
diff --git a/clients/tui/nmt-page-ethernet.c b/clients/tui/nmt-page-ethernet.c
index 9b7b6af1..8b38e098 100644
--- a/clients/tui/nmt-page-ethernet.c
+++ b/clients/tui/nmt-page-ethernet.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-page-ethernet.h b/clients/tui/nmt-page-ethernet.h
index ba0816e0..06a1b538 100644
--- a/clients/tui/nmt-page-ethernet.h
+++ b/clients/tui/nmt-page-ethernet.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_PAGE_ETHERNET_H
diff --git a/clients/tui/nmt-page-infiniband.c b/clients/tui/nmt-page-infiniband.c
index 198c488b..6165383a 100644
--- a/clients/tui/nmt-page-infiniband.c
+++ b/clients/tui/nmt-page-infiniband.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-page-infiniband.h b/clients/tui/nmt-page-infiniband.h
index 7223fc60..fb829464 100644
--- a/clients/tui/nmt-page-infiniband.h
+++ b/clients/tui/nmt-page-infiniband.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_PAGE_INFINIBAND_H
diff --git a/clients/tui/nmt-page-ip-tunnel.c b/clients/tui/nmt-page-ip-tunnel.c
index c6301443..d8fa51e1 100644
--- a/clients/tui/nmt-page-ip-tunnel.c
+++ b/clients/tui/nmt-page-ip-tunnel.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2016 Red Hat, Inc.
+ * Copyright (C) 2016 Red Hat, Inc.
  */
 /**
  * SECTION:nmt-page-ip_tunnel
diff --git a/clients/tui/nmt-page-ip-tunnel.h b/clients/tui/nmt-page-ip-tunnel.h
index 99f60b33..9400ab7c 100644
--- a/clients/tui/nmt-page-ip-tunnel.h
+++ b/clients/tui/nmt-page-ip-tunnel.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2016 Red Hat, Inc.
+ * Copyright (C) 2016 Red Hat, Inc.
  */
 
 #ifndef NMT_PAGE_IP_TUNNEL_H
diff --git a/clients/tui/nmt-page-ip4.c b/clients/tui/nmt-page-ip4.c
index 825fd4fd..ad7e9550 100644
--- a/clients/tui/nmt-page-ip4.c
+++ b/clients/tui/nmt-page-ip4.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-page-ip4.h b/clients/tui/nmt-page-ip4.h
index b61af4d8..a3cc8d51 100644
--- a/clients/tui/nmt-page-ip4.h
+++ b/clients/tui/nmt-page-ip4.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_PAGE_IP4_H
diff --git a/clients/tui/nmt-page-ip6.c b/clients/tui/nmt-page-ip6.c
index a923bd98..04271de8 100644
--- a/clients/tui/nmt-page-ip6.c
+++ b/clients/tui/nmt-page-ip6.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-page-ip6.h b/clients/tui/nmt-page-ip6.h
index 52e7c556..86e4fa90 100644
--- a/clients/tui/nmt-page-ip6.h
+++ b/clients/tui/nmt-page-ip6.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_PAGE_IP6_H
diff --git a/clients/tui/nmt-page-ppp.c b/clients/tui/nmt-page-ppp.c
index 1c1ceeea..c905d23e 100644
--- a/clients/tui/nmt-page-ppp.c
+++ b/clients/tui/nmt-page-ppp.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2014 Red Hat, Inc.
+ * Copyright (C) 2014 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-page-ppp.h b/clients/tui/nmt-page-ppp.h
index 17490c47..4cd7cae4 100644
--- a/clients/tui/nmt-page-ppp.h
+++ b/clients/tui/nmt-page-ppp.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2014 Red Hat, Inc.
+ * Copyright (C) 2014 Red Hat, Inc.
  */
 
 #ifndef NMT_PAGE_PPP_H
diff --git a/clients/tui/nmt-page-team-port.c b/clients/tui/nmt-page-team-port.c
index f5502ee8..c91633e8 100644
--- a/clients/tui/nmt-page-team-port.c
+++ b/clients/tui/nmt-page-team-port.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-page-team-port.h b/clients/tui/nmt-page-team-port.h
index f15a347e..f68c1bd2 100644
--- a/clients/tui/nmt-page-team-port.h
+++ b/clients/tui/nmt-page-team-port.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_PAGE_TEAM_PORT_H
diff --git a/clients/tui/nmt-page-team.c b/clients/tui/nmt-page-team.c
index 39f0a724..af84db4b 100644
--- a/clients/tui/nmt-page-team.c
+++ b/clients/tui/nmt-page-team.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-page-team.h b/clients/tui/nmt-page-team.h
index 8d8b58e6..ca8c2ff1 100644
--- a/clients/tui/nmt-page-team.h
+++ b/clients/tui/nmt-page-team.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_PAGE_TEAM_H
diff --git a/clients/tui/nmt-page-vlan.c b/clients/tui/nmt-page-vlan.c
index 2e3bfee4..f82dfcb9 100644
--- a/clients/tui/nmt-page-vlan.c
+++ b/clients/tui/nmt-page-vlan.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-page-vlan.h b/clients/tui/nmt-page-vlan.h
index d617aa5f..ac95d843 100644
--- a/clients/tui/nmt-page-vlan.h
+++ b/clients/tui/nmt-page-vlan.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_PAGE_VLAN_H
diff --git a/clients/tui/nmt-page-wifi.c b/clients/tui/nmt-page-wifi.c
index d5e7dc2e..2e738ac6 100644
--- a/clients/tui/nmt-page-wifi.c
+++ b/clients/tui/nmt-page-wifi.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-page-wifi.h b/clients/tui/nmt-page-wifi.h
index bc45e78b..63858473 100644
--- a/clients/tui/nmt-page-wifi.h
+++ b/clients/tui/nmt-page-wifi.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_PAGE_WIFI_H
diff --git a/clients/tui/nmt-password-dialog.c b/clients/tui/nmt-password-dialog.c
index 6c6e8a9e..009ab7ce 100644
--- a/clients/tui/nmt-password-dialog.c
+++ b/clients/tui/nmt-password-dialog.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-password-dialog.h b/clients/tui/nmt-password-dialog.h
index dc91157a..bb1b27b3 100644
--- a/clients/tui/nmt-password-dialog.h
+++ b/clients/tui/nmt-password-dialog.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_PASSWORD_DIALOG_H
diff --git a/clients/tui/nmt-password-fields.c b/clients/tui/nmt-password-fields.c
index 80971900..7f4bddba 100644
--- a/clients/tui/nmt-password-fields.c
+++ b/clients/tui/nmt-password-fields.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-password-fields.h b/clients/tui/nmt-password-fields.h
index b72ec8dc..d0810d56 100644
--- a/clients/tui/nmt-password-fields.h
+++ b/clients/tui/nmt-password-fields.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_PASSWORD_FIELDS_H
diff --git a/clients/tui/nmt-route-editor.c b/clients/tui/nmt-route-editor.c
index 4487047b..29ef1bcc 100644
--- a/clients/tui/nmt-route-editor.c
+++ b/clients/tui/nmt-route-editor.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-route-editor.h b/clients/tui/nmt-route-editor.h
index 03590c83..9bd0c176 100644
--- a/clients/tui/nmt-route-editor.h
+++ b/clients/tui/nmt-route-editor.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_ROUTE_EDITOR_H
diff --git a/clients/tui/nmt-route-entry.c b/clients/tui/nmt-route-entry.c
index 586a262e..e0f6df4e 100644
--- a/clients/tui/nmt-route-entry.c
+++ b/clients/tui/nmt-route-entry.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-route-entry.h b/clients/tui/nmt-route-entry.h
index 866b26ae..bffa004a 100644
--- a/clients/tui/nmt-route-entry.h
+++ b/clients/tui/nmt-route-entry.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_ROUTE_ENTRY_H
diff --git a/clients/tui/nmt-route-table.c b/clients/tui/nmt-route-table.c
index ca066e6e..88cbde92 100644
--- a/clients/tui/nmt-route-table.c
+++ b/clients/tui/nmt-route-table.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-route-table.h b/clients/tui/nmt-route-table.h
index 3a7ebe13..4126a2a4 100644
--- a/clients/tui/nmt-route-table.h
+++ b/clients/tui/nmt-route-table.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_ROUTE_TABLE_H
diff --git a/clients/tui/nmt-slave-list.c b/clients/tui/nmt-slave-list.c
index 29b4c909..2f167359 100644
--- a/clients/tui/nmt-slave-list.c
+++ b/clients/tui/nmt-slave-list.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-slave-list.h b/clients/tui/nmt-slave-list.h
index 2487cf43..fa363415 100644
--- a/clients/tui/nmt-slave-list.h
+++ b/clients/tui/nmt-slave-list.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_SLAVE_LIST_H
diff --git a/clients/tui/nmt-utils.c b/clients/tui/nmt-utils.c
index eaa091b7..b2424fc2 100644
--- a/clients/tui/nmt-utils.c
+++ b/clients/tui/nmt-utils.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-utils.h b/clients/tui/nmt-utils.h
index 04bb8435..1002f5a3 100644
--- a/clients/tui/nmt-utils.h
+++ b/clients/tui/nmt-utils.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_UTILS_H
diff --git a/clients/tui/nmt-widget-list.c b/clients/tui/nmt-widget-list.c
index 6f1c744c..df68b95a 100644
--- a/clients/tui/nmt-widget-list.c
+++ b/clients/tui/nmt-widget-list.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmt-widget-list.h b/clients/tui/nmt-widget-list.h
index af200e8c..27c881a6 100644
--- a/clients/tui/nmt-widget-list.h
+++ b/clients/tui/nmt-widget-list.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMT_WIDGET_LIST_H
diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c
index 6a63b28f..1ea20305 100644
--- a/clients/tui/nmtui-connect.c
+++ b/clients/tui/nmtui-connect.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmtui-connect.h b/clients/tui/nmtui-connect.h
index 158e05ae..c7f590cc 100644
--- a/clients/tui/nmtui-connect.h
+++ b/clients/tui/nmtui-connect.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMTUI_CONNECT_H
diff --git a/clients/tui/nmtui-edit.c b/clients/tui/nmtui-edit.c
index 5eeb305b..c493c5e4 100644
--- a/clients/tui/nmtui-edit.c
+++ b/clients/tui/nmtui-edit.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmtui-edit.h b/clients/tui/nmtui-edit.h
index c2b0c3ee..f6fe16ae 100644
--- a/clients/tui/nmtui-edit.h
+++ b/clients/tui/nmtui-edit.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMTUI_EDIT_H
diff --git a/clients/tui/nmtui-hostname.c b/clients/tui/nmtui-hostname.c
index 27e06a5d..eaf47a4b 100644
--- a/clients/tui/nmtui-hostname.c
+++ b/clients/tui/nmtui-hostname.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmtui-hostname.h b/clients/tui/nmtui-hostname.h
index 48d388a3..0fc9284a 100644
--- a/clients/tui/nmtui-hostname.h
+++ b/clients/tui/nmtui-hostname.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMTUI_HOSTNAME_H
diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c
index ee246f96..e9d2ab50 100644
--- a/clients/tui/nmtui.c
+++ b/clients/tui/nmtui.c
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 /**
diff --git a/clients/tui/nmtui.h b/clients/tui/nmtui.h
index acaa40af..0eed180d 100644
--- a/clients/tui/nmtui.h
+++ b/clients/tui/nmtui.h
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
  */
 
 #ifndef NMTUI_H