summary refs log tree commit diff
path: root/clients
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2019-07-31 10:51:42 +0200
committerMichael Biebl <biebl@debian.org>2019-07-31 10:51:42 +0200
commit2e5fa45ddfbb5cffa1e78221f1cea706e2f298af (patch)
tree86f69d36c56de3074280456eddc854a780b8e04b /clients
parent85563b7fc7ec2cd21e38debb9b28db342e2e8e7c (diff)
New upstream version 1.19.90 upstream/1.19.90
Diffstat (limited to 'clients')
-rw-r--r--clients/cli/common.c102
-rw-r--r--clients/cli/connections.c315
-rw-r--r--clients/cli/devices.c22
-rw-r--r--clients/cli/general.c4
-rw-r--r--clients/cli/nmcli.c86
-rw-r--r--clients/cli/utils.c4
-rw-r--r--clients/cli/utils.h1
-rw-r--r--clients/common/nm-meta-setting-access.c2
-rw-r--r--clients/common/nm-meta-setting-access.h1
-rw-r--r--clients/common/nm-meta-setting-desc.c690
-rw-r--r--clients/common/nm-meta-setting-desc.h12
-rw-r--r--clients/common/nm-polkit-listener.c1
-rw-r--r--clients/common/nm-polkit-listener.h1
-rw-r--r--clients/common/nm-secret-agent-simple.c1
-rw-r--r--clients/common/nm-secret-agent-simple.h1
-rw-r--r--clients/common/nm-vpn-helpers.c3
-rw-r--r--clients/common/nm-vpn-helpers.h1
-rw-r--r--clients/common/settings-docs.h21
-rw-r--r--clients/common/settings-docs.h.in21
-rw-r--r--clients/common/tests/meson.build44
-rw-r--r--clients/common/tests/test-clients-common.c (renamed from clients/common/tests/test-general.c)1
-rw-r--r--clients/common/tests/test-libnm-core-aux.c250
-rw-r--r--clients/nm-online.c1
-rw-r--r--clients/tests/test-client.check-on-disk/test_002.expected10
-rw-r--r--clients/tests/test-client.check-on-disk/test_003.expected810
-rw-r--r--clients/tests/test-client.check-on-disk/test_004.expected2574
-rwxr-xr-xclients/tests/test-client.py4
-rw-r--r--clients/tui/newt/nmt-newt-button-box.c1
-rw-r--r--clients/tui/newt/nmt-newt-button-box.h1
-rw-r--r--clients/tui/newt/nmt-newt-button.c1
-rw-r--r--clients/tui/newt/nmt-newt-button.h1
-rw-r--r--clients/tui/newt/nmt-newt-checkbox.c1
-rw-r--r--clients/tui/newt/nmt-newt-checkbox.h1
-rw-r--r--clients/tui/newt/nmt-newt-component.c1
-rw-r--r--clients/tui/newt/nmt-newt-component.h1
-rw-r--r--clients/tui/newt/nmt-newt-container.c1
-rw-r--r--clients/tui/newt/nmt-newt-container.h1
-rw-r--r--clients/tui/newt/nmt-newt-entry-numeric.c1
-rw-r--r--clients/tui/newt/nmt-newt-entry-numeric.h1
-rw-r--r--clients/tui/newt/nmt-newt-entry.c1
-rw-r--r--clients/tui/newt/nmt-newt-entry.h1
-rw-r--r--clients/tui/newt/nmt-newt-form.c1
-rw-r--r--clients/tui/newt/nmt-newt-form.h1
-rw-r--r--clients/tui/newt/nmt-newt-grid.c1
-rw-r--r--clients/tui/newt/nmt-newt-grid.h1
-rw-r--r--clients/tui/newt/nmt-newt-hacks.c1
-rw-r--r--clients/tui/newt/nmt-newt-hacks.h1
-rw-r--r--clients/tui/newt/nmt-newt-label.c1
-rw-r--r--clients/tui/newt/nmt-newt-label.h1
-rw-r--r--clients/tui/newt/nmt-newt-listbox.c1
-rw-r--r--clients/tui/newt/nmt-newt-listbox.h1
-rw-r--r--clients/tui/newt/nmt-newt-popup.c1
-rw-r--r--clients/tui/newt/nmt-newt-popup.h1
-rw-r--r--clients/tui/newt/nmt-newt-section.c1
-rw-r--r--clients/tui/newt/nmt-newt-section.h1
-rw-r--r--clients/tui/newt/nmt-newt-separator.c1
-rw-r--r--clients/tui/newt/nmt-newt-separator.h1
-rw-r--r--clients/tui/newt/nmt-newt-stack.c1
-rw-r--r--clients/tui/newt/nmt-newt-stack.h1
-rw-r--r--clients/tui/newt/nmt-newt-textbox.c1
-rw-r--r--clients/tui/newt/nmt-newt-textbox.h1
-rw-r--r--clients/tui/newt/nmt-newt-toggle-button.c1
-rw-r--r--clients/tui/newt/nmt-newt-toggle-button.h1
-rw-r--r--clients/tui/newt/nmt-newt-types.h1
-rw-r--r--clients/tui/newt/nmt-newt-utils.c1
-rw-r--r--clients/tui/newt/nmt-newt-utils.h1
-rw-r--r--clients/tui/newt/nmt-newt-widget.c1
-rw-r--r--clients/tui/newt/nmt-newt-widget.h1
-rw-r--r--clients/tui/newt/nmt-newt.h1
-rw-r--r--clients/tui/nm-editor-bindings.c1
-rw-r--r--clients/tui/nm-editor-bindings.h1
-rw-r--r--clients/tui/nm-editor-utils.c22
-rw-r--r--clients/tui/nm-editor-utils.h1
-rw-r--r--clients/tui/nmt-address-list.c1
-rw-r--r--clients/tui/nmt-address-list.h1
-rw-r--r--clients/tui/nmt-connect-connection-list.c1
-rw-r--r--clients/tui/nmt-connect-connection-list.h1
-rw-r--r--clients/tui/nmt-device-entry.c1
-rw-r--r--clients/tui/nmt-device-entry.h1
-rw-r--r--clients/tui/nmt-edit-connection-list.c1
-rw-r--r--clients/tui/nmt-edit-connection-list.h1
-rw-r--r--clients/tui/nmt-editor-grid.c1
-rw-r--r--clients/tui/nmt-editor-grid.h1
-rw-r--r--clients/tui/nmt-editor-page-device.c1
-rw-r--r--clients/tui/nmt-editor-page-device.h1
-rw-r--r--clients/tui/nmt-editor-page.c1
-rw-r--r--clients/tui/nmt-editor-page.h1
-rw-r--r--clients/tui/nmt-editor-section.c1
-rw-r--r--clients/tui/nmt-editor-section.h1
-rw-r--r--clients/tui/nmt-editor.c1
-rw-r--r--clients/tui/nmt-editor.h1
-rw-r--r--clients/tui/nmt-ip-entry.c1
-rw-r--r--clients/tui/nmt-ip-entry.h1
-rw-r--r--clients/tui/nmt-mac-entry.c1
-rw-r--r--clients/tui/nmt-mac-entry.h1
-rw-r--r--clients/tui/nmt-mtu-entry.c1
-rw-r--r--clients/tui/nmt-mtu-entry.h1
-rw-r--r--clients/tui/nmt-page-bond.c4
-rw-r--r--clients/tui/nmt-page-bond.h1
-rw-r--r--clients/tui/nmt-page-bridge-port.c1
-rw-r--r--clients/tui/nmt-page-bridge-port.h1
-rw-r--r--clients/tui/nmt-page-bridge.c1
-rw-r--r--clients/tui/nmt-page-bridge.h1
-rw-r--r--clients/tui/nmt-page-dsl.c1
-rw-r--r--clients/tui/nmt-page-dsl.h1
-rw-r--r--clients/tui/nmt-page-ethernet.c1
-rw-r--r--clients/tui/nmt-page-ethernet.h1
-rw-r--r--clients/tui/nmt-page-infiniband.c1
-rw-r--r--clients/tui/nmt-page-infiniband.h1
-rw-r--r--clients/tui/nmt-page-ip-tunnel.c1
-rw-r--r--clients/tui/nmt-page-ip-tunnel.h1
-rw-r--r--clients/tui/nmt-page-ip4.c1
-rw-r--r--clients/tui/nmt-page-ip4.h1
-rw-r--r--clients/tui/nmt-page-ip6.c2
-rw-r--r--clients/tui/nmt-page-ip6.h1
-rw-r--r--clients/tui/nmt-page-ppp.c1
-rw-r--r--clients/tui/nmt-page-ppp.h1
-rw-r--r--clients/tui/nmt-page-team-port.c1
-rw-r--r--clients/tui/nmt-page-team-port.h1
-rw-r--r--clients/tui/nmt-page-team.c1
-rw-r--r--clients/tui/nmt-page-team.h1
-rw-r--r--clients/tui/nmt-page-vlan.c1
-rw-r--r--clients/tui/nmt-page-vlan.h1
-rw-r--r--clients/tui/nmt-page-wifi.c1
-rw-r--r--clients/tui/nmt-page-wifi.h1
-rw-r--r--clients/tui/nmt-password-dialog.c1
-rw-r--r--clients/tui/nmt-password-dialog.h1
-rw-r--r--clients/tui/nmt-password-fields.c1
-rw-r--r--clients/tui/nmt-password-fields.h1
-rw-r--r--clients/tui/nmt-route-editor.c1
-rw-r--r--clients/tui/nmt-route-editor.h1
-rw-r--r--clients/tui/nmt-route-entry.c1
-rw-r--r--clients/tui/nmt-route-entry.h1
-rw-r--r--clients/tui/nmt-route-table.c1
-rw-r--r--clients/tui/nmt-route-table.h1
-rw-r--r--clients/tui/nmt-slave-list.c1
-rw-r--r--clients/tui/nmt-slave-list.h1
-rw-r--r--clients/tui/nmt-utils.c1
-rw-r--r--clients/tui/nmt-utils.h1
-rw-r--r--clients/tui/nmt-widget-list.c1
-rw-r--r--clients/tui/nmt-widget-list.h1
-rw-r--r--clients/tui/nmtui-connect.c1
-rw-r--r--clients/tui/nmtui-connect.h1
-rw-r--r--clients/tui/nmtui-edit.c1
-rw-r--r--clients/tui/nmtui-edit.h1
-rw-r--r--clients/tui/nmtui-hostname.c1
-rw-r--r--clients/tui/nmtui-hostname.h1
-rw-r--r--clients/tui/nmtui.c1
-rw-r--r--clients/tui/nmtui.h1
149 files changed, 2787 insertions, 2343 deletions
diff --git a/clients/cli/common.c b/clients/cli/common.c
index 3c1c315d..2fc8aaf6 100644
--- a/clients/cli/common.c
+++ b/clients/cli/common.c
@@ -425,36 +425,38 @@ nmc_find_connection (const GPtrArray *connections,
                      GPtrArray **out_result,
                      gboolean complete)
 {
-	NMConnection *connection;
+	NMConnection *best_candidate_uuid = NULL;
 	NMConnection *best_candidate = NULL;
+	gs_unref_ptrarray GPtrArray *result_allocated = NULL;
 	GPtrArray *result = out_result ? *out_result : NULL;
+	const guint result_inital_len = result ? result->len : 0u;
 	guint i, j;
 
 	nm_assert (connections);
 	nm_assert (filter_val);
 
 	for (i = 0; i < connections->len; i++) {
-		const char *v, *v_num;
+		gboolean match_by_uuid = FALSE;
+		NMConnection *connection;
+		const char *v;
+		const char *v_num;
 
 		connection = NM_CONNECTION (connections->pdata[i]);
 
-		/* When filter_type is NULL, compare connection ID (filter_val)
-		 * against all types. Otherwise, only compare against the specific
-		 * type. If 'path' filter type is specified, comparison against
-		 * numeric index (in addition to the whole path) is allowed.
-		 */
-		if (NM_IN_STRSET (filter_type, NULL, "id")) {
-			v = nm_connection_get_id (connection);
-			if (complete)
-				nmc_complete_strings (filter_val, v, NULL);
-			if (nm_streq0 (filter_val, v))
-				goto found;
-		}
-
 		if (NM_IN_STRSET (filter_type, NULL, "uuid")) {
 			v = nm_connection_get_uuid (connection);
 			if (complete && (filter_type || *filter_val))
-				nmc_complete_strings (filter_val, v, NULL);
+				nmc_complete_strings (filter_val, v);
+			if (nm_streq0 (filter_val, v)) {
+				match_by_uuid = TRUE;
+				goto found;
+			}
+		}
+
+		if (NM_IN_STRSET (filter_type, NULL, "id")) {
+			v = nm_connection_get_id (connection);
+			if (complete)
+				nmc_complete_strings (filter_val, v);
 			if (nm_streq0 (filter_val, v))
 				goto found;
 		}
@@ -463,7 +465,7 @@ nmc_find_connection (const GPtrArray *connections,
 			v = nm_connection_get_path (connection);
 			v_num = nm_utils_dbus_path_get_last_component (v);
 			if (complete && (filter_type || *filter_val))
-				nmc_complete_strings (filter_val, v, filter_type ? v_num : NULL, NULL);
+				nmc_complete_strings (filter_val, v, (*filter_val ? v_num : NULL));
 			if (   nm_streq0 (filter_val, v)
 			    || (filter_type && nm_streq0 (filter_val, v_num)))
 				goto found;
@@ -472,29 +474,51 @@ nmc_find_connection (const GPtrArray *connections,
 		if (NM_IN_STRSET (filter_type, NULL, "filename")) {
 			v = nm_remote_connection_get_filename (NM_REMOTE_CONNECTION (connections->pdata[i]));
 			if (complete && (filter_type || *filter_val))
-				nmc_complete_strings (filter_val, v, NULL);
+				nmc_complete_strings (filter_val, v);
 			if (nm_streq0 (filter_val, v))
 				goto found;
 		}
 
 		continue;
+
 found:
-		if (!out_result)
-			return connection;
-		if (!best_candidate)
-			best_candidate = connection;
-		if (!result)
-			result = g_ptr_array_new_with_free_func (g_object_unref);
-		for (j = 0; j < result->len; j++) {
-			if (connection == result->pdata[j])
-				break;
+		if (match_by_uuid) {
+			if (   !complete
+			    && !out_result)
+				return connection;
+			best_candidate_uuid = connection;
+		} else {
+			if (!best_candidate)
+				best_candidate = connection;
+		}
+		if (out_result) {
+			gboolean already_tracked = FALSE;
+
+			if (!result) {
+				result_allocated = g_ptr_array_new_with_free_func (g_object_unref);
+				result = result_allocated;
+			} else {
+				for (j = 0; j < result->len; j++) {
+					if (connection == result->pdata[j]) {
+						already_tracked = TRUE;
+						break;
+					}
+				}
+			}
+			if (!already_tracked) {
+				if (match_by_uuid) {
+					/* the profile is matched exactly (by UUID). We prepend it
+					 * to the list of all found profiles. */
+					g_ptr_array_insert (result, result_inital_len, g_object_ref (connection));
+				} else
+					g_ptr_array_add (result, g_object_ref (connection));
+			}
 		}
-		if (j == result->len)
-			g_ptr_array_add (result, g_object_ref (connection));
 	}
 
-	NM_SET_OUT (out_result, result);
-	return best_candidate;
+	if (result_allocated)
+		*out_result = g_steal_pointer (&result_allocated);
+	return best_candidate_uuid ?: best_candidate;
 }
 
 NMActiveConnection *
@@ -525,7 +549,7 @@ nmc_find_active_connection (const GPtrArray *active_cons,
 		if (NM_IN_STRSET (filter_type, NULL, "id")) {
 			v = nm_active_connection_get_id (candidate);
 			if (complete)
-				nmc_complete_strings (filter_val, v, NULL);
+				nmc_complete_strings (filter_val, v);
 			if (nm_streq0 (filter_val, v))
 				goto found;
 		}
@@ -533,7 +557,7 @@ nmc_find_active_connection (const GPtrArray *active_cons,
 		if (NM_IN_STRSET (filter_type, NULL, "uuid")) {
 			v = nm_active_connection_get_uuid (candidate);
 			if (complete && (filter_type || *filter_val))
-				nmc_complete_strings (filter_val, v, NULL);
+				nmc_complete_strings (filter_val, v);
 			if (nm_streq0 (filter_val, v))
 				goto found;
 		}
@@ -542,7 +566,7 @@ nmc_find_active_connection (const GPtrArray *active_cons,
 			v = con ? nm_connection_get_path (NM_CONNECTION (con)) : NULL;
 			v_num = nm_utils_dbus_path_get_last_component (v);
 			if (complete && (filter_type || *filter_val))
-				nmc_complete_strings (filter_val, v, filter_type ? v_num : NULL, NULL);
+				nmc_complete_strings (filter_val, v, filter_type ? v_num : NULL);
 			if (   nm_streq0 (filter_val, v)
 			    || (filter_type && nm_streq0 (filter_val, v_num)))
 				goto found;
@@ -551,7 +575,7 @@ nmc_find_active_connection (const GPtrArray *active_cons,
 		if (NM_IN_STRSET (filter_type, NULL, "filename")) {
 			v = nm_remote_connection_get_filename (con);
 			if (complete && (filter_type || *filter_val))
-				nmc_complete_strings (filter_val, v, NULL);
+				nmc_complete_strings (filter_val, v);
 			if (nm_streq0 (filter_val, v))
 				goto found;
 		}
@@ -560,7 +584,7 @@ nmc_find_active_connection (const GPtrArray *active_cons,
 			v = nm_object_get_path (NM_OBJECT (candidate));
 			v_num = nm_utils_dbus_path_get_last_component (v);
 			if (complete && (filter_type || *filter_val))
-				nmc_complete_strings (filter_val, v, filter_type ? v_num : NULL, NULL);
+				nmc_complete_strings (filter_val, v, filter_type ? v_num : NULL);
 			if (   nm_streq0 (filter_val, v)
 			    || (filter_type && nm_streq0 (filter_val, v_num)))
 				goto found;
@@ -1254,9 +1278,9 @@ call_cmd (NmCli *nmc, GSimpleAsyncResult *simple, const NMCCommand *cmd, int arg
 static void
 nmc_complete_help (const char *prefix)
 {
-	nmc_complete_strings (prefix, "help", NULL);
+	nmc_complete_strings (prefix, "help");
 	if (*prefix == '-')
-		nmc_complete_strings (prefix, "-help", "--help", NULL);
+		nmc_complete_strings (prefix, "-help", "--help");
 }
 
 /**
@@ -1395,7 +1419,7 @@ void
 nmc_complete_bool (const char *prefix)
 {
 	nmc_complete_strings (prefix, "true", "yes", "on",
-	                              "false", "no", "off", NULL);
+	                              "false", "no", "off");
 }
 
 /**
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index 6ee3b49f..53105f95 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -41,6 +41,8 @@
 #include "devices.h"
 #include "polkit-agent.h"
 
+/*****************************************************************************/
+
 typedef enum {
 	PROPERTY_INF_FLAG_NONE                      = 0x0,
 	PROPERTY_INF_FLAG_DISABLED                  = 0x1, /* Don't ask due to runtime decision. */
@@ -50,14 +52,13 @@ typedef enum {
 
 typedef char *(*CompEntryFunc) (const char *, int);
 
-typedef struct _OptionInfo OptionInfo;
-struct _OptionInfo {
+typedef struct _OptionInfo {
 	const NMMetaSettingInfoEditor *setting_info;
 	const char *property;
 	const char *option;
-	gboolean (*check_and_set)(NmCli *nmc, NMConnection *connection, const OptionInfo *option, const char *value, GError **error);
+	gboolean (*check_and_set)(NmCli *nmc, NMConnection *connection, const struct _OptionInfo *option, const char *value, GError **error);
 	CompEntryFunc generator_func;
-};
+} OptionInfo;
 
 /* define some prompts for connection editor */
 #define EDITOR_PROMPT_SETTING  _("Setting name? ")
@@ -96,6 +97,47 @@ NM_UTILS_LOOKUP_STR_DEFINE_STATIC (vpn_connection_state_to_string, NMVpnConnecti
 	NM_UTILS_LOOKUP_ITEM_IGNORE (NM_VPN_CONNECTION_STATE_UNKNOWN),
 )
 
+/*****************************************************************************/
+
+typedef struct {
+	NmCli *nmc;
+	char *orig_id;
+	char *orig_uuid;
+	char *new_id;
+} AddConnectionInfo;
+
+static AddConnectionInfo *
+_add_connection_info_new (NmCli *nmc,
+                          NMConnection *orig_connection,
+                          NMConnection *new_connection)
+{
+	AddConnectionInfo *info;
+
+	info = g_slice_new (AddConnectionInfo);
+	*info = (AddConnectionInfo) {
+		.nmc       = nmc,
+		.orig_id   = orig_connection ? g_strdup (nm_connection_get_id   (orig_connection)) : NULL,
+		.orig_uuid = orig_connection ? g_strdup (nm_connection_get_uuid (orig_connection)) : NULL,
+		.new_id    = g_strdup (nm_connection_get_id (new_connection)),
+	};
+	return info;
+}
+
+static void
+_add_connection_info_free (AddConnectionInfo *info)
+{
+	g_free (info->orig_id);
+	g_free (info->orig_uuid);
+	g_free (info->new_id);
+	nm_g_slice_free (info);
+}
+
+NM_AUTO_DEFINE_FCN (AddConnectionInfo *, _nm_auto_free_add_connection_info, _add_connection_info_free)
+
+#define nm_auto_free_add_connection_info nm_auto (_nm_auto_free_add_connection_info)
+
+/*****************************************************************************/
+
 /* Essentially a version of nm_setting_connection_get_connection_type() that
  * prefers an alias instead of the settings name when in pretty print mode.
  * That is so that we print "wifi" instead of "802-11-wireless" in "nmcli c". */
@@ -209,7 +251,7 @@ get_ac_device_string (NMActiveConnection *active)
 {
 	GString *dev_str;
 	const GPtrArray *devices;
-	int i;
+	guint i;
 
 	if (!active)
 		return NULL;
@@ -826,7 +868,8 @@ const NmcMetaGenericInfo *const metagen_con_active_vpn[_NMC_GENERIC_INFO_TYPE_CO
                                          NM_SETTING_PROXY_SETTING_NAME"," \
                                          NM_SETTING_TC_CONFIG_SETTING_NAME"," \
                                          NM_SETTING_SRIOV_SETTING_NAME"," \
-                                         NM_SETTING_ETHTOOL_SETTING_NAME
+                                         NM_SETTING_ETHTOOL_SETTING_NAME"," \
+                                         NM_SETTING_OVS_DPDK_SETTING_NAME \
                                          // NM_SETTING_DUMMY_SETTING_NAME
                                          // NM_SETTING_WIMAX_SETTING_NAME
 
@@ -1306,7 +1349,7 @@ nmc_connection_profile_details (NMConnection *connection, NmCli *nmc)
 	GError *error = NULL;
 	GArray *print_settings_array;
 	GPtrArray *prop_array = NULL;
-	int i;
+	guint i;
 	char *fields_str;
 	char *fields_all =    NMC_FIELDS_SETTINGS_NAMES_ALL;
 	char *fields_common = NMC_FIELDS_SETTINGS_NAMES_ALL;
@@ -1872,7 +1915,7 @@ parse_preferred_connection_order (const char *order, GError **error)
 	GArray *order_arr;
 	NmcSortOrder val;
 	gboolean inverse, unique;
-	int i;
+	guint i;
 
 	strv = nm_utils_strsplit_set (order, ":");
 	if (!strv) {
@@ -1945,7 +1988,7 @@ get_connection (NmCli *nmc,
 	}
 
 	if (*argc == 1 && nmc->complete)
-		nmc_complete_strings (**argv, "id", "uuid", "path", "filename", NULL);
+		nmc_complete_strings (**argv, "id", "uuid", "path", "filename");
 
 	if (NM_IN_STRSET (**argv, "id", "uuid", "path", "filename")) {
 		if (*argc == 1) {
@@ -2104,7 +2147,7 @@ do_connections_show (NmCli *nmc, int argc, char **argv)
 			guint i_found_cons;
 
 			if (argc == 1 && nmc->complete)
-				nmc_complete_strings (*argv, "id", "uuid", "path", "filename", "apath", NULL);
+				nmc_complete_strings (*argv, "id", "uuid", "path", "filename", "apath");
 
 			if (NM_IN_STRSET (*argv, "id", "uuid", "path", "filename", "apath")) {
 				selector = *argv;
@@ -2243,7 +2286,7 @@ get_default_active_connection (NmCli *nmc, NMDevice **device)
 	NMDevice *non_default_device = NULL;
 	NMActiveConnection *non_default_ac = NULL;
 	const GPtrArray *connections;
-	int i;
+	guint i;
 
 	g_return_val_if_fail (nmc, NULL);
 	g_return_val_if_fail (device, NULL);
@@ -2302,7 +2345,7 @@ find_device_for_connection (NmCli *nmc,
 {
 	NMSettingConnection *s_con;
 	const char *con_type;
-	int i, j;
+	guint i, j;
 
 	g_return_val_if_fail (nmc, FALSE);
 	g_return_val_if_fail (iface || ap || nsp, FALSE);
@@ -2850,7 +2893,7 @@ do_connection_up (NmCli *nmc, int argc, char **argv)
 
 	while (argc > 0) {
 		if (argc == 1 && nmc->complete)
-			nmc_complete_strings (*argv, "ifname", "ap", "passwd-file", NULL);
+			nmc_complete_strings (*argv, "ifname", "ap", "passwd-file");
 
 		if (strcmp (*argv, "ifname") == 0) {
 			argc--;
@@ -3102,7 +3145,7 @@ do_connection_down (NmCli *nmc, int argc, char **argv)
 		const char *selector = NULL;
 
 		if (arg_num == 1 && nmc->complete)
-			nmc_complete_strings (*arg_ptr, "id", "uuid", "path",  "filename", "apath", NULL);
+			nmc_complete_strings (*arg_ptr, "id", "uuid", "path",  "filename", "apath");
 
 		if (NM_IN_STRSET (*arg_ptr, "id", "uuid", "path",  "filename", "apath")) {
 			selector = *arg_ptr;
@@ -3301,7 +3344,7 @@ get_valid_properties_string (const NMMetaSettingValidPartItem *const*array,
 	const NMMetaSettingValidPartItem *const*iter = array;
 	const char *prop_name = NULL;
 	GString *str;
-	int i, j;
+	guint i, j;
 	gboolean full_match = FALSE;
 
 	g_return_val_if_fail (prefix, NULL);
@@ -3546,7 +3589,7 @@ _strip_master_prefix (const char *master, const char *(**func)(NMConnection *))
 	} else if (g_str_has_prefix (master, "id/")) {
 		master = master + strlen ("id/");
 		if (func)
-			 *func = nm_connection_get_id;
+			*func = nm_connection_get_id;
 	}
 	return master;
 }
@@ -3573,7 +3616,7 @@ normalized_master_for_slave (const GPtrArray *connections,
 	NMConnection *connection;
 	NMSettingConnection *s_con;
 	const char *con_type = NULL, *id, *uuid, *ifname;
-	int i;
+	guint i;
 	const char *found_by_id = NULL;
 	const char *out_type_by_id = NULL;
 	const char *out_master = NULL;
@@ -3785,6 +3828,7 @@ _meta_abstract_complete (const NMMetaAbstractInfo *abstract_info, const char *te
 	                                         nmc_meta_environment_arg,
 	                                         &ctx,
 	                                         text,
+	                                         NULL,
 	                                         &values_to_free);
 	if (values)
 		return values_to_free ?: g_strdupv ((char **) values);
@@ -4208,7 +4252,7 @@ set_connection_master (NmCli *nmc, NMConnection *con, const OptionInfo *option,
 
 	if (!value) {
 		g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
-			             _("Error: master is required"));
+		                     _("Error: master is required"));
 		return FALSE;
 	}
 
@@ -4525,11 +4569,12 @@ run_rl_generator (rl_compentry_func_t *generator_func, const char *prefix)
 }
 
 static gboolean
-complete_option (const NMMetaAbstractInfo *abstract_info, const char *prefix, NMConnection *context_connection)
+complete_option (NmCli *nmc, const NMMetaAbstractInfo *abstract_info, const char *prefix, NMConnection *context_connection)
 {
 	const OptionInfo *candidate;
 	const char *const*values;
 	gs_strfreev char **values_to_free = NULL;
+	gboolean complete_filename = FALSE;
 	const NMMetaOperationContext ctx = {
 		.connection = context_connection,
 	};
@@ -4539,7 +4584,12 @@ complete_option (const NMMetaAbstractInfo *abstract_info, const char *prefix, NM
 	                                         nmc_meta_environment_arg,
 	                                         &ctx,
 	                                         prefix,
+	                                         &complete_filename,
 	                                         &values_to_free);
+	if (complete_filename) {
+		nmc->return_value = NMC_RESULT_COMPLETE_FILE;
+		return TRUE;
+	}
 	if (values) {
 		for (; values[0]; values++)
 			g_print ("%s\n", values[0]);
@@ -4556,19 +4606,13 @@ complete_option (const NMMetaAbstractInfo *abstract_info, const char *prefix, NM
 }
 
 static void
-complete_property (const char *setting_name, const char *property, const char *prefix, NMConnection *connection)
+complete_property (NmCli *nmc, const char *setting_name, const char *property, const char *prefix, NMConnection *connection)
 {
 	const NMMetaPropertyInfo *property_info;
 
 	property_info = nm_meta_property_info_find_by_name (setting_name, property);
-	if (property_info) {
-		if (complete_option ((const NMMetaAbstractInfo *) property_info, prefix, connection))
-			return;
-	}
-
-	if (   strcmp (setting_name, NM_SETTING_BLUETOOTH_SETTING_NAME) == 0
-	         && strcmp (property, NM_SETTING_BLUETOOTH_TYPE) == 0)
-		run_rl_generator (gen_func_bt_type, prefix);
+	if (property_info)
+		complete_option (nmc, (const NMMetaAbstractInfo *) property_info, prefix, connection);
 }
 
 /*****************************************************************************/
@@ -4658,8 +4702,10 @@ nmc_read_connection_properties (NmCli *nmc,
 			if (!get_value (&value, argc, argv, option, error))
 				return FALSE;
 
-			if (!*argc && nmc->complete)
-				complete_property (setting, strv[1], value ?: "", connection);
+			if (!*argc && nmc->complete) {
+				complete_property (nmc, setting, strv[1], value ?: "", connection);
+				return TRUE;
+			}
 
 			if (!set_property (nmc->client, connection, setting_name, strv[1], value, modifier, error))
 				return FALSE;
@@ -4740,7 +4786,7 @@ nmc_read_connection_properties (NmCli *nmc,
 				return FALSE;
 
 			if (!*argc && nmc->complete)
-				complete_option (chosen, value ?: "", connection);
+				complete_option (nmc, chosen, value ?: "", connection);
 
 			if (!set_option (nmc, connection, chosen, value, error))
 				return FALSE;
@@ -4751,28 +4797,23 @@ nmc_read_connection_properties (NmCli *nmc,
 	return TRUE;
 }
 
-typedef struct {
-	NmCli *nmc;
-	char *con_name;
-} AddConnectionInfo;
-
 static void
 add_connection_cb (GObject *client,
                    GAsyncResult *result,
                    gpointer user_data)
 {
-	AddConnectionInfo *info = (AddConnectionInfo *) user_data;
+	nm_auto_free_add_connection_info AddConnectionInfo *info = user_data;
 	NmCli *nmc = info->nmc;
 	NMRemoteConnection *connection;
 	GError *error = NULL;
 	const GPtrArray *connections;
 	guint i, found;
 
-	connection = nm_client_add_connection_finish (NM_CLIENT (client), result, &error);
+	connection = nm_client_add_connection2_finish (NM_CLIENT (client), result, NULL, &error);
 	if (error) {
 		g_string_printf (nmc->return_text,
 		                 _("Error: Failed to add '%s' connection: %s"),
-		                 info->con_name, error->message);
+		                 info->new_id, error->message);
 		g_error_free (error);
 		nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION;
 	} else {
@@ -4784,7 +4825,7 @@ add_connection_cb (GObject *client,
 
 				if ((NMConnection *) connection == candidate)
 					continue;
-				if (nm_streq0 (nm_connection_get_id (candidate), info->con_name))
+				if (nm_streq0 (nm_connection_get_id (candidate), info->new_id))
 					found++;
 			}
 			if (found > 0) {
@@ -4792,7 +4833,7 @@ add_connection_cb (GObject *client,
 				                         "Warning: There is another connection with the name '%1$s'. Reference the connection by its uuid '%2$s'\n",
 				                         "Warning: There are %3$u other connections with the name '%1$s'. Reference the connection by its uuid '%2$s'\n",
 				                         found),
-				            info->con_name,
+				            info->new_id,
 				            nm_connection_get_uuid (NM_CONNECTION (connection)),
 				            found);
 			}
@@ -4804,30 +4845,39 @@ add_connection_cb (GObject *client,
 		g_object_unref (connection);
 	}
 
-	g_free (info->con_name);
-	g_free (info);
 	quit ();
 }
 
 static void
-add_new_connection (gboolean persistent,
-                    NMClient *client,
-                    NMConnection *connection,
-                    GAsyncReadyCallback callback,
-                    gpointer user_data)
-{
-	nm_client_add_connection_async (client, connection, persistent,
-	                                NULL, callback, user_data);
+add_connection (NMClient *client,
+                NMConnection *connection,
+                gboolean temporary,
+                GAsyncReadyCallback callback,
+                gpointer user_data)
+{
+	nm_client_add_connection2 (client,
+	                           nm_connection_to_dbus (connection, NM_CONNECTION_SERIALIZE_ALL),
+	                             temporary
+	                           ? NM_SETTINGS_ADD_CONNECTION2_FLAG_IN_MEMORY
+	                           : NM_SETTINGS_ADD_CONNECTION2_FLAG_TO_DISK,
+	                           NULL,
+	                           TRUE,
+	                           NULL,
+	                           callback,
+	                           user_data);
 }
 
 static void
-update_connection (gboolean persistent,
-                   NMRemoteConnection *connection,
+update_connection (NMRemoteConnection *connection,
+                   gboolean temporary,
                    GAsyncReadyCallback callback,
                    gpointer user_data)
 {
-	nm_remote_connection_commit_changes_async (connection, persistent,
-	                                           NULL, callback, user_data);
+	nm_remote_connection_commit_changes_async (connection,
+	                                           !temporary,
+	                                           NULL,
+	                                           callback,
+	                                           user_data);
 }
 
 static gboolean
@@ -5146,7 +5196,6 @@ do_connection_add (NmCli *nmc, int argc, char **argv)
 	gs_unref_object NMConnection *connection = NULL;
 	NMSettingConnection *s_con;
 	gs_free_error GError *error = NULL;
-	AddConnectionInfo *info = NULL;
 	gboolean save_bool = TRUE;
 	gboolean seen_dash_dash = FALSE;
 	NMMetaSettingType s;
@@ -5291,19 +5340,13 @@ read_properties:
 		}
 	}
 
+	add_connection (nmc->client,
+	                connection,
+	                !save_bool,
+	                add_connection_cb,
+	                _add_connection_info_new (nmc, NULL, connection));
 	nmc->should_wait++;
 
-	info = g_malloc0 (sizeof (AddConnectionInfo));
-	info->nmc = nmc;
-	info->con_name = g_strdup (nm_connection_get_id (connection));
-
-	/* Tell the settings service to add the new connection */
-	add_new_connection (save_bool,
-	                    nmc->client,
-	                    connection,
-	                    add_connection_cb,
-	                    info);
-
 finish:
 	reset_options ();
 	return nmc->return_value;
@@ -5578,7 +5621,7 @@ gen_property_names (const char *text, int state)
 static char *
 gen_compat_devices (const char *text, int state)
 {
-	int i, j = 0;
+	guint i, j = 0;
 	const GPtrArray *devices;
 	const char **compatible_devices;
 	char *ret;
@@ -6084,7 +6127,7 @@ nmcli_editor_tab_completion (const char *text, int start, int end)
 							rl_completion_display_matches_hook = uuid_display_hook;
 							generator_func = gen_vpn_uuids;
 						} else if (   should_complete_property_values (NULL, line, &multi)
-							   && (num == 3 || multi)) {
+						           && (num == 3 || multi)) {
 							generator_func = gen_property_values;
 						} else if (should_complete_boolean (NULL, line) && num == 3)
 							generator_func = gen_func_bool_values;
@@ -6131,7 +6174,7 @@ nmcli_editor_tab_completion (const char *text, int start, int end)
 						rl_completion_display_matches_hook = uuid_display_hook;
 						generator_func = gen_vpn_uuids;
 					} else if (   should_complete_property_values (prompt_tmp, NULL, &multi)
-						   && (num <= 2 || multi)) {
+					           && (num <= 2 || multi)) {
 						generator_func = gen_property_values;
 					} else if (should_complete_boolean (prompt_tmp, NULL) && num <= 2)
 						generator_func = gen_func_bool_values;
@@ -6652,14 +6695,11 @@ add_connection_editor_cb (GObject *client,
                           GAsyncResult *result,
                           gpointer user_data)
 {
-	NMRemoteConnection *connection;
-	GError *error = NULL;
+	gs_unref_object NMRemoteConnection *connection = NULL;
+	gs_free_error GError *error = NULL;
 
-	connection = nm_client_add_connection_finish (NM_CLIENT (client), result, &error);
+	connection = nm_client_add_connection2_finish (NM_CLIENT (client), result, NULL, &error);
 	set_info_and_signal_editor_thread (error, NULL);
-
-	g_clear_object (&connection);
-	g_clear_error (&error);
 }
 
 static void
@@ -7238,7 +7278,6 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 	const NMMetaSettingValidPartItem *const*valid_settings_slave;
 	gs_free char *valid_settings_str = NULL;
 	const char *s_type = NULL;
-	AddConnectionInfo *info = NULL;
 	gboolean temp_changes;
 	GError *err1 = NULL;
 	NmcEditorMenuContext menu_ctx = { 0 };
@@ -7757,7 +7796,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 		case NMC_EDITOR_MAIN_CMD_SAVE:
 			/* Save the connection */
 			if (nm_connection_verify (connection, &err1)) {
-				gboolean persistent = TRUE;
+				gboolean temporary = FALSE;
 				gboolean connection_changed;
 				nm_auto_unref_gsource GSource *source = NULL;
 				gboolean timeout = FALSE;
@@ -7766,9 +7805,9 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 				/* parse argument */
 				if (cmd_arg) {
 					if (matches (cmd_arg, "temporary"))
-						persistent = FALSE;
+						temporary = TRUE;
 					else if (matches (cmd_arg, "persistent"))
-						persistent = TRUE;
+						temporary = FALSE;
 					else {
 						g_print (_("Error: invalid argument '%s'\n"), cmd_arg);
 						break;
@@ -7784,21 +7823,17 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 				}
 
 				if (!rem_con) {
-					/* Tell the settings service to add the new connection */
-					info = g_malloc0 (sizeof (AddConnectionInfo));
-					info->nmc = nmc;
-					info->con_name = g_strdup (nm_connection_get_id (connection));
-					add_new_connection (persistent,
-					                    nmc->client,
-					                    connection,
-					                    add_connection_editor_cb,
-					                    info);
+					add_connection (nmc->client,
+					                connection,
+					                temporary,
+					                add_connection_editor_cb,
+					                NULL);
 					connection_changed = TRUE;
 				} else {
 					/* Save/update already saved (existing) connection */
 					nm_connection_replace_settings_from_connection (NM_CONNECTION (rem_con),
 					                                                connection);
-					update_connection (persistent, rem_con, update_connection_editor_cb, NULL);
+					update_connection (rem_con, temporary, update_connection_editor_cb, NULL);
 
 					handler_id = g_signal_connect (rem_con,
 					                               NM_CONNECTION_CHANGED,
@@ -7814,8 +7849,10 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
 				while (!nmc_editor_cb_called && !timeout)
 					g_main_context_iteration (NULL, TRUE);
 
-				while (!connection_changed && !timeout)
-					g_main_context_iteration (NULL, TRUE);
+				if (!nmc_editor_error) {
+					while (!connection_changed && !timeout)
+						g_main_context_iteration (NULL, TRUE);
+				}
 
 				if (handler_id)
 					g_signal_handler_disconnect (rem_con, handler_id);
@@ -8025,7 +8062,7 @@ static const char *
 get_ethernet_device_name (NmCli *nmc)
 {
 	const GPtrArray *devices;
-	int i;
+	guint i;
 
 	devices = nm_client_get_devices (nmc->client);
 	for (i = 0; i < devices->len; i++) {
@@ -8171,7 +8208,7 @@ do_connection_edit (NmCli *nmc, int argc, char **argv)
 
 	next_arg (nmc, &argc, &argv, NULL);
 	if (argc == 1 && nmc->complete)
-		nmc_complete_strings (*argv, "type", "con-name", "id", "uuid", "path",  "filename", NULL);
+		nmc_complete_strings (*argv, "type", "con-name", "id", "uuid", "path",  "filename");
 
 	nmc->return_value = NMC_RESULT_SUCCESS;
 
@@ -8397,35 +8434,27 @@ do_connection_modify (NmCli *nmc,
 	if (nmc->complete)
 		return nmc->return_value;
 
-	update_connection (!temporary, rc, modify_connection_cb, nmc);
+	update_connection (rc, temporary, modify_connection_cb, nmc);
 	nmc->should_wait++;
 
 	return nmc->return_value;
 }
 
-typedef struct {
-	NmCli *nmc;
-	char *orig_id;
-	char *orig_uuid;
-	char *con_id;
-} CloneConnectionInfo;
-
 static void
 clone_connection_cb (GObject *client,
                      GAsyncResult *result,
                      gpointer user_data)
 {
-	CloneConnectionInfo *info = (CloneConnectionInfo *) user_data;
+	nm_auto_free_add_connection_info AddConnectionInfo *info = user_data;
 	NmCli *nmc = info->nmc;
-	NMRemoteConnection *connection;
-	GError *error = NULL;
+	gs_unref_object NMRemoteConnection *connection = NULL;
+	gs_free_error GError *error = NULL;
 
-	connection = nm_client_add_connection_finish (NM_CLIENT (client), result, &error);
+	connection = nm_client_add_connection2_finish (NM_CLIENT (client), result, NULL, &error);
 	if (error) {
 		g_string_printf (nmc->return_text,
 		                 _("Error: Failed to add '%s' connection: %s"),
-		                 info->con_id, error->message);
-		g_error_free (error);
+		                 info->new_id, error->message);
 		nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION;
 	} else {
 		g_print (_("%s (%s) cloned as %s (%s).\n"),
@@ -8433,13 +8462,8 @@ clone_connection_cb (GObject *client,
 		         info->orig_uuid,
 		         nm_connection_get_id (NM_CONNECTION (connection)),
 		         nm_connection_get_uuid (NM_CONNECTION (connection)));
-		g_object_unref (connection);
 	}
 
-	g_free (info->con_id);
-	g_free (info->orig_id);
-	g_free (info->orig_uuid);
-	g_slice_free (CloneConnectionInfo, info);
 	quit ();
 }
 
@@ -8448,11 +8472,9 @@ do_connection_clone (NmCli *nmc, int argc, char **argv)
 {
 	NMConnection *connection = NULL;
 	gs_unref_object NMConnection *new_connection = NULL;
-	NMSettingConnection *s_con;
-	CloneConnectionInfo *info;
 	const char *new_name;
-	gs_free char *new_name_ask = NULL;
-	char *uuid;
+	gs_free char *new_name_free = NULL;
+	gs_free char *uuid = NULL;
 	gboolean temporary = FALSE;
 	char **arg_arr = NULL;
 	int arg_num;
@@ -8493,8 +8515,8 @@ do_connection_clone (NmCli *nmc, int argc, char **argv)
 	if (argv[0])
 		new_name = *argv;
 	else if (nmc->ask) {
-		new_name = new_name_ask = nmc_readline (&nmc->nmc_config,
-		                                        _("New connection name: "));
+		new_name = new_name_free = nmc_readline (&nmc->nmc_config,
+		                                         _("New connection name: "));
 	} else {
 		g_string_printf (nmc->return_text, _("Error: <new name> argument is missing."));
 		NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT);
@@ -8505,35 +8527,23 @@ do_connection_clone (NmCli *nmc, int argc, char **argv)
 		NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT);
 	}
 
-	/* Copy the connection */
 	new_connection = nm_simple_connection_new_clone (connection);
 
-	s_con = nm_connection_get_setting_connection (new_connection);
-	g_assert (s_con);
 	uuid = nm_utils_uuid_generate ();
-	g_object_set (s_con,
+	g_object_set (nm_connection_get_setting_connection (new_connection),
 	              NM_SETTING_CONNECTION_ID, new_name,
 	              NM_SETTING_CONNECTION_UUID, uuid,
 	              NULL);
-	g_free (uuid);
 
-	/* Merge secrets into the new connection */
 	update_secrets_in_connection (NM_REMOTE_CONNECTION (connection), new_connection);
 
-	info = g_slice_new0 (CloneConnectionInfo);
-	info->nmc = nmc;
-	info->orig_id = g_strdup (nm_connection_get_id (connection));
-	info->orig_uuid = g_strdup (nm_connection_get_uuid (connection));
-	info->con_id = g_strdup (nm_connection_get_id (new_connection));
-
-	/* Add the new cloned connection to NetworkManager */
-	add_new_connection (!temporary,
-	                    nmc->client,
-	                    new_connection,
-	                    clone_connection_cb,
-	                    info);
-
+	add_connection (nmc->client,
+	                new_connection,
+	                temporary,
+	                clone_connection_cb,
+	                _add_connection_info_new (nmc, connection, new_connection));
 	nmc->should_wait++;
+
 	return nmc->return_value;
 }
 
@@ -8736,6 +8746,9 @@ do_connection_monitor (NmCli *nmc, int argc, char **argv)
 		}
 	}
 
+	if (nmc->complete)
+		return nmc->return_value;
+
 	for (i = 0; i < connections->len; i++)
 		connection_watch (nmc, connections->pdata[i]);
 
@@ -8745,8 +8758,6 @@ do_connection_monitor (NmCli *nmc, int argc, char **argv)
 		g_signal_connect (nmc->client, NM_CLIENT_CONNECTION_ADDED, G_CALLBACK (connection_added), nmc);
 	}
 
-	if (nmc->complete)
-		return nmc->return_value;
 	g_signal_connect (nmc->client, NM_CLIENT_CONNECTION_REMOVED, G_CALLBACK (connection_removed), nmc);
 
 	return NMC_RESULT_SUCCESS;
@@ -8819,7 +8830,6 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
 	const char *type = NULL, *filename = NULL;
 	gs_free char *type_ask = NULL;
 	gs_free char *filename_ask = NULL;
-	AddConnectionInfo *info;
 	gs_unref_object NMConnection *connection = NULL;
 	NMVpnEditorPlugin *plugin;
 	gs_free char *service_type = NULL;
@@ -8867,7 +8877,7 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
 			if (   argc == 1
 			    && nmc->complete) {
 				nmc_complete_strings (*argv, "wireguard");
-				complete_option ((const NMMetaAbstractInfo *) nm_meta_property_info_vpn_service_type,
+				complete_option (nmc, (const NMMetaAbstractInfo *) nm_meta_property_info_vpn_service_type,
 				                 *argv,
 				                 NULL);
 			}
@@ -8936,18 +8946,13 @@ do_connection_import (NmCli *nmc, int argc, char **argv)
 		NMC_RETURN (nmc, NMC_RESULT_ERROR_UNKNOWN);
 	}
 
-	info = g_malloc0 (sizeof (AddConnectionInfo));
-	info->nmc = nmc;
-	info->con_name = g_strdup (nm_connection_get_id (connection));
-
-	/* Add the new imported connection to NetworkManager */
-	add_new_connection (!temporary,
-	                    nmc->client,
-	                    connection,
-	                    add_connection_cb,
-	                    info);
-
+	add_connection (nmc->client,
+	                connection,
+	                temporary,
+	                add_connection_cb,
+	                _add_connection_info_new (nmc, NULL, connection));
 	nmc->should_wait++;
+
 	return nmc->return_value;
 }
 
@@ -9068,7 +9073,7 @@ finish:
 static char *
 gen_func_connection_names (const char *text, int state)
 {
-	int i;
+	guint i;
 	const GPtrArray *connections;
 	const char **connection_names;
 	char *ret;
@@ -9091,7 +9096,7 @@ gen_func_connection_names (const char *text, int state)
 static char *
 gen_func_active_connection_names (const char *text, int state)
 {
-	int i;
+	guint i;
 	const GPtrArray *acs;
 	const char **connections;
 	char *ret;
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index ad3a44c4..c00d3191 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -536,6 +536,9 @@ _metagen_device_detail_wifi_properties_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_AR
 		                                         : N_("no"))
 		                                      : N_("unknown"),
 		                                      get_type);
+	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);
 	default:
 		break;
 	}
@@ -555,6 +558,7 @@ const NmcMetaGenericInfo *const metagen_device_detail_wifi_properties[_NMC_GENER
 	_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"),
 };
 
 /*****************************************************************************/
@@ -1188,6 +1192,7 @@ fill_output_access_point (gpointer data, gpointer user_data)
 	set_val_strc (arr, 3, bssid);
 	set_val_strc (arr, 4, mode == NM_802_11_MODE_ADHOC ? _("Ad-Hoc")
 	                    : mode == NM_802_11_MODE_INFRA ? _("Infra")
+	                    : mode == NM_802_11_MODE_MESH ? _("Mesh")
 	                    : _("N/A"));
 	set_val_str  (arr, 5, channel_str);
 	set_val_str  (arr, 6, freq_str);
@@ -1897,7 +1902,6 @@ create_connect_connection_for_device (AddAndActivateInfo *info)
 	nm_connection_add_setting (connection, NM_SETTING (s_con));
 	g_object_set (s_con,
 	              NM_SETTING_CONNECTION_ID, nm_device_get_iface (info->device),
-	              NM_SETTING_CONNECTION_INTERFACE_NAME, nm_device_get_iface (info->device),
 	              NULL);
 
 	nm_client_add_and_activate_connection_async (info->nmc->client,
@@ -2473,7 +2477,7 @@ do_device_set (NmCli *nmc, int argc, char **argv)
 		gboolean flag;
 
 		if (argc == 1 && nmc->complete)
-			nmc_complete_strings (*argv, "managed", "autoconnect", NULL);
+			nmc_complete_strings (*argv, "managed", "autoconnect");
 
 		if (matches (*argv, "managed")) {
 			argc--;
@@ -2997,7 +3001,7 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv)
 			}
 			rescan = *argv;
 			if (argc == 1 && nmc->complete)
-				nmc_complete_strings (rescan, "auto", "no", "yes", NULL);
+				nmc_complete_strings (rescan, "auto", "no", "yes");
 			break;
 		default:
 			g_assert_not_reached();
@@ -3179,7 +3183,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
 	while (argc > 0) {
 		if (argc == 1 && nmc->complete) {
 			nmc_complete_strings (*argv, "ifname", "bssid", "password", "wep-key-type",
-			                      "name", "private", "hidden", NULL);
+			                      "name", "private", "hidden");
 		}
 
 		if (strcmp (*argv, "ifname") == 0) {
@@ -3229,7 +3233,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
 				goto finish;
 			}
 			if (argc == 1 && nmc->complete)
-				nmc_complete_strings (*argv, "key", "phrase", NULL);
+				nmc_complete_strings (*argv, "key", "phrase");
 			if (strcmp (*argv, "key") == 0)
 				wep_passphrase = FALSE;
 			else if (strcmp (*argv, "phrase") == 0)
@@ -3711,7 +3715,7 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv)
 	while (argc > 0) {
 		if (argc == 1 && nmc->complete) {
 			nmc_complete_strings (*argv, "ifname", "con-name", "ssid", "band",
-			                             "channel", "password", NULL);
+			                             "channel", "password");
 		}
 
 		if (strcmp (*argv, "ifname") == 0) {
@@ -3753,7 +3757,7 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv)
 			}
 			band = *argv;
 			if (argc == 1 && nmc->complete)
-				nmc_complete_strings (band, "a", "bg", NULL);
+				nmc_complete_strings (band, "a", "bg");
 			if (strcmp (band, "a") && strcmp (band, "bg")) {
 				g_string_printf (nmc->return_text, _("Error: band argument value '%s' is invalid; use 'a' or 'bg'."),
 				                 band);
@@ -3935,7 +3939,7 @@ do_device_wifi_rescan (NmCli *nmc, int argc, char **argv)
 	/* Get the parameters */
 	while (argc > 0) {
 		if (argc == 1 && nmc->complete)
-			nmc_complete_strings (*argv, "ifname", "ssid", NULL);
+			nmc_complete_strings (*argv, "ifname", "ssid");
 
 		if (strcmp (*argv, "ifname") == 0) {
 			if (ifname) {
@@ -4122,7 +4126,7 @@ do_device_lldp_list (NmCli *nmc, int argc, char **argv)
 	next_arg (nmc, &argc, &argv, NULL);
 	while (argc > 0) {
 		if (argc == 1 && nmc->complete)
-			nmc_complete_strings (*argv, "ifname", NULL);
+			nmc_complete_strings (*argv, "ifname");
 
 		if (strcmp (*argv, "ifname") == 0) {
 			argc--;
diff --git a/clients/cli/general.c b/clients/cli/general.c
index d713426b..e2ce639e 100644
--- a/clients/cli/general.c
+++ b/clients/cli/general.c
@@ -683,7 +683,7 @@ do_general_logging (NmCli *nmc, int argc, char **argv)
 
 		do {
 			if (argc == 1 && nmc->complete)
-				nmc_complete_strings (*argv, "level", "domains", NULL);
+				nmc_complete_strings (*argv, "level", "domains");
 
 			if (matches (*argv, "level")) {
 				argc--;
@@ -878,7 +878,7 @@ do_networking_connectivity (NmCli *nmc, int argc, char **argv)
 	next_arg (nmc, &argc, &argv, NULL);
 	if (nmc->complete) {
 		if (argc == 1)
-			nmc_complete_strings (*argv, "check", NULL);
+			nmc_complete_strings (*argv, "check");
 		return nmc->return_value;
 	}
 
diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c
index d7bc2a46..ad45f179 100644
--- a/clients/cli/nmcli.c
+++ b/clients/cli/nmcli.c
@@ -732,7 +732,7 @@ process_command_line (NmCli *nmc, int argc, char **argv)
 			nmc_complete_strings (argv[0], "--terse", "--pretty", "--mode", "--overview",
 			                               "--colors", "--escape",
 			                               "--fields", "--nocheck", "--get-values",
-			                               "--wait", "--version", "--help", NULL);
+			                               "--wait", "--version", "--help");
 		}
 
 		if (argv[0][1] == '-' && argv[0][2] == '\0') {
@@ -915,88 +915,6 @@ signal_handler (gpointer user_data)
 	return G_SOURCE_CONTINUE;
 }
 
-static void
-nmc_convert_strv_to_string (const GValue *src_value, GValue *dest_value)
-{
-	char **strings;
-
-	strings = g_value_get_boxed (src_value);
-	if (strings)
-		g_value_take_string (dest_value, g_strjoinv (",", strings));
-	else
-		g_value_set_string (dest_value, "");
-}
-
-static void
-nmc_convert_string_hash_to_string (const GValue *src_value, GValue *dest_value)
-{
-	GHashTable *hash;
-	GHashTableIter iter;
-	const char *key, *value;
-	GString *string;
-
-	hash = (GHashTable *) g_value_get_boxed (src_value);
-
-	string = g_string_new (NULL);
-	if (hash) {
-		g_hash_table_iter_init (&iter, hash);
-		while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &value)) {
-			if (string->len)
-				g_string_append_c (string, ',');
-			g_string_append_printf (string, "%s=%s", key, value);
-		}
-	}
-
-	g_value_take_string (dest_value, g_string_free (string, FALSE));
-}
-
-static void
-nmc_convert_bytes_to_string (const GValue *src_value, GValue *dest_value)
-{
-	GBytes *bytes;
-	const guint8 *array;
-	gsize length;
-	GString *printable;
-	guint i = 0;
-
-	bytes = g_value_get_boxed (src_value);
-
-	printable = g_string_new ("[");
-
-	if (bytes) {
-		array = g_bytes_get_data (bytes, &length);
-		while (i < MIN (length, 35)) {
-			if (i > 0)
-				g_string_append_c (printable, ' ');
-			g_string_append_printf (printable, "0x%02X", array[i++]);
-		}
-		if (i < length)
-			g_string_append (printable, " ... ");
-	}
-	g_string_append_c (printable, ']');
-
-	g_value_take_string (dest_value, g_string_free (printable, FALSE));
-}
-
-static void
-nmc_value_transforms_register (void)
-{
-	g_value_register_transform_func (G_TYPE_STRV,
-	                                 G_TYPE_STRING,
-	                                 nmc_convert_strv_to_string);
-
-	/* This depends on the fact that all of the hash-table-valued properties
-	 * in libnm-core are string->string.
-	 */
-	g_value_register_transform_func (G_TYPE_HASH_TABLE,
-	                                 G_TYPE_STRING,
-	                                 nmc_convert_string_hash_to_string);
-
-	g_value_register_transform_func (G_TYPE_BYTES,
-	                                 G_TYPE_STRING,
-	                                 nmc_convert_bytes_to_string);
-}
-
 void
 nm_cli_spawn_pager (NmCli *nmc)
 {
@@ -1054,8 +972,6 @@ main (int argc, char *argv[])
 	/* Save terminal settings */
 	tcgetattr (STDIN_FILENO, &termios_orig);
 
-	nmc_value_transforms_register ();
-
 	nm_cli.return_text = g_string_new (_("Success"));
 	loop = g_main_loop_new (NULL, FALSE);
 
diff --git a/clients/cli/utils.c b/clients/cli/utils.c
index a8b81279..a822dd89 100644
--- a/clients/cli/utils.c
+++ b/clients/cli/utils.c
@@ -189,10 +189,10 @@ next_arg (NmCli *nmc, int *argc, char ***argv, ...)
 
 		if (nmc && nmc->complete && *argc == 1) {
 			while ((cmd_option = va_arg (args, const char *)))
-				nmc_complete_strings (**argv, cmd_option, NULL);
+				nmc_complete_strings (**argv, cmd_option);
 
 			if (***argv == '-')
-				nmc_complete_strings (**argv, "--ask", "--show-secrets", NULL);
+				nmc_complete_strings (**argv, "--ask", "--show-secrets");
 
 			va_end (args);
 			return 0;
diff --git a/clients/cli/utils.h b/clients/cli/utils.h
index b84b35bf..82b186b7 100644
--- a/clients/cli/utils.h
+++ b/clients/cli/utils.h
@@ -225,6 +225,7 @@ typedef enum {
 	NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_WIFI_PROPERTIES_ADHOC,
 	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_NUM,
 
 } NmcGenericInfoType;
diff --git a/clients/common/nm-meta-setting-access.c b/clients/common/nm-meta-setting-access.c
index 8399f29d..ce5cd331 100644
--- a/clients/common/nm-meta-setting-access.c
+++ b/clients/common/nm-meta-setting-access.c
@@ -273,6 +273,7 @@ nm_meta_abstract_info_complete (const NMMetaAbstractInfo *abstract_info,
                                 gpointer environment_user_data,
                                 const NMMetaOperationContext *operation_context,
                                 const char *text,
+                                gboolean *out_complete_filename,
                                 char ***out_to_free)
 {
 	const char *const*values;
@@ -292,6 +293,7 @@ nm_meta_abstract_info_complete (const NMMetaAbstractInfo *abstract_info,
 	                                                 environment_user_data,
 	                                                 operation_context,
 	                                                 text,
+	                                                 out_complete_filename,
 	                                                 out_to_free);
 
 	nm_assert (!*out_to_free || values == (const char *const*) *out_to_free);
diff --git a/clients/common/nm-meta-setting-access.h b/clients/common/nm-meta-setting-access.h
index ec1c2ba0..38f22c7a 100644
--- a/clients/common/nm-meta-setting-access.h
+++ b/clients/common/nm-meta-setting-access.h
@@ -69,6 +69,7 @@ const char *const*nm_meta_abstract_info_complete (const NMMetaAbstractInfo *abst
                                                   gpointer environment_user_data,
                                                   const NMMetaOperationContext *operation_context,
                                                   const char *text,
+                                                  gboolean *out_complete_filename,
                                                   char ***out_to_free);
 
 /*****************************************************************************/
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 698ded86..c1a5c2a7 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -28,6 +28,7 @@
 #include "nm-glib-aux/nm-enum-utils.h"
 #include "nm-glib-aux/nm-secret-utils.h"
 #include "nm-libnm-core-intern/nm-libnm-core-utils.h"
+#include "nm-libnm-core-aux/nm-libnm-core-aux.h"
 
 #include "nm-vpn-helpers.h"
 #include "nm-client-utils.h"
@@ -76,6 +77,25 @@ _gtype_property_get_gtype (GType gtype, const char *property_name)
 
 /*****************************************************************************/
 
+static char *
+bytes_to_string (GBytes *bytes)
+{
+	const guint8 *data;
+	gsize len;
+
+	if (!bytes)
+		return NULL;
+
+	data = g_bytes_get_data (bytes, &len);
+	return nm_utils_bin2hexstr_full (data,
+	                                 len,
+	                                 '\0',
+	                                 TRUE,
+	                                 NULL);
+}
+
+/*****************************************************************************/
+
 static int
 _int64_cmp_desc (gconstpointer a,
                  gconstpointer b,
@@ -188,7 +208,7 @@ _value_strsplit (const char *value,
 	gsize len;
 
 	/* FIXME: some modes should support backslash escaping.
-	 * In particular, to distingish from _value_str_as_index_list(), which
+	 * In particular, to distinguish from _value_str_as_index_list(), which
 	 * does not accept '\\'. */
 
 	/* note that all modes remove empty tokens (",", "a,,b", ",,"). */
@@ -432,158 +452,7 @@ _parse_ip_route (int family,
 	return route;
 }
 
-static char *
-_dump_team_link_watcher (NMTeamLinkWatcher *watcher)
-{
-	const char *name;
-	NMTeamLinkWatcherArpPingFlags flags;
-	GString *w_dump;
-
-	if (!watcher)
-		return NULL;
-
-	w_dump = g_string_new (NULL);
-	name = nm_team_link_watcher_get_name (watcher);
-	g_string_append_printf (w_dump, "name=%s", name);
-
-#define DUMP_WATCHER_INT(str, watcher, name, key) \
-	G_STMT_START { \
-		int _val = nm_team_link_watcher_get_##key (watcher); \
-		\
-		if (_val) \
-			g_string_append_printf (str, " %s=%d", name, _val); \
-	} G_STMT_END;
-
-	if (nm_streq (name, NM_TEAM_LINK_WATCHER_ETHTOOL)) {
-		DUMP_WATCHER_INT (w_dump, watcher, "delay-up", delay_up);
-		DUMP_WATCHER_INT (w_dump, watcher, "delay-down", delay_down);
-		return g_string_free (w_dump, FALSE);
-	}
-	/* NM_TEAM_LINK_WATCHER_NSNA_PING and NM_TEAM_LINK_WATCHER_ARP_PING */
-	DUMP_WATCHER_INT (w_dump, watcher, "init-wait", init_wait);
-	DUMP_WATCHER_INT (w_dump, watcher, "interval", interval);
-	DUMP_WATCHER_INT (w_dump, watcher, "missed-max", missed_max);
-	g_string_append_printf (w_dump, " target-host=%s",
-	                        nm_team_link_watcher_get_target_host (watcher));
-
-	if (nm_streq (name, NM_TEAM_LINK_WATCHER_NSNA_PING))
-		return g_string_free (w_dump, FALSE);
-
-	DUMP_WATCHER_INT (w_dump, watcher, "vlanid", vlanid);
-#undef DUMP_WATCHER_INT
-	g_string_append_printf (w_dump, " source-host=%s",
-	                        nm_team_link_watcher_get_source_host (watcher));
-	flags = nm_team_link_watcher_get_flags (watcher);
-	if (flags & NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_ACTIVE)
-		g_string_append_printf (w_dump, " validate-active=true");
-	if (flags & NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_INACTIVE)
-		g_string_append_printf (w_dump, " validate-inactive=true");
-	if (flags & NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_SEND_ALWAYS)
-		g_string_append_printf (w_dump, "send-always=true");
-
-	return g_string_free (w_dump, FALSE);
-}
-
-static NMTeamLinkWatcher *
-_parse_team_link_watcher (const char *str,
-                          GError **error)
-{
-	gs_free const char **watcherv = NULL;
-	gs_free char *str_clean_free = NULL;
-	const char *str_clean;
-	guint i;
-	gs_free const char *name = NULL;
-	int val1 = 0, val2 = 0, val3 = 3, val4 = -1;
-	gs_free const char *target_host = NULL;
-	gs_free const char *source_host = NULL;
-	NMTeamLinkWatcherArpPingFlags flags = 0;
-
-	nm_assert (str);
-	nm_assert (!error || !*error);
-
-	str_clean = nm_strstrip_avoid_copy_a (300, str, &str_clean_free);
-	watcherv = nm_utils_strsplit_set (str_clean, " \t");
-	if (!watcherv) {
-		g_set_error (error, 1, 0, "'%s' is not valid", str);
-		return NULL;
-	}
-
-	for (i = 0; watcherv[i]; i++) {
-		gs_free const char **pair = NULL;
-
-		pair = nm_utils_strsplit_set (watcherv[i], "=");
-		if (!pair) {
-			g_set_error (error, 1, 0, "'%s' is not valid: %s", watcherv[i],
-			             "properties should be specified as 'key=value'");
-			return NULL;
-		}
-		if (!pair[1]) {
-			g_set_error (error, 1, 0, "'%s' is not valid: %s", watcherv[i],
-			             "missing key value");
-			return NULL;
-		}
-		if (pair[2]) {
-			g_set_error (error, 1, 0, "'%s' is not valid: %s", watcherv[i],
-			             "properties should be specified as 'key=value'");
-			return NULL;
-		}
-
-		if (nm_streq (pair[0], "name"))
-			name = g_strdup (pair[1]);
-		else if (   nm_streq (pair[0], "delay-up")
-		         || nm_streq (pair[0], "init-wait"))
-			val1 = _nm_utils_ascii_str_to_int64 (pair[1], 10, 0, G_MAXINT32, -1);
-		else if (   nm_streq (pair[0], "delay-down")
-		         || nm_streq (pair[0], "interval"))
-			val2 = _nm_utils_ascii_str_to_int64 (pair[1], 10, 0, G_MAXINT32, -1);
-		else if (nm_streq (pair[0], "missed-max"))
-			val3 = _nm_utils_ascii_str_to_int64 (pair[1], 10, 0, G_MAXINT32, -1);
-		else if (nm_streq (pair[0], "vlanid"))
-			val4 = _nm_utils_ascii_str_to_int64 (pair[1], 10, -1, 4094, -2);
-		else if (nm_streq (pair[0], "target-host"))
-			target_host = g_strdup (pair[1]);
-		else if (nm_streq (pair[0], "source-host"))
-			source_host = g_strdup (pair[1]);
-		else if (nm_streq (pair[0], "validate-active")) {
-			if (nm_streq (pair[1], "true"))
-				flags |= NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_ACTIVE;
-		} else if (nm_streq (pair[0], "validate-inactive")) {
-			if (nm_streq (pair[1], "true"))
-				flags |= NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_INACTIVE;
-		} else if (nm_streq (pair[0], "send-always")) {
-			if (nm_streq (pair[1], "true"))
-				flags |= NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_SEND_ALWAYS;
-		} else {
-			g_set_error (error, 1, 0, "'%s' is not valid: %s", watcherv[i],
-			             "unknown key");
-			return NULL;
-		}
-
-		if ((val1 < 0) || (val2 < 0) || (val3 < 0)) {
-			g_set_error (error, 1, 0, "'%s' is not valid: %s", watcherv[i],
-			             "value is not a valid number [0, MAXINT]");
-			return NULL;
-		}
-		if (val4 < -1) {
-			g_set_error (error, 1, 0, "'%s' is not valid: %s", watcherv[i],
-			             "value is not a valid number [-1, 4094]");
-			return NULL;
-		}
-	}
-
-	if (nm_streq0 (name, NM_TEAM_LINK_WATCHER_ETHTOOL))
-		return nm_team_link_watcher_new_ethtool (val1, val2, error);
-	else if (nm_streq0 (name, NM_TEAM_LINK_WATCHER_NSNA_PING))
-		return nm_team_link_watcher_new_nsna_ping (val1, val2, val3, target_host, error);
-	else if (nm_streq0 (name, NM_TEAM_LINK_WATCHER_ARP_PING))
-		return nm_team_link_watcher_new_arp_ping2 (val1, val2, val3, val4, target_host, source_host, flags, error);
-
-	if (!name)
-		g_set_error (error, 1, 0, "link watcher name missing");
-	else
-		g_set_error (error, 1, 0, "unknown link watcher name: '%s'", name);
-	return NULL;
-}
+/*****************************************************************************/
 
 /* Max priority values from libnm-core/nm-setting-vlan.c */
 #define MAX_SKB_PRIO   G_MAXUINT32
@@ -685,7 +554,6 @@ nmc_team_check_config (const char *config, char **out_config, GError **error)
 		_TEAM_CONFIG_TYPE_FILE,
 		_TEAM_CONFIG_TYPE_JSON,
 	} desired_type = _TEAM_CONFIG_TYPE_GUESS;
-	const char *filename = NULL;
 	size_t c_len = 0;
 	gs_free char *config_clone = NULL;
 
@@ -719,22 +587,10 @@ nmc_team_check_config (const char *config, char **out_config, GError **error)
 				             config);
 				return FALSE;
 			}
-			filename = config;
 			config = config_clone = g_steal_pointer (&contents);
 		}
 	}
 
-	if (!nm_utils_is_json_object (config, NULL)) {
-		if (filename) {
-			g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT,
-			             _("'%s' does not contain a valid team configuration"), filename);
-		} else {
-			g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT,
-			             _("team configuration must be a JSON object"));
-		}
-		return FALSE;
-	}
-
 	*out_config = (config == config_clone)
 	              ? g_steal_pointer (&config_clone)
 	              : g_strdup (config);
@@ -788,7 +644,7 @@ _env_warn_fcn (const NMMetaEnvironment *environment,
 	const NMMetaPropertyInfo *property_info, const NMMetaEnvironment *environment, gpointer environment_user_data, NMSetting *setting, const char *value, GError **error
 
 #define ARGS_COMPLETE_FCN \
-	const NMMetaPropertyInfo *property_info, const NMMetaEnvironment *environment, gpointer environment_user_data, const NMMetaOperationContext *operation_context, const char *text, char ***out_to_free
+	const NMMetaPropertyInfo *property_info, const NMMetaEnvironment *environment, gpointer environment_user_data, const NMMetaOperationContext *operation_context, const char *text, gboolean *out_complete_filename, char ***out_to_free
 
 #define ARGS_VALUES_FCN \
 	const NMMetaPropertyInfo *property_info, char ***out_to_free
@@ -849,9 +705,21 @@ _SET_FCN_DO_REMOVE (char modifier, const char *value)
 #define RETURN_STR_TO_FREE(val) \
 	G_STMT_START { \
 		char *_val = (val); \
+		\
 		return ((*(out_to_free)) = _val); \
 	} G_STMT_END
 
+#define RETURN_STR_TEMPORARY(val) \
+	G_STMT_START { \
+		const char *_val = (val); \
+		\
+		if (_val == NULL) \
+			return NULL; \
+		if (_val[0] == '\0') \
+			return ""; \
+		return ((*(out_to_free)) = g_strdup (_val)); \
+	} G_STMT_END
+
 static gboolean
 _gobject_property_is_default (NMSetting *setting, const char *prop_name)
 {
@@ -894,7 +762,7 @@ _gobject_property_reset (NMSetting *setting,
 
 	g_value_init (&v, pspec->value_type);
 	if (reset_default)
-		g_param_value_defaults (pspec, &v);
+		g_param_value_set_default (pspec, &v);
 	g_object_set_property (G_OBJECT (setting), prop_name, &v);
 	return TRUE;
 }
@@ -905,73 +773,167 @@ _gobject_property_reset_default (NMSetting *setting, const char *prop_name)
 	return _gobject_property_reset (setting, prop_name, TRUE);
 }
 
+static const char *
+_coerce_str_emptyunset (NMMetaAccessorGetType get_type,
+                        gboolean is_default,
+                        const char *cstr,
+                        char **out_str)
+{
+	nm_assert (out_str && !*out_str);
+	nm_assert (   (!is_default && cstr && cstr[0] != '\0')
+	           || NM_IN_STRSET (cstr, NULL, ""));
+
+	if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) {
+		if (   !cstr
+		    || cstr[0] == '\0') {
+			if (is_default)
+				return "";
+			else
+				return "\"\"";
+		}
+		nm_assert (!is_default);
+		return (*out_str = g_strdup_printf ("\"%s\"", cstr));
+	}
+
+	/* we coerce NULL/"" to either "" or " ". */
+	if (   !cstr
+	    || cstr[0] == '\0') {
+		if (is_default)
+			return "";
+		else
+			return " ";
+	}
+	nm_assert (!is_default);
+	return cstr;
+}
+
+static gboolean
+_is_default (const NMMetaPropertyInfo *property_info,
+             NMSetting *setting)
+{
+	if (   property_info->property_typ_data
+	    && property_info->property_typ_data->is_default_fcn)
+		return !!(property_info->property_typ_data->is_default_fcn (setting));
+
+	return _gobject_property_is_default (setting, property_info->property_name);
+
+}
+
 static gconstpointer
 _get_fcn_gobject_impl (const NMMetaPropertyInfo *property_info,
                        NMSetting *setting,
                        NMMetaAccessorGetType get_type,
+                       gboolean handle_emptyunset,
                        gboolean *out_is_default,
                        gpointer *out_to_free)
 {
 	const char *cstr;
 	GType gtype_prop;
 	nm_auto_unset_gvalue GValue val = G_VALUE_INIT;
+	gboolean is_default;
+	gboolean glib_handles_str_transform;
 
 	RETURN_UNSUPPORTED_GET_TYPE ();
-	NM_SET_OUT (out_is_default, _gobject_property_is_default (setting, property_info->property_name));
 
-	if (   property_info->property_typ_data
-	    && property_info->property_typ_data->is_default_fcn
-	    && property_info->property_typ_data->is_default_fcn (setting)) {
-		if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY)
-			return _("(default)");
-		return "";
-	}
+	is_default = _is_default (property_info, setting);
+
+	NM_SET_OUT (out_is_default, is_default);
 
 	gtype_prop = _gobject_property_get_gtype (G_OBJECT (setting), property_info->property_name);
 
+	glib_handles_str_transform = !NM_IN_SET (gtype_prop, G_TYPE_BOOLEAN,
+	                                                     G_TYPE_STRV,
+	                                                     G_TYPE_BYTES,
+	                                                     G_TYPE_HASH_TABLE);
+
+	if (glib_handles_str_transform) {
+		/* We rely on the type convertion of the gobject property to string. */
+		g_value_init (&val, G_TYPE_STRING);
+	} else
+		g_value_init (&val, gtype_prop);
+
+	g_object_get_property (G_OBJECT (setting), property_info->property_name, &val);
+
+	/* Currently only one particular property asks us to "handle_emptyunset".
+	 * So, don't implement it (yet) for the other types, where it's unneeded. */
+	nm_assert (   !handle_emptyunset
+	           || (   gtype_prop == G_TYPE_STRV
+	               && !glib_handles_str_transform));
+
+	if (glib_handles_str_transform)
+		RETURN_STR_TEMPORARY (g_value_get_string (&val));
+
 	if (gtype_prop == G_TYPE_BOOLEAN) {
 		gboolean b;
 
-		g_value_init (&val, gtype_prop);
-		g_object_get_property (G_OBJECT (setting), property_info->property_name, &val);
 		b = g_value_get_boolean (&val);
 		if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY)
 			cstr = b ? _("yes") : _("no");
 		else
 			cstr = b ? "yes" : "no";
 		return cstr;
-	} else {
-		char *str;
+	}
 
-		/* Note that we register certain transform functions in nmc_value_transforms_register().
-		 * This makes G_TYPE_STRV working.
-		 *
-		 * FIXME: that is particularly ugly because it's non-obvious which code relies
-		 * on nmc_value_transforms_register(). Also, nmc_value_transforms_register() is
-		 * in clients/cli, while we are here in clients/common. */
-		g_value_init (&val, G_TYPE_STRING);
-		g_object_get_property (G_OBJECT (setting), property_info->property_name, &val);
-		cstr = g_value_get_string (&val);
-
-		if (   property_info->property_typ_data
-		    && property_info->property_typ_data->is_default_fcn) {
-			if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) {
-				str =   cstr
-				      ? g_strdup_printf ("\"%s\"", cstr)
-				      : g_strdup ("");
-			} else
-				str = g_strdup (cstr && cstr[0] ? cstr : " ");
-		} else
-			str = cstr ? g_strdup (cstr) : NULL;
+	if (gtype_prop == G_TYPE_STRV) {
+		const char *const*strv;
+
+		strv = g_value_get_boxed (&val);
+		if (strv && strv[0])
+			RETURN_STR_TO_FREE (g_strjoinv (",", (char **) strv));
 
+		/* special hack for handling properties that can be empty and unset
+		 * (see multilist.clear_emptyunset_fcn). */
+		if (handle_emptyunset) {
+			char *str = NULL;
+
+			cstr = _coerce_str_emptyunset (get_type, is_default, NULL, &str);
+			if (str)
+				RETURN_STR_TO_FREE (str);
+			RETURN_STR_TEMPORARY (cstr);
+		}
+
+		return "";
+	}
+
+	if (gtype_prop == G_TYPE_BYTES) {
+		char *str;
+
+		str = bytes_to_string (g_value_get_boxed (&val));
+		NM_SET_OUT (out_is_default, !str || !str[0]);
 		RETURN_STR_TO_FREE (str);
 	}
+
+	if (gtype_prop == G_TYPE_HASH_TABLE) {
+		GHashTable *strdict;
+		gs_free const char **keys = NULL;
+		GString *str;
+		gsize i;
+
+		strdict = g_value_get_boxed (&val);
+		keys = nm_utils_strdict_get_keys (strdict, TRUE, NULL);
+		if (!keys)
+			return NULL;
+
+		str = g_string_new (NULL);
+		for (i = 0; keys[i]; i++) {
+			if (str->len > 0)
+				g_string_append_c (str, ',');
+			g_string_append_printf (str,
+			                        "%s=%s",
+			                        keys[i],
+			                        (const char *) g_hash_table_lookup (strdict, keys[i]));
+		}
+		RETURN_STR_TO_FREE (g_string_free (str, FALSE));
+	}
+
+	nm_assert_not_reached ();
+	return NULL;
 }
 
 static gconstpointer
 _get_fcn_gobject (ARGS_GET_FCN)
 {
-	return _get_fcn_gobject_impl (property_info, setting, get_type, out_is_default, out_to_free);
+	return _get_fcn_gobject_impl (property_info, setting, get_type, FALSE, out_is_default, out_to_free);
 }
 
 static gconstpointer
@@ -1063,7 +1025,7 @@ _get_fcn_gobject_mtu (ARGS_GET_FCN)
 
 	if (   !property_info->property_typ_data
 	    || !property_info->property_typ_data->subtype.mtu.get_fcn)
-		return _get_fcn_gobject_impl (property_info, setting, get_type, out_is_default, out_to_free);
+		return _get_fcn_gobject_impl (property_info, setting, get_type, FALSE, out_is_default, out_to_free);
 
 	mtu = property_info->property_typ_data->subtype.mtu.get_fcn (setting);
 	if (mtu == 0) {
@@ -1195,7 +1157,7 @@ _get_fcn_gobject_enum (ARGS_GET_FCN)
 		s =    format_numeric_hex
 		    || (   format_numeric_hex_unknown
 		        && !G_IS_ENUM_CLASS (gtype_class ?: (gtype_class = g_type_class_ref (gtype))))
-		    ? g_strdup_printf ("0x%"G_GINT64_FORMAT, v)
+		    ? g_strdup_printf ("0x%"G_GINT64_MODIFIER"x", v)
 		    : g_strdup_printf ("%"G_GINT64_FORMAT, v);
 		RETURN_STR_TO_FREE (g_steal_pointer (&s));
 	}
@@ -1213,7 +1175,7 @@ _get_fcn_gobject_enum (ARGS_GET_FCN)
 	if (   format_numeric_hex
 	    || (   format_numeric_hex_unknown
 	        && !G_IS_ENUM_CLASS (gtype_class ?: (gtype_class = g_type_class_ref (gtype)))))
-		nm_sprintf_buf (s_numeric, "0x%"G_GINT64_FORMAT, v);
+		nm_sprintf_buf (s_numeric, "0x%"G_GINT64_MODIFIER"x", v);
 	else
 		nm_sprintf_buf (s_numeric, "%"G_GINT64_FORMAT, v);
 
@@ -1723,23 +1685,6 @@ wep_key_type_to_string (NMWepKeyType type)
 }
 
 static char *
-bytes_to_string (GBytes *bytes)
-{
-	const guint8 *data;
-	gsize len;
-
-	if (!bytes)
-		return NULL;
-
-	data = g_bytes_get_data (bytes, &len);
-	return nm_utils_bin2hexstr_full (data,
-	                                 len,
-	                                 '\0',
-	                                 TRUE,
-	                                 NULL);
-}
-
-static char *
 vlan_flags_to_string (guint32 flags, NMMetaAccessorGetType get_type)
 {
 	GString *flag_str;
@@ -1839,19 +1784,41 @@ _multilist_do_validate (const NMMetaPropertyInfo *property_info,
 	return item;
 }
 
+static gconstpointer
+_get_fcn_multilist (ARGS_GET_FCN)
+{
+	return _get_fcn_gobject_impl (property_info,
+	                              setting,
+	                              get_type,
+	                              property_info->property_typ_data->subtype.multilist.clear_emptyunset_fcn != NULL,
+	                              out_is_default,
+	                              out_to_free);
+}
+
+static gboolean
+_multilist_clear_property (const NMMetaPropertyInfo *property_info,
+                           NMSetting *setting,
+                           gboolean is_set /* or else set default */)
+{
+	if (property_info->property_typ_data->subtype.multilist.clear_emptyunset_fcn) {
+		property_info->property_typ_data->subtype.multilist.clear_emptyunset_fcn (setting, is_set);
+		return TRUE;
+	}
+	if (property_info->property_typ_data->subtype.multilist.clear_all_fcn) {
+		property_info->property_typ_data->subtype.multilist.clear_all_fcn (setting);
+		return TRUE;
+	}
+	return _gobject_property_reset (setting, property_info->property_name, FALSE);
+}
+
 static gboolean
 _set_fcn_multilist (ARGS_SET_FCN)
 {
 	gs_free const char **strv = NULL;
 	gsize i, j, nstrv;
 
-	if (_SET_FCN_DO_RESET_DEFAULT_WITH_SUPPORTS_REMOVE (property_info, modifier, value)) {
-		if (property_info->property_typ_data->subtype.multilist.clear_all_fcn) {
-			property_info->property_typ_data->subtype.multilist.clear_all_fcn (setting);
-			return TRUE;
-		}
-		return _gobject_property_reset (setting, property_info->property_name, FALSE);
-	}
+	if (_SET_FCN_DO_RESET_DEFAULT_WITH_SUPPORTS_REMOVE (property_info, modifier, value))
+		return _multilist_clear_property (property_info, setting, FALSE);
 
 	if (   _SET_FCN_DO_REMOVE (modifier, value)
 	    && (   property_info->property_typ_data->subtype.multilist.remove_by_idx_fcn_u32
@@ -1884,6 +1851,11 @@ _set_fcn_multilist (ARGS_SET_FCN)
 		}
 	}
 
+	if (   _SET_FCN_DO_SET_ALL (modifier, value)
+	    && property_info->property_typ_data->subtype.multilist.clear_emptyunset_fcn
+	    && value[0] == '\0')
+		return _multilist_clear_property (property_info, setting, FALSE);
+
 	strv = _value_strsplit (value,
 	                          property_info->property_typ_data->subtype.multilist.strsplit_plain
 	                        ? VALUE_STRSPLIT_MODE_MULTILIST
@@ -1906,11 +1878,13 @@ _set_fcn_multilist (ARGS_SET_FCN)
 	}
 	nstrv = j;
 
-	if (_SET_FCN_DO_SET_ALL (modifier, value)) {
-		if (property_info->property_typ_data->subtype.multilist.clear_all_fcn)
-			property_info->property_typ_data->subtype.multilist.clear_all_fcn (setting);
-		else
-			_gobject_property_reset (setting, property_info->property_name, FALSE);
+	if (_SET_FCN_DO_SET_ALL (modifier, value))
+		_multilist_clear_property (property_info, setting, TRUE);
+	else if (   property_info->property_typ_data->subtype.multilist.clear_emptyunset_fcn
+	         && _is_default (property_info, setting)) {
+		/* the property is already the default. But we hav here a '+' / '-' modifier, so
+		 * that always makes it non-default (empty) first. */
+		_multilist_clear_property (property_info, setting, TRUE);
 	}
 
 	for (i = 0; i < nstrv; i++) {
@@ -2229,8 +2203,7 @@ _get_fcn_cert_8021x (ARGS_GET_FCN)
 
 	switch (vtable->scheme_func (s_8021X)) {
 	case NM_SETTING_802_1X_CK_SCHEME_BLOB:
-		if (   vtable->is_secret
-		    && !NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_SHOW_SECRETS))
+		if (!NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_SHOW_SECRETS))
 			return _get_text_hidden (get_type);
 		str = bytes_to_string (vtable->blob_func (s_8021X));
 		break;
@@ -2268,16 +2241,25 @@ _set_fcn_cert_8021x (ARGS_SET_FCN)
 	vtable = &nm_setting_8021x_scheme_vtable[property_info->property_typ_data->subtype.cert_8021x.scheme_type];
 
 	if (vtable->is_secret) {
-		gs_free char *path = NULL;
 		nm_auto_free_secret char *password_free = NULL;
-		char *password;
-
-		path = g_strdup (value);
-		password = path + strcspn (path, " \t");
-		if (password[0] != '\0') {
-			password[0] = '\0';
-			while (nm_utils_is_separator (password[0]))
-				password++;
+		gs_free const char **strv = NULL;
+		const char *password;
+		const char *path;
+		gsize len;
+
+		strv = nm_utils_escaped_tokens_split (value, NM_ASCII_SPACES);
+		len = NM_PTRARRAY_LEN (strv);
+		if (len > 2) {
+			g_set_error_literal (error,
+			                     NM_UTILS_ERROR,
+			                     NM_UTILS_ERROR_INVALID_ARGUMENT,
+			                     _("too many arguments. Please only specify a private key file and optionally a password"));
+			return FALSE;
+		}
+
+		path = len > 0 ? strv[0] : NULL;
+		if (len == 2) {
+			password = strv[1];
 		} else {
 			password_free = g_strdup (vtable->passwd_func (NM_SETTING_802_1X (setting)));
 			password = password_free;
@@ -2298,19 +2280,24 @@ _set_fcn_cert_8021x (ARGS_SET_FCN)
 	}
 }
 
-static gconstpointer
-_get_fcn_gobject_bytes (ARGS_GET_FCN)
+static const char *const*
+_complete_fcn_cert_8021x (ARGS_COMPLETE_FCN)
 {
-	gs_unref_bytes GBytes *bytes = NULL;
-	char *str;
+	const NMSetting8021xSchemeVtable *vtable;
 
-	RETURN_UNSUPPORTED_GET_TYPE ();
+	vtable = &nm_setting_8021x_scheme_vtable[property_info->property_typ_data->subtype.cert_8021x.scheme_type];
 
-	g_object_get (setting, property_info->property_name, &bytes, NULL);
+	if (vtable->is_secret) {
+		gs_free const char **strv = NULL;
 
-	str = bytes_to_string (bytes);
-	NM_SET_OUT (out_is_default, !str || !str[0]);
-	RETURN_STR_TO_FREE (str);
+		strv = nm_utils_escaped_tokens_split (text, NM_ASCII_SPACES);
+		/* don't try to complete the password */
+		if (NM_PTRARRAY_LEN (strv) > 1)
+			return NULL;
+	}
+
+	NM_SET_OUT (out_complete_filename, TRUE);
+	return NULL;
 }
 
 static gconstpointer
@@ -2479,8 +2466,9 @@ _complete_fcn_connection_type (ARGS_COMPLETE_FCN)
 	guint i, j;
 	char **result;
 	gsize text_len;
+	const char *slave_types[] = {"bond-slave", "bridge-slave", "team-slave"};
 
-	result = g_new (char *, _NM_META_SETTING_TYPE_NUM * 2 + 1);
+	result = g_new (char *, _NM_META_SETTING_TYPE_NUM * 2 + G_N_ELEMENTS (slave_types) + 1);
 
 	text_len = text ? strlen (text) : 0;
 
@@ -2500,6 +2488,12 @@ _complete_fcn_connection_type (ARGS_COMPLETE_FCN)
 		if (!text || strncmp (text, v, text_len) == 0)
 			result[j++] = g_strdup (v);
 	}
+	for (i = 0; i < G_N_ELEMENTS (slave_types); i++) {
+		const char *v = slave_types[i];
+
+		if (!text || strncmp (text, v, text_len) == 0)
+			result[j++] = g_strdup (v);
+	}
 	if (j)
 		result[j++] = NULL;
 	else {
@@ -3362,8 +3356,7 @@ _objlist_set_fcn_ip_config_routes (NMSetting *setting,
 static gboolean
 _is_default_func_ip_config_dns_options (NMSetting *setting)
 {
-	return    nm_setting_ip_config_has_dns_options (NM_SETTING_IP_CONFIG (setting))
-	       && !nm_setting_ip_config_get_num_dns_options (NM_SETTING_IP_CONFIG (setting));
+	return !nm_setting_ip_config_has_dns_options (NM_SETTING_IP_CONFIG (setting));
 }
 
 static void
@@ -3405,7 +3398,7 @@ _objlist_set_fcn_ip_config_routing_rules (NMSetting *setting,
 		return FALSE;
 
 	/* also for @do_add, we first always search whether such a rule already exist
-	 * and remove the first occurance.
+	 * and remove the first occurrence.
 	 *
 	 * The effect is, that we don't add multiple times the same rule,
 	 * and that if the rule already exists, it gets moved to the end (append).
@@ -3687,85 +3680,6 @@ _validate_fcn_team_config (const char *value, char **out_to_free, GError **error
 }
 
 static void
-_multilist_clear_all_fcn_team_runner_tx_hash (NMSetting *setting)
-{
-	/* Workaround libnm bug (confirmed against version 1.16.0).
-	 * We need to both clear the GObject property and call the libnm API.
-	 *
-	 * This workaround was added in nmcli as [1]. This needs fixing in libnm.
-	 *
-	 * Without this, CI test "team_abs_set_runner_tx_hash" fails.
-	 * Try (without the following workaround): */
-#if 0
-     $ (nmcli connection delete team0 ; :); \
-       nmcli connection add type team con-name team0 ifname team0 autoconnect no \
-           team.runner lacp && \
-       echo ">>> FIRST:" && \
-       PAGER= nmcli -o connection show team0 && \
-       nmcli connection modify team0 team.runner-tx-hash l3 && \
-       echo ">>> AFTER:" && \
-       PAGER= nmcli -o connection show team0
-#endif
-	/* See also:
-	 *
-	 *   - https://github.com/NetworkManager/NetworkManager/pull/318
-	 *   - https://bugzilla.redhat.com/show_bug.cgi?id=1691619
-	 *
-	 * [1] https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=350dbb55abf3a80267c398e6f64c2cee4645475a
-	 */
-
-	/* it appears, we don't really need _gobject_property_reset(). Just to be sure
-	 * also call it. */
-	_gobject_property_reset (setting, NM_SETTING_TEAM_RUNNER_TX_HASH, FALSE);
-	while (nm_setting_team_get_num_runner_tx_hash (NM_SETTING_TEAM (setting)))
-		nm_setting_team_remove_runner_tx_hash (NM_SETTING_TEAM (setting), 0);
-}
-
-static void
-_objlist_clear_all_fcn_team_link_watchers (NMSetting *setting)
-{
-	/* the same workaround as _multilist_clear_all_fcn_team_runner_tx_hash() above.
-	 *
-	 * Reproduce with: */
-#if 0
-     $ (nmcli connection delete team0 ; :); \
-       nmcli connection add type team con-name team0 ifname team0 autoconnect no \
-             team.link-watchers 'name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, name=ethtool delay-up=3' && \
-       echo ">>> FIRST:" && \
-       PAGER= nmcli -o connection show team0 && \
-       nmcli connection modify team0 team.link-watchers 'name=ethtool delay-up=4' && \
-       echo ">>> AFTER:" && \
-       PAGER= nmcli -o connection show team0
-
-       (nmcli connection delete team0-slave ; :); \
-       nmcli connection add type ethernet con-name team0-slave master team0 slave-type team ifname eth0 autoconnect no \
-             team-port.link-watchers 'name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, name=ethtool delay-up=3' && \
-       echo ">>> FIRST:" && \
-       PAGER= nmcli -o connection show team0-slave && \
-       nmcli connection modify team0-slave team.link-watchers 'name=ethtool delay-up=4' && \
-       echo ">>> AFTER:" && \
-       PAGER= nmcli -o connection show team0-slave
-#endif
-	/* See also:
-	 *
-	 *   - https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=72bf38cad6ca6033d0117bf67b0e726001922d8f
-	 *   - https://github.com/NetworkManager/NetworkManager/pull/318
-	 *   - https://bugzilla.redhat.com/show_bug.cgi?id=1691619
-	 */
-
-	/* In this case, it appears both GObject reset and nm_setting_team*_clear_link_watchers()
-	 * work (on their own). So, we might not need the workaround.
-	 * Just to be sure, as something is not right with libnm here. */
-	if (NM_IS_SETTING_TEAM (setting)) {
-		_gobject_property_reset (setting, NM_SETTING_TEAM_LINK_WATCHERS, FALSE);
-		nm_setting_team_clear_link_watchers (NM_SETTING_TEAM (setting));
-	} else {
-		_gobject_property_reset (setting, NM_SETTING_TEAM_PORT_LINK_WATCHERS, FALSE);
-		nm_setting_team_port_clear_link_watchers (NM_SETTING_TEAM_PORT (setting));
-	}
-}
-
-static void
 _objlist_obj_to_str_fcn_team_link_watchers (NMMetaAccessorGetType get_type,
                                             NMSetting *setting,
                                             guint idx,
@@ -3779,9 +3693,9 @@ _objlist_obj_to_str_fcn_team_link_watchers (NMMetaAccessorGetType get_type,
 	else
 		watcher = nm_setting_team_port_get_link_watcher (NM_SETTING_TEAM_PORT (setting), idx);
 
-	s = _dump_team_link_watcher (watcher);
+	s = nm_utils_team_link_watcher_to_string (watcher);
 	if (s)
-		g_string_append (str, s);
+		nm_utils_escaped_tokens_escape_gstr (s, ESCAPED_TOKENS_DELIMITERS, str);
 }
 
 static gboolean
@@ -3792,7 +3706,7 @@ _objlist_set_fcn_team_link_watchers (NMSetting *setting,
 {
 	nm_auto_unref_team_link_watcher NMTeamLinkWatcher *watcher = NULL;
 
-	watcher = _parse_team_link_watcher (value, error);
+	watcher = nm_utils_team_link_watcher_from_string (value, error);
 	if (!watcher)
 		return FALSE;
 	if (NM_IS_SETTING_TEAM (setting)) {
@@ -4412,7 +4326,7 @@ static const NMMetaPropertyType _pt_gobject_mtu = {
 };
 
 static const NMMetaPropertyType _pt_gobject_bytes = {
-	.get_fcn =                     _get_fcn_gobject_bytes,
+	.get_fcn =                     _get_fcn_gobject,
 	.set_fcn =                     _set_fcn_gobject_bytes,
 };
 
@@ -4457,6 +4371,7 @@ static const NMMetaPropertyType _pt_dcb = {
 static const NMMetaPropertyType _pt_cert_8021x = {
 	.get_fcn =                      _get_fcn_cert_8021x,
 	.set_fcn =                      _set_fcn_cert_8021x,
+	.complete_fcn =                 _complete_fcn_cert_8021x,
 };
 
 static const NMMetaPropertyType _pt_ethtool = {
@@ -4466,7 +4381,7 @@ static const NMMetaPropertyType _pt_ethtool = {
 };
 
 static const NMMetaPropertyType _pt_multilist = {
-	.get_fcn =                      _get_fcn_gobject,
+	.get_fcn =                      _get_fcn_multilist,
 	.set_fcn =                      _set_fcn_multilist,
 	.set_supports_remove =          TRUE,
 };
@@ -4485,6 +4400,7 @@ static const NMMetaPropertyType _pt_objlist = {
 #define MULTILIST_REMOVE_BY_IDX_FCN_S(type, func)   (((func) == ((void     (*) (type *, int         )) (func))) ? ((void     (*) (NMSetting *, int         )) (func)) : NULL)
 #define MULTILIST_REMOVE_BY_IDX_FCN_U(type, func)   (((func) == ((void     (*) (type *, guint       )) (func))) ? ((void     (*) (NMSetting *, guint       )) (func)) : NULL)
 #define MULTILIST_REMOVE_BY_VALUE_FCN(type, func)   (((func) == ((gboolean (*) (type *, const char *)) (func))) ? ((gboolean (*) (NMSetting *, const char *)) (func)) : NULL)
+#define MULTILIST_CLEAR_EMPTYUNSET_FCN(type, func)  (((func) == ((void     (*) (type *, gboolean    )) (func))) ? ((void     (*) (NMSetting *, gboolean    )) (func)) : NULL)
 
 #define OBJLIST_GET_NUM_FCN(type, func)             (((func) == ((guint    (*) (type *              )) (func))) ? ((guint    (*) (NMSetting *              )) (func)) : NULL)
 #define OBJLIST_CLEAR_ALL_FCN(type, func)           (((func) == ((void     (*) (type *              )) (func))) ? ((void     (*) (NMSetting *              )) (func)) : NULL)
@@ -5270,6 +5186,9 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
 			),
 		),
 	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT,
+		.property_type =                &_pt_gobject_int,
+	),
 	NULL
 };
 
@@ -5595,6 +5514,7 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = {
 				.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,
@@ -5761,7 +5681,8 @@ static const NMMetaPropertyInfo *const property_infos_IP6_CONFIG[] = {
 			                                          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_SHARED,
+			                                          NM_SETTING_IP6_CONFIG_METHOD_DISABLED),
 		),
 	),
 	PROPERTY_INFO (NM_SETTING_IP_CONFIG_DNS, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS,
@@ -5807,6 +5728,7 @@ static const NMMetaPropertyInfo *const property_infos_IP6_CONFIG[] = {
 				.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,
@@ -6201,6 +6123,21 @@ static const NMMetaPropertyInfo *const property_infos_OVS_BRIDGE[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_OVS_BRIDGE_STP_ENABLE,
 		.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"),
+		),
+	),
+	NULL
+};
+
+#undef  _CURRENT_NM_META_SETTING_TYPE
+#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,
+	),
 	NULL
 };
 
@@ -6210,7 +6147,7 @@ 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", "patch"),
+			.values_static =            NM_MAKE_STRV ("internal", "system", "patch", "dpdk"),
 		),
 	),
 	NULL
@@ -6524,6 +6461,10 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
 		.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",
 				},
@@ -6535,6 +6476,10 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
 		.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",
 				},
@@ -6546,6 +6491,10 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
 		.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",
 				},
@@ -6557,6 +6506,10 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
 		.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",
 				},
@@ -6587,7 +6540,6 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
 		.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),
-				.clear_all_fcn =        _multilist_clear_all_fcn_team_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),
@@ -6608,6 +6560,10 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
 		.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",
 				},
@@ -6625,6 +6581,10 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
 		.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",
 				},
@@ -6636,7 +6596,11 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
 			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value.i64 = 0,
+					.value.i64 = -1,
+					.nick = "unset",
+				},
+				{
+					.value.i64 = 1,
 					.nick = "default",
 				},
 			),
@@ -6658,11 +6622,9 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
 		.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),
-				.clear_all_fcn =        _objlist_clear_all_fcn_team_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),
-				.strsplit_plain =       TRUE,
 			),
 		),
 	),
@@ -6687,7 +6649,11 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = {
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
 			.value_infos =              INT_VALUE_INFOS (
 				{
-					.value.i64 = NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT,
+					.value.i64 = -1,
+					.nick = "unset",
+				},
+				{
+					.value.i64 = 0,
 					.nick = "default",
 				},
 			),
@@ -6699,6 +6665,10 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = {
 			.value_infos =              INT_VALUE_INFOS (
 				{
 					.value.i64 = 0,
+					.nick = "unset",
+				},
+				{
+					.value.i64 = 0,
 					.nick = "default",
 				},
 			),
@@ -6712,6 +6682,10 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = {
 		.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",
 				},
@@ -6723,6 +6697,10 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = {
 		.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",
 				},
@@ -6735,11 +6713,9 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = {
 		.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),
-				.clear_all_fcn =        _objlist_clear_all_fcn_team_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),
-				.strsplit_plain =       TRUE,
 			),
 		),
 	),
@@ -7161,6 +7137,12 @@ static const NMMetaPropertyInfo *const property_infos_WIREGUARD[] = {
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_MTU,
 		.property_type =                &_pt_gobject_mtu,
 	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_IP4_AUTO_DEFAULT_ROUTE,
+		.property_type =                &_pt_gobject_enum,
+	),
+	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIREGUARD_IP6_AUTO_DEFAULT_ROUTE,
+		.property_type =                &_pt_gobject_enum,
+	),
 	NULL
 };
 
@@ -7186,7 +7168,8 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS[] = {
 		.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_AP,
+			                                          NM_SETTING_WIRELESS_MODE_MESH),
 		),
 	),
 	PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_BAND,
@@ -7657,6 +7640,7 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN)
 #define SETTING_PRETTY_NAME_MATCH               N_("Match")
 #define SETTING_PRETTY_NAME_OLPC_MESH           N_("OLPC Mesh connection")
 #define SETTING_PRETTY_NAME_OVS_BRIDGE          N_("Open vSwitch bridge settings")
+#define SETTING_PRETTY_NAME_OVS_DPDK            N_("Open vSwitch DPDK interface settings")
 #define SETTING_PRETTY_NAME_OVS_INTERFACE       N_("Open vSwitch interface settings")
 #define SETTING_PRETTY_NAME_OVS_PATCH           N_("Open vSwitch patch interface settings")
 #define SETTING_PRETTY_NAME_OVS_PORT            N_("Open vSwitch port settings")
@@ -7837,10 +7821,12 @@ const NMMetaSettingInfoEditor nm_meta_setting_infos_editor[] = {
 			NM_META_SETTING_VALID_PART_ITEM (OVS_BRIDGE,            TRUE),
 		),
 	),
+	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),
@@ -8150,6 +8136,7 @@ _meta_type_property_info_complete_fcn (const NMMetaAbstractInfo *abstract_info,
                                        gpointer environment_user_data,
                                        const NMMetaOperationContext *operation_context,
                                        const char *text,
+                                       gboolean *out_complete_filename,
                                        char ***out_to_free)
 {
 	const NMMetaPropertyInfo *info = (const NMMetaPropertyInfo *) abstract_info;
@@ -8162,6 +8149,7 @@ _meta_type_property_info_complete_fcn (const NMMetaAbstractInfo *abstract_info,
 		                                          environment_user_data,
 		                                          operation_context,
 		                                          text,
+		                                          out_complete_filename,
 		                                          out_to_free);
 	}
 
diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h
index b69a07b5..27ae4254 100644
--- a/clients/common/nm-meta-setting-desc.h
+++ b/clients/common/nm-meta-setting-desc.h
@@ -62,7 +62,8 @@ struct _NMDevice;
 #define NM_META_TEXT_WORD_INFRA  "infrastructure"
 #define NM_META_TEXT_WORD_AP     "ap"
 #define NM_META_TEXT_WORD_ADHOC  "adhoc"
-#define NM_META_TEXT_PROMPT_WIFI_MODE_CHOICES "(" NM_META_TEXT_WORD_INFRA "/" NM_META_TEXT_WORD_AP "/" NM_META_TEXT_WORD_ADHOC ") [" NM_META_TEXT_WORD_INFRA "]"
+#define NM_META_TEXT_WORD_MESH   "mesh"
+#define NM_META_TEXT_PROMPT_WIFI_MODE_CHOICES "(" NM_META_TEXT_WORD_INFRA "/" NM_META_TEXT_WORD_AP "/" NM_META_TEXT_WORD_ADHOC "/" NM_META_TEXT_WORD_MESH ") [" NM_META_TEXT_WORD_INFRA "]"
 
 #define NM_META_TEXT_PROMPT_TUN_MODE N_("Tun mode")
 #define NM_META_TEXT_WORD_TUN  "tun"
@@ -221,6 +222,7 @@ struct _NMMetaPropertyType {
 	                                   gpointer environment_user_data,
 	                                   const NMMetaOperationContext *operation_context,
 	                                   const char *text,
+	                                   gboolean *out_complete_filename,
 	                                   char ***out_to_free);
 
 	/* Whether set_fcn() supports the '-' modifier. That is, whether the property
@@ -270,6 +272,13 @@ struct _NMMetaPropertyTypData {
 			guint32 (*get_num_fcn_u32) (NMSetting *setting);
 			guint (*get_num_fcn_u) (NMSetting *setting);
 			void (*clear_all_fcn) (NMSetting *setting);
+
+			/* some multilist properties distinguish between an empty list and
+			 * and unset. If this function pointer is set, certain behaviors come
+			 * into action to handle that. */
+			void (*clear_emptyunset_fcn) (NMSetting *setting,
+			                              gboolean is_set /* or else set default */);
+
 			gboolean (*add_fcn) (NMSetting *setting,
 			                     const char *item);
 			void (*add2_fcn) (NMSetting *setting,
@@ -444,6 +453,7 @@ struct _NMMetaType {
 	                                   gpointer environment_user_data,
 	                                   const NMMetaOperationContext *operation_context,
 	                                   const char *text,
+	                                   gboolean *out_complete_filename,
 	                                   char ***out_to_free);
 };
 
diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c
index 7367459d..139bb35a 100644
--- a/clients/common/nm-polkit-listener.c
+++ b/clients/common/nm-polkit-listener.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/common/nm-polkit-listener.h b/clients/common/nm-polkit-listener.h
index ee86104b..63939053 100644
--- a/clients/common/nm-polkit-listener.h
+++ b/clients/common/nm-polkit-listener.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c
index f3a398d7..52059f95 100644
--- a/clients/common/nm-secret-agent-simple.c
+++ b/clients/common/nm-secret-agent-simple.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/common/nm-secret-agent-simple.h b/clients/common/nm-secret-agent-simple.h
index 4a666d17..650b9713 100644
--- a/clients/common/nm-secret-agent-simple.h
+++ b/clients/common/nm-secret-agent-simple.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
index 081d6056..204b7c28 100644
--- a/clients/common/nm-vpn-helpers.c
+++ b/clients/common/nm-vpn-helpers.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -737,7 +736,7 @@ fail_invalid_secret:
 	}
 
 	for (is_v4 = 0; is_v4 < 2; is_v4++) {
-		const char *method_disabled = is_v4 ? NM_SETTING_IP4_CONFIG_METHOD_DISABLED : NM_SETTING_IP6_CONFIG_METHOD_IGNORE;
+		const char *method_disabled = is_v4 ? NM_SETTING_IP4_CONFIG_METHOD_DISABLED : NM_SETTING_IP6_CONFIG_METHOD_DISABLED;
 		const char *method_manual   = is_v4 ? NM_SETTING_IP4_CONFIG_METHOD_MANUAL   : NM_SETTING_IP6_CONFIG_METHOD_MANUAL;
 		NMSettingIPConfig *s_ip     = is_v4 ? s_ip4                                 : s_ip6;
 		GPtrArray *data_dns         = is_v4 ? data_dns_v4                           : data_dns_v6;
diff --git a/clients/common/nm-vpn-helpers.h b/clients/common/nm-vpn-helpers.h
index 686687ba..90017534 100644
--- a/clients/common/nm-vpn-helpers.h
+++ b/clients/common/nm-vpn-helpers.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/common/settings-docs.h b/clients/common/settings-docs.h
index 811f2f16..78908305 100644
--- a/clients/common/settings-docs.h
+++ b/clients/common/settings-docs.h
@@ -13,7 +13,7 @@
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_MAC_ADDRESS N_("If specified, this connection will only apply to the Wi-Fi device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST N_("A list of permanent MAC addresses of Wi-Fi devices to which this connection should never apply.  Each MAC address should be given in the standard hex-digits-and-colons notation (eg \"00:11:22:33:44:55\").")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION N_("One of NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) (never randomize unless the user has set a global default to randomize and the supplicant supports randomization),  NM_SETTING_MAC_RANDOMIZATION_NEVER (1) (never randomize the MAC address), or NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2) (always randomize the MAC address). This property is deprecated for 'cloned-mac-address'. Deprecated: 1")
-#define DESCRIBE_DOC_NM_SETTING_WIRELESS_MODE N_("Wi-Fi network mode; one of \"infrastructure\", \"adhoc\" or \"ap\".  If blank, infrastructure is assumed.")
+#define DESCRIBE_DOC_NM_SETTING_WIRELESS_MODE N_("Wi-Fi network mode; one of \"infrastructure\", \"mesh\", \"adhoc\" or \"ap\".  If blank, infrastructure is assumed.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_MTU N_("If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_POWERSAVE N_("One of NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (disable Wi-Fi power saving), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (enable Wi-Fi power saving), NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1) (don't touch currently configure setting) or NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (use the globally configured value). All other values are reserved.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_RATE N_("If non-zero, directs the device to only use the specified bitrate for communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/s.  This property is highly driver dependent and not all devices support setting a static bitrate.")
@@ -152,6 +152,7 @@
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TIMESTAMP N_("The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TYPE N_("Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, \"802-3-ethernet\" or \"802-11-wireless\" or \"bluetooth\", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, \"vpn\" or \"bridge\", etc).")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_UUID N_("A universally unique identifier for the connection, for example generated with libuuid.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the \"id\" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or \"type\" property changes. The UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, contains only hexadecimal characters and \"-\").")
+#define DESCRIBE_DOC_NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT N_("Timeout in milliseconds to wait for device at startup. During boot, devices may take a while to be detected by the driver. This property will cause to delay NetworkManager-wait-online.service and nm-online to give the device a chance to appear. Note that this property only works together with NMSettingConnection:interface-name to identify the device that will be waited for. The value 0 means no wait time. The default value is -1, which currently has the same meaning as no wait time.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_ZONE N_("The trust level of a the connection.  Free form case-insensitive string (for example \"Home\", \"Work\", \"Public\").  NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall. When updating this property on a currently activated connection, the change takes effect immediately.")
 #define DESCRIBE_DOC_NM_SETTING_DCB_APP_FCOE_FLAGS N_("Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).")
 #define DESCRIBE_DOC_NM_SETTING_DCB_APP_FCOE_MODE N_("The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\".")
@@ -208,13 +209,13 @@
 #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.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_SEARCH N_("Array of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \"dns\" and \"dns-search\" properties, if any, are used.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured routes are ignored and only routes specified in the \"routes\" property, if any, are used.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_MAY_FAIL N_("If TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_METHOD N_("IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support \"auto\", \"manual\", and \"link-local\". See the subclass-specific documentation for other values. In general, for the \"auto\" method, properties such as \"dns\" and \"routes\" specify information that is added on to the information returned from automatic configuration.  The \"ignore-auto-routes\" and \"ignore-auto-dns\" properties modify this behavior. For methods that imply no upstream network, such as \"shared\" or \"link-local\", these properties must be empty. For IPv4 method \"shared\", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_METHOD N_("IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support \"disabled\", \"auto\", \"manual\", and \"link-local\". See the subclass-specific documentation for other values. In general, for the \"auto\" method, properties such as \"dns\" and \"routes\" specify information that is added on to the information returned from automatic configuration.  The \"ignore-auto-routes\" and \"ignore-auto-dns\" properties modify this behavior. For methods that imply no upstream network, such as \"shared\" or \"link-local\", these properties must be empty. For IPv4 method \"shared\", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_NEVER_DEFAULT N_("If TRUE, this connection will never be the default connection for this IP type, meaning it will never be assigned the default route by NetworkManager.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ROUTE_METRIC N_("The default metric for routes that don't explicitly specify a metric. The default value -1 means that the metric is chosen automatically based on the device type. The metric applies to dynamic routes, manual (static) routes that don't have an explicit metric setting, address prefix routes, and the default route. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default). Hence, setting this property to zero effectively mean setting it to 1024. For IPv4, zero is a regular value for the metric.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ROUTE_TABLE N_("Enable policy routing (source routing) and set the routing table used when adding routes. This affects all routes, including device-routes, IPv4LL, DHCP, SLAAC, default-routes and static routes. But note that static routes can individually overwrite the setting by explicitly specifying a non-zero routing table. If the table setting is left at zero, it is eligible to be overwritten via global configuration. If the property is zero even after applying the global configuration value, policy routing is disabled for the address family of this connection. Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager.")
@@ -228,14 +229,14 @@
 #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.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.")
-#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_SEARCH N_("Array of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \"dns\" and \"dns-search\" properties, if any, are used.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured routes are ignored and only routes specified in the \"routes\" property, if any, are used.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_IP6_PRIVACY N_("Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI-64.  This enhances privacy, but could cause problems in some applications, on the other hand.  The permitted values are: -1: unknown, 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses). Having a per-connection setting set to \"-1\" (unknown) means fallback to global configuration \"ipv6.ip6-privacy\". If also global configuration is unspecified or set to \"-1\", fallback to read \"/proc/sys/net/ipv6/conf/default/use_tempaddr\". Note that this setting is distinct from the Stable Privacy addresses that can be enabled with the \"addr-gen-mode\" property's \"stable-privacy\" setting as another way of avoiding host tracking with IPv6 addresses.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_MAY_FAIL N_("If TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.")
-#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_METHOD N_("IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support \"auto\", \"manual\", and \"link-local\". See the subclass-specific documentation for other values. In general, for the \"auto\" method, properties such as \"dns\" and \"routes\" specify information that is added on to the information returned from automatic configuration.  The \"ignore-auto-routes\" and \"ignore-auto-dns\" properties modify this behavior. For methods that imply no upstream network, such as \"shared\" or \"link-local\", these properties must be empty. For IPv4 method \"shared\", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_METHOD N_("IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support \"disabled\", \"auto\", \"manual\", and \"link-local\". See the subclass-specific documentation for other values. In general, for the \"auto\" method, properties such as \"dns\" and \"routes\" specify information that is added on to the information returned from automatic configuration.  The \"ignore-auto-routes\" and \"ignore-auto-dns\" properties modify this behavior. For methods that imply no upstream network, such as \"shared\" or \"link-local\", these properties must be empty. For IPv4 method \"shared\", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_NEVER_DEFAULT N_("If TRUE, this connection will never be the default connection for this IP type, meaning it will never be assigned the default route by NetworkManager.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ROUTE_METRIC N_("The default metric for routes that don't explicitly specify a metric. The default value -1 means that the metric is chosen automatically based on the device type. The metric applies to dynamic routes, manual (static) routes that don't have an explicit metric setting, address prefix routes, and the default route. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default). Hence, setting this property to zero effectively mean setting it to 1024. For IPv4, zero is a regular value for the metric.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ROUTE_TABLE N_("Enable policy routing (source routing) and set the routing table used when adding routes. This affects all routes, including device-routes, IPv4LL, DHCP, SLAAC, default-routes and static routes. But note that static routes can individually overwrite the setting by explicitly specifying a non-zero routing table. If the table setting is left at zero, it is eligible to be overwritten via global configuration. If the property is zero even after applying the global configuration value, policy routing is disabled for the address family of this connection. Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager.")
@@ -255,11 +256,13 @@
 #define DESCRIBE_DOC_NM_SETTING_MACVLAN_PROMISCUOUS N_("Whether the interface should be put in promiscuous mode.")
 #define DESCRIBE_DOC_NM_SETTING_MACVLAN_TAP N_("Whether the interface should be a MACVTAP.")
 #define DESCRIBE_DOC_NM_SETTING_MATCH_INTERFACE_NAME N_("A list of interface names to match. Each element is a shell wildcard pattern.  When an element is prefixed with exclamation mark (!) the condition is inverted. A candidate interface name is considered matching when both these conditions are satisfied: (a) any of the elements not prefixed with '!' matches or there aren't such elements; (b) none of the elements prefixed with '!' match.")
+#define DESCRIBE_DOC_NM_SETTING_OVS_BRIDGE_DATAPATH_TYPE N_("The data path type. One of \"system\", \"netdev\" or empty.")
 #define DESCRIBE_DOC_NM_SETTING_OVS_BRIDGE_FAIL_MODE N_("The bridge failure mode. One of \"secure\", \"standalone\" or empty.")
 #define DESCRIBE_DOC_NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE N_("Enable or disable multicast snooping.")
 #define DESCRIBE_DOC_NM_SETTING_OVS_BRIDGE_RSTP_ENABLE N_("Enable or disable RSTP.")
 #define DESCRIBE_DOC_NM_SETTING_OVS_BRIDGE_STP_ENABLE N_("Enable or disable STP.")
-#define DESCRIBE_DOC_NM_SETTING_OVS_INTERFACE_TYPE N_("The interface type. Either \"internal\", or empty.")
+#define DESCRIBE_DOC_NM_SETTING_OVS_DPDK_DEVARGS N_("Open vSwitch DPDK device arguments.")
+#define DESCRIBE_DOC_NM_SETTING_OVS_INTERFACE_TYPE N_("The interface type. Either \"internal\", \"system\", \"patch\", \"dpdk\", or empty.")
 #define DESCRIBE_DOC_NM_SETTING_OVS_PATCH_PEER N_("Specifies the unicast destination IP address of a remote Open vSwitch bridge port to connect to.")
 #define DESCRIBE_DOC_NM_SETTING_OVS_PORT_BOND_DOWNDELAY N_("The time port must be inactive in order to be considered down.")
 #define DESCRIBE_DOC_NM_SETTING_OVS_PORT_BOND_MODE N_("Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\".")
@@ -310,7 +313,7 @@
 #define DESCRIBE_DOC_NM_SETTING_TEAM_MCAST_REJOIN_INTERVAL N_("Corresponds to the teamd mcast_rejoin.interval.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_NOTIFY_PEERS_COUNT N_("Corresponds to the teamd notify_peers.count.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_NOTIFY_PEERS_INTERVAL N_("Corresponds to the teamd notify_peers.interval.")
-#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER N_("Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\". When setting the runner, all the properties specific to the runner will be reset to the default value; all the properties specific to other runners will be set to an empty value (or if not possible to a default value).")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER N_("Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\".")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_ACTIVE N_("Corresponds to the teamd runner.active.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY N_("Corresponds to the teamd runner.agg_select_policy.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_FAST_RATE N_("Corresponds to the teamd runner.fast_rate.")
@@ -366,7 +369,9 @@
 #define DESCRIBE_DOC_NM_SETTING_WIFI_P2P_WPS_METHOD N_("Flags indicating which mode of WPS is to be used. There's little point in changing the default setting as NetworkManager will automatically determine the best method to use.")
 #define DESCRIBE_DOC_NM_SETTING_WIMAX_MAC_ADDRESS N_("If specified, this connection will only apply to the WiMAX device whose MAC address matches. This property does not change the MAC address of the device (known as MAC spoofing). Deprecated: 1")
 #define DESCRIBE_DOC_NM_SETTING_WIMAX_NETWORK_NAME N_("Network Service Provider (NSP) name of the WiMAX network this connection should use. Deprecated: 1")
-#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_FWMARK N_("The use of fwmark is optional and is by default off. Setting it to 0 disables it. Otherwise it is a 32-bit fwmark for outgoing packets.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_FWMARK N_("The use of fwmark is optional and is by default off. Setting it to 0 disables it. Otherwise it is a 32-bit fwmark for outgoing packets. Note that \"ip4-auto-default-route\" or \"ip6-auto-default-route\" enabled, implies to automatically choose a fwmark.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_IP4_AUTO_DEFAULT_ROUTE N_("Whether to enable special handling of the IPv4 default route. If enabled, the IPv4 default route will be placed to a dedicated routing-table and two policy routing rules will be added. The fwmark number is also used as routing-table for the default-route, and if fwmark is zero, a unused fwmark/table is chosen automatically. This corresponds to what wg-quick does with Table=auto. Leaving this at the default will enable this option automatically if ipv4.never-default is not set and there are any peers that use a default-route as allowed-ips.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_IP6_AUTO_DEFAULT_ROUTE N_("Like ip4-auto-default-route, but for the IPv6 default route.")
 #define DESCRIBE_DOC_NM_SETTING_WIREGUARD_LISTEN_PORT N_("The listen-port. If listen-port is not specified, the port will be chosen randomly when the interface comes up.")
 #define DESCRIBE_DOC_NM_SETTING_WIREGUARD_MTU N_("If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments. If zero a default MTU is used. Note that contrary to wg-quick's MTU setting, this does not take into account the current routes at the time of activation.")
 #define DESCRIBE_DOC_NM_SETTING_WIREGUARD_PEER_ROUTES N_("Whether to automatically add routes for the AllowedIPs ranges of the peers. If TRUE (the default), NetworkManager will automatically add routes in the routing tables according to ipv4.route-table and ipv6.route-table. If FALSE, no such routes are added automatically. In this case, the user may want to configure static routes in ipv4.routes and ipv6.routes, respectively.")
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index 811f2f16..78908305 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -13,7 +13,7 @@
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_MAC_ADDRESS N_("If specified, this connection will only apply to the Wi-Fi device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST N_("A list of permanent MAC addresses of Wi-Fi devices to which this connection should never apply.  Each MAC address should be given in the standard hex-digits-and-colons notation (eg \"00:11:22:33:44:55\").")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION N_("One of NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) (never randomize unless the user has set a global default to randomize and the supplicant supports randomization),  NM_SETTING_MAC_RANDOMIZATION_NEVER (1) (never randomize the MAC address), or NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2) (always randomize the MAC address). This property is deprecated for 'cloned-mac-address'. Deprecated: 1")
-#define DESCRIBE_DOC_NM_SETTING_WIRELESS_MODE N_("Wi-Fi network mode; one of \"infrastructure\", \"adhoc\" or \"ap\".  If blank, infrastructure is assumed.")
+#define DESCRIBE_DOC_NM_SETTING_WIRELESS_MODE N_("Wi-Fi network mode; one of \"infrastructure\", \"mesh\", \"adhoc\" or \"ap\".  If blank, infrastructure is assumed.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_MTU N_("If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_POWERSAVE N_("One of NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (disable Wi-Fi power saving), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (enable Wi-Fi power saving), NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1) (don't touch currently configure setting) or NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (use the globally configured value). All other values are reserved.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_RATE N_("If non-zero, directs the device to only use the specified bitrate for communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/s.  This property is highly driver dependent and not all devices support setting a static bitrate.")
@@ -152,6 +152,7 @@
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TIMESTAMP N_("The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TYPE N_("Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, \"802-3-ethernet\" or \"802-11-wireless\" or \"bluetooth\", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, \"vpn\" or \"bridge\", etc).")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_UUID N_("A universally unique identifier for the connection, for example generated with libuuid.  It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the \"id\" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or \"type\" property changes. The UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, contains only hexadecimal characters and \"-\").")
+#define DESCRIBE_DOC_NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT N_("Timeout in milliseconds to wait for device at startup. During boot, devices may take a while to be detected by the driver. This property will cause to delay NetworkManager-wait-online.service and nm-online to give the device a chance to appear. Note that this property only works together with NMSettingConnection:interface-name to identify the device that will be waited for. The value 0 means no wait time. The default value is -1, which currently has the same meaning as no wait time.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_ZONE N_("The trust level of a the connection.  Free form case-insensitive string (for example \"Home\", \"Work\", \"Public\").  NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall. When updating this property on a currently activated connection, the change takes effect immediately.")
 #define DESCRIBE_DOC_NM_SETTING_DCB_APP_FCOE_FLAGS N_("Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).")
 #define DESCRIBE_DOC_NM_SETTING_DCB_APP_FCOE_MODE N_("The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\".")
@@ -208,13 +209,13 @@
 #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.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DNS_SEARCH N_("Array of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \"dns\" and \"dns-search\" properties, if any, are used.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured routes are ignored and only routes specified in the \"routes\" property, if any, are used.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_MAY_FAIL N_("If TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_METHOD N_("IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support \"auto\", \"manual\", and \"link-local\". See the subclass-specific documentation for other values. In general, for the \"auto\" method, properties such as \"dns\" and \"routes\" specify information that is added on to the information returned from automatic configuration.  The \"ignore-auto-routes\" and \"ignore-auto-dns\" properties modify this behavior. For methods that imply no upstream network, such as \"shared\" or \"link-local\", these properties must be empty. For IPv4 method \"shared\", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_METHOD N_("IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support \"disabled\", \"auto\", \"manual\", and \"link-local\". See the subclass-specific documentation for other values. In general, for the \"auto\" method, properties such as \"dns\" and \"routes\" specify information that is added on to the information returned from automatic configuration.  The \"ignore-auto-routes\" and \"ignore-auto-dns\" properties modify this behavior. For methods that imply no upstream network, such as \"shared\" or \"link-local\", these properties must be empty. For IPv4 method \"shared\", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_NEVER_DEFAULT N_("If TRUE, this connection will never be the default connection for this IP type, meaning it will never be assigned the default route by NetworkManager.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ROUTE_METRIC N_("The default metric for routes that don't explicitly specify a metric. The default value -1 means that the metric is chosen automatically based on the device type. The metric applies to dynamic routes, manual (static) routes that don't have an explicit metric setting, address prefix routes, and the default route. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default). Hence, setting this property to zero effectively mean setting it to 1024. For IPv4, zero is a regular value for the metric.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ROUTE_TABLE N_("Enable policy routing (source routing) and set the routing table used when adding routes. This affects all routes, including device-routes, IPv4LL, DHCP, SLAAC, default-routes and static routes. But note that static routes can individually overwrite the setting by explicitly specifying a non-zero routing table. If the table setting is left at zero, it is eligible to be overwritten via global configuration. If the property is zero even after applying the global configuration value, policy routing is disabled for the address family of this connection. Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager.")
@@ -228,14 +229,14 @@
 #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.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_OPTIONS N_("Array of DNS options as described in man 5 resolv.conf. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.")
-#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports split-DNS as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_PRIORITY N_("DNS servers priority. The relative priority for DNS servers specified by this setting.  A lower value is better (higher priority). Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections.  It does not disambiguate multiple DNS servers within the same connection profile. When using dns=default, servers with higher priority will be on top of resolv.conf.  To prioritize a given server over another one within the same connection, just specify them in the desired order.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from connections with the lowest priority value will be used. When using a DNS resolver that supports Conditional Forwarding as dns=dnsmasq or dns=systemd-resolved, each connection is used to query domains in its search list.  Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually).  When multiple connections specify the same domain, the one with the highest priority (lowest numerical value) wins.  If a connection specifies a domain which is subdomain of another domain with a negative DNS priority value, the subdomain is ignored.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DNS_SEARCH N_("Array of DNS search domains. Domains starting with a tilde ('~') are considered 'routing' domains and are used only to decide the interface over which a query must be forwarded; they are not used to complete unqualified host names.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_GATEWAY N_("The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \"dns\" and \"dns-search\" properties, if any, are used.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES N_("When \"method\" is set to \"auto\" and this property to TRUE, automatically configured routes are ignored and only routes specified in the \"routes\" property, if any, are used.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_IP6_PRIVACY N_("Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI-64.  This enhances privacy, but could cause problems in some applications, on the other hand.  The permitted values are: -1: unknown, 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses). Having a per-connection setting set to \"-1\" (unknown) means fallback to global configuration \"ipv6.ip6-privacy\". If also global configuration is unspecified or set to \"-1\", fallback to read \"/proc/sys/net/ipv6/conf/default/use_tempaddr\". Note that this setting is distinct from the Stable Privacy addresses that can be enabled with the \"addr-gen-mode\" property's \"stable-privacy\" setting as another way of avoiding host tracking with IPv6 addresses.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_MAY_FAIL N_("If TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out.  Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.")
-#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_METHOD N_("IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support \"auto\", \"manual\", and \"link-local\". See the subclass-specific documentation for other values. In general, for the \"auto\" method, properties such as \"dns\" and \"routes\" specify information that is added on to the information returned from automatic configuration.  The \"ignore-auto-routes\" and \"ignore-auto-dns\" properties modify this behavior. For methods that imply no upstream network, such as \"shared\" or \"link-local\", these properties must be empty. For IPv4 method \"shared\", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_METHOD N_("IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support \"disabled\", \"auto\", \"manual\", and \"link-local\". See the subclass-specific documentation for other values. In general, for the \"auto\" method, properties such as \"dns\" and \"routes\" specify information that is added on to the information returned from automatic configuration.  The \"ignore-auto-routes\" and \"ignore-auto-dns\" properties modify this behavior. For methods that imply no upstream network, such as \"shared\" or \"link-local\", these properties must be empty. For IPv4 method \"shared\", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_NEVER_DEFAULT N_("If TRUE, this connection will never be the default connection for this IP type, meaning it will never be assigned the default route by NetworkManager.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ROUTE_METRIC N_("The default metric for routes that don't explicitly specify a metric. The default value -1 means that the metric is chosen automatically based on the device type. The metric applies to dynamic routes, manual (static) routes that don't have an explicit metric setting, address prefix routes, and the default route. Note that for IPv6, the kernel accepts zero (0) but coerces it to 1024 (user default). Hence, setting this property to zero effectively mean setting it to 1024. For IPv4, zero is a regular value for the metric.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ROUTE_TABLE N_("Enable policy routing (source routing) and set the routing table used when adding routes. This affects all routes, including device-routes, IPv4LL, DHCP, SLAAC, default-routes and static routes. But note that static routes can individually overwrite the setting by explicitly specifying a non-zero routing table. If the table setting is left at zero, it is eligible to be overwritten via global configuration. If the property is zero even after applying the global configuration value, policy routing is disabled for the address family of this connection. Policy routing disabled means that NetworkManager will add all routes to the main table (except static routes that explicitly configure a different table). Additionally, NetworkManager will not delete any extraneous routes from tables except the main table. This is to preserve backward compatibility for users who manage routing tables outside of NetworkManager.")
@@ -255,11 +256,13 @@
 #define DESCRIBE_DOC_NM_SETTING_MACVLAN_PROMISCUOUS N_("Whether the interface should be put in promiscuous mode.")
 #define DESCRIBE_DOC_NM_SETTING_MACVLAN_TAP N_("Whether the interface should be a MACVTAP.")
 #define DESCRIBE_DOC_NM_SETTING_MATCH_INTERFACE_NAME N_("A list of interface names to match. Each element is a shell wildcard pattern.  When an element is prefixed with exclamation mark (!) the condition is inverted. A candidate interface name is considered matching when both these conditions are satisfied: (a) any of the elements not prefixed with '!' matches or there aren't such elements; (b) none of the elements prefixed with '!' match.")
+#define DESCRIBE_DOC_NM_SETTING_OVS_BRIDGE_DATAPATH_TYPE N_("The data path type. One of \"system\", \"netdev\" or empty.")
 #define DESCRIBE_DOC_NM_SETTING_OVS_BRIDGE_FAIL_MODE N_("The bridge failure mode. One of \"secure\", \"standalone\" or empty.")
 #define DESCRIBE_DOC_NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE N_("Enable or disable multicast snooping.")
 #define DESCRIBE_DOC_NM_SETTING_OVS_BRIDGE_RSTP_ENABLE N_("Enable or disable RSTP.")
 #define DESCRIBE_DOC_NM_SETTING_OVS_BRIDGE_STP_ENABLE N_("Enable or disable STP.")
-#define DESCRIBE_DOC_NM_SETTING_OVS_INTERFACE_TYPE N_("The interface type. Either \"internal\", or empty.")
+#define DESCRIBE_DOC_NM_SETTING_OVS_DPDK_DEVARGS N_("Open vSwitch DPDK device arguments.")
+#define DESCRIBE_DOC_NM_SETTING_OVS_INTERFACE_TYPE N_("The interface type. Either \"internal\", \"system\", \"patch\", \"dpdk\", or empty.")
 #define DESCRIBE_DOC_NM_SETTING_OVS_PATCH_PEER N_("Specifies the unicast destination IP address of a remote Open vSwitch bridge port to connect to.")
 #define DESCRIBE_DOC_NM_SETTING_OVS_PORT_BOND_DOWNDELAY N_("The time port must be inactive in order to be considered down.")
 #define DESCRIBE_DOC_NM_SETTING_OVS_PORT_BOND_MODE N_("Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\".")
@@ -310,7 +313,7 @@
 #define DESCRIBE_DOC_NM_SETTING_TEAM_MCAST_REJOIN_INTERVAL N_("Corresponds to the teamd mcast_rejoin.interval.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_NOTIFY_PEERS_COUNT N_("Corresponds to the teamd notify_peers.count.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_NOTIFY_PEERS_INTERVAL N_("Corresponds to the teamd notify_peers.interval.")
-#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER N_("Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\". When setting the runner, all the properties specific to the runner will be reset to the default value; all the properties specific to other runners will be set to an empty value (or if not possible to a default value).")
+#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER N_("Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\", \"random\".")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_ACTIVE N_("Corresponds to the teamd runner.active.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY N_("Corresponds to the teamd runner.agg_select_policy.")
 #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_FAST_RATE N_("Corresponds to the teamd runner.fast_rate.")
@@ -366,7 +369,9 @@
 #define DESCRIBE_DOC_NM_SETTING_WIFI_P2P_WPS_METHOD N_("Flags indicating which mode of WPS is to be used. There's little point in changing the default setting as NetworkManager will automatically determine the best method to use.")
 #define DESCRIBE_DOC_NM_SETTING_WIMAX_MAC_ADDRESS N_("If specified, this connection will only apply to the WiMAX device whose MAC address matches. This property does not change the MAC address of the device (known as MAC spoofing). Deprecated: 1")
 #define DESCRIBE_DOC_NM_SETTING_WIMAX_NETWORK_NAME N_("Network Service Provider (NSP) name of the WiMAX network this connection should use. Deprecated: 1")
-#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_FWMARK N_("The use of fwmark is optional and is by default off. Setting it to 0 disables it. Otherwise it is a 32-bit fwmark for outgoing packets.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_FWMARK N_("The use of fwmark is optional and is by default off. Setting it to 0 disables it. Otherwise it is a 32-bit fwmark for outgoing packets. Note that \"ip4-auto-default-route\" or \"ip6-auto-default-route\" enabled, implies to automatically choose a fwmark.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_IP4_AUTO_DEFAULT_ROUTE N_("Whether to enable special handling of the IPv4 default route. If enabled, the IPv4 default route will be placed to a dedicated routing-table and two policy routing rules will be added. The fwmark number is also used as routing-table for the default-route, and if fwmark is zero, a unused fwmark/table is chosen automatically. This corresponds to what wg-quick does with Table=auto. Leaving this at the default will enable this option automatically if ipv4.never-default is not set and there are any peers that use a default-route as allowed-ips.")
+#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_IP6_AUTO_DEFAULT_ROUTE N_("Like ip4-auto-default-route, but for the IPv6 default route.")
 #define DESCRIBE_DOC_NM_SETTING_WIREGUARD_LISTEN_PORT N_("The listen-port. If listen-port is not specified, the port will be chosen randomly when the interface comes up.")
 #define DESCRIBE_DOC_NM_SETTING_WIREGUARD_MTU N_("If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple fragments. If zero a default MTU is used. Note that contrary to wg-quick's MTU setting, this does not take into account the current routes at the time of activation.")
 #define DESCRIBE_DOC_NM_SETTING_WIREGUARD_PEER_ROUTES N_("Whether to automatically add routes for the AllowedIPs ranges of the peers. If TRUE (the default), NetworkManager will automatically add routes in the routing tables according to ipv4.route-table and ipv6.route-table. If FALSE, no such routes are added automatically. In this case, the user may want to configure static routes in ipv4.routes and ipv6.routes, respectively.")
diff --git a/clients/common/tests/meson.build b/clients/common/tests/meson.build
index 3eb32a47..624dd89c 100644
--- a/clients/common/tests/meson.build
+++ b/clients/common/tests/meson.build
@@ -1,23 +1,43 @@
-test_unit = 'test-general'
-
-deps = [
-  libnm_dep,
-  libnmc_dep,
-  libnmc_base_dep,
-  libnm_core_dep,
-]
+test_name = 'test-clients-common'
 
 exe = executable(
-  'clients-' + test_unit,
-  test_unit + '.c',
-  dependencies: deps,
+  test_name,
+  test_name + '.c',
+  dependencies: [
+    libnm_dep,
+    libnmc_dep,
+    libnmc_base_dep,
+    libnm_core_dep,
+  ],
   c_args: clients_cflags + [
     '-DNETWORKMANAGER_COMPILATION_TEST',
   ],
 )
 
 test(
-  'clients/' + test_unit,
+  test_name,
   test_script,
   args: test_args + [exe.full_path()],
 )
+
+###############################################################################
+
+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(
+    'clients/common/tests/test-libnm-core-aux',
+    test_script,
+    args: test_args + [exe.full_path()]
+)
diff --git a/clients/common/tests/test-general.c b/clients/common/tests/test-clients-common.c
index c39901ba..75233acd 100644
--- a/clients/common/tests/test-general.c
+++ b/clients/common/tests/test-clients-common.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * 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
diff --git a/clients/common/tests/test-libnm-core-aux.c b/clients/common/tests/test-libnm-core-aux.c
new file mode 100644
index 00000000..609a688c
--- /dev/null
+++ b/clients/common/tests/test-libnm-core-aux.c
@@ -0,0 +1,250 @@
+/*
+ * 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.
+ */
+
+#include "nm-default.h"
+
+#include "nm-libnm-core-aux/nm-libnm-core-aux.h"
+#include "nm-libnm-core-intern/nm-libnm-core-utils.h"
+
+#include "nm-utils/nm-test-utils.h"
+
+/*****************************************************************************/
+
+static NMTeamLinkWatcher *
+_team_link_watcher_from_string_impl (const char *str, gsize nextra, const char *const*vextra)
+{
+	NMTeamLinkWatcher *watcher;
+	gs_free char *str1_free = NULL;
+	gs_free_error GError *error = NULL;
+	gsize i;
+
+	g_assert (str);
+
+	watcher = nm_utils_team_link_watcher_from_string (str, &error);
+	nmtst_assert_success (watcher, error);
+
+	for (i = 0; i < 1 + nextra; i++) {
+		nm_auto_unref_team_link_watcher NMTeamLinkWatcher *watcher1 = NULL;
+		const char *str1;
+
+		if (i == 0) {
+			str1_free = nm_utils_team_link_watcher_to_string (watcher);
+			g_assert (str1_free);
+			str1 = str1_free;
+			g_assert_cmpstr (str, ==, str1);
+		} else
+			str1 = vextra[i - 1];
+
+		watcher1 = nm_utils_team_link_watcher_from_string (str1, &error);
+		nmtst_assert_success (watcher1, error);
+		if (!nm_team_link_watcher_equal (watcher, watcher1)) {
+			gs_free char *ss1 = NULL;
+			gs_free char *ss2 = NULL;
+
+			g_print (">>> watcher differs: \"%s\" vs. \"%s\"",
+			         (ss1 = nm_utils_team_link_watcher_to_string (watcher)),
+			         (ss2 = nm_utils_team_link_watcher_to_string (watcher1)));
+			g_print (">>> ORIG: \"%s\" vs. \"%s\"", str, str1);
+			g_assert_not_reached ();
+		}
+		g_assert (nm_team_link_watcher_equal (watcher1, watcher));
+	}
+
+	return watcher;
+}
+#define _team_link_watcher_from_string(str, ...) \
+	_team_link_watcher_from_string_impl ((str), NM_NARG (__VA_ARGS__), NM_MAKE_STRV (__VA_ARGS__))
+
+/*****************************************************************************/
+
+static void
+test_team_link_watcher_tofro_string (void)
+{
+	nm_auto_unref_team_link_watcher NMTeamLinkWatcher *w = NULL;
+
+#define _team_link_watcher_cmp(watcher, \
+                               name, \
+                               delay_down, \
+                               delay_up, \
+                               init_wait, \
+                               interval, \
+                               missed_max, \
+                               target_host, \
+                               source_host, \
+                               vlanid, \
+                               arping_flags) \
+	G_STMT_START { \
+		nm_auto_unref_team_link_watcher NMTeamLinkWatcher *_w = g_steal_pointer (watcher); \
+		\
+		g_assert_cmpstr ((name),         ==, nm_team_link_watcher_get_name (_w)); \
+		g_assert_cmpint ((delay_down),   ==, nm_team_link_watcher_get_delay_down (_w)); \
+		g_assert_cmpint ((delay_up),     ==, nm_team_link_watcher_get_delay_up (_w)); \
+		g_assert_cmpint ((init_wait),    ==, nm_team_link_watcher_get_init_wait (_w)); \
+		g_assert_cmpint ((interval),     ==, nm_team_link_watcher_get_interval (_w)); \
+		g_assert_cmpint ((missed_max),   ==, nm_team_link_watcher_get_missed_max (_w)); \
+		g_assert_cmpstr ((target_host),  ==, nm_team_link_watcher_get_target_host (_w)); \
+		g_assert_cmpstr ((source_host),  ==, nm_team_link_watcher_get_source_host (_w)); \
+		g_assert_cmpint ((vlanid),       ==, nm_team_link_watcher_get_vlanid (_w)); \
+		g_assert_cmpint ((arping_flags), ==, nm_team_link_watcher_get_flags (_w)); \
+	} G_STMT_END
+
+	w = _team_link_watcher_from_string ("name=ethtool",
+	                                    "delay-up=0   name=ethtool",
+	                                    "  delay-down=0   name=ethtool   ");
+	_team_link_watcher_cmp (&w,
+	                        "ethtool",
+	                        0,
+	                        0,
+	                        -1,
+	                        -1,
+	                        -1,
+	                        NULL,
+	                        NULL,
+	                        -1,
+	                        NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_NONE);
+
+	w = _team_link_watcher_from_string ("name=ethtool delay-up=10",
+	                                    "   delay-down=0  delay-up=10   name=ethtool");
+	_team_link_watcher_cmp (&w,
+	                        "ethtool",
+	                        0,
+	                        10,
+	                        -1,
+	                        -1,
+	                        -1,
+	                        NULL,
+	                        NULL,
+	                        -1,
+	                        NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_NONE);
+
+	w = _team_link_watcher_from_string ("name=ethtool delay-up=10 delay-down=11",
+	                                    "   delay-down=11  delay-up=10   name=ethtool");
+	_team_link_watcher_cmp (&w,
+	                        "ethtool",
+	                        11,
+	                        10,
+	                        -1,
+	                        -1,
+	                        -1,
+	                        NULL,
+	                        NULL,
+	                        -1,
+	                        NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_NONE);
+
+	w = _team_link_watcher_from_string ("name=nsna_ping target-host=xxx",
+	                                    "name=nsna_ping target-host=xxx",
+	                                    "  missed-max=3    target-host=xxx        name=nsna_ping   ");
+	_team_link_watcher_cmp (&w,
+	                        "nsna_ping",
+	                        -1,
+	                        -1,
+	                        0,
+	                        0,
+	                        3,
+	                        "xxx",
+	                        NULL,
+	                        -1,
+	                        NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_NONE);
+
+	w = _team_link_watcher_from_string ("name=arp_ping target-host=xxx source-host=yzd",
+	                                    "  source-host=yzd target-host=xxx        name=arp_ping   ");
+	_team_link_watcher_cmp (&w,
+	                        "arp_ping",
+	                        -1,
+	                        -1,
+	                        0,
+	                        0,
+	                        3,
+	                        "xxx",
+	                        "yzd",
+	                        -1,
+	                        NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_NONE);
+
+	w = _team_link_watcher_from_string ("name=arp_ping missed-max=0 target-host=xxx vlanid=0 source-host=yzd");
+	_team_link_watcher_cmp (&w,
+	                        "arp_ping",
+	                        -1,
+	                        -1,
+	                        0,
+	                        0,
+	                        0,
+	                        "xxx",
+	                        "yzd",
+	                        0,
+	                        NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_NONE);
+
+	w = _team_link_watcher_from_string ("name=arp_ping target-host=xxx source-host=yzd validate-active=true",
+	                                    "source-host=yzd send-always=false name=arp_ping validate-active=true validate-inactive=false target-host=xxx",
+	                                    "  source-host=yzd target-host=xxx   validate-active=true      name=arp_ping   ");
+	_team_link_watcher_cmp (&w,
+	                        "arp_ping",
+	                        -1,
+	                        -1,
+	                        0,
+	                        0,
+	                        3,
+	                        "xxx",
+	                        "yzd",
+	                        -1,
+	                        NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_ACTIVE);
+
+	w = _team_link_watcher_from_string ("name=arp_ping target-host=xxx source-host=yzd validate-active=true validate-inactive=true send-always=true",
+	                                    "source-host=yzd send-always=true name=arp_ping validate-active=true validate-inactive=true target-host=xxx",
+	                                    "source-host=yzd send-always=true name=arp_ping validate-active=1 validate-inactive=yes target-host=xxx",
+	                                    "  source-host=yzd target-host=xxx   validate-inactive=true send-always=true    validate-active=true      name=arp_ping   ");
+	_team_link_watcher_cmp (&w,
+	                        "arp_ping",
+	                        -1,
+	                        -1,
+	                        0,
+	                        0,
+	                        3,
+	                        "xxx",
+	                        "yzd",
+	                        -1,
+	                          NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_ACTIVE
+	                        | NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_INACTIVE
+	                        | NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_SEND_ALWAYS);
+
+	w = _team_link_watcher_from_string ("name=arp_ping missed-max=0 target-host=xxx vlanid=0 source-host=yzd");
+	_team_link_watcher_cmp (&w,
+	                        "arp_ping",
+	                        -1,
+	                        -1,
+	                        0,
+	                        0,
+	                        0,
+	                        "xxx",
+	                        "yzd",
+	                        0,
+	                        NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_NONE);
+}
+
+/*****************************************************************************/
+
+NMTST_DEFINE ();
+
+int main (int argc, char **argv)
+{
+	nmtst_init (&argc, &argv, TRUE);
+
+	g_test_add_func ("/libnm-core-aux/test_team_link_watcher_tofro_string", test_team_link_watcher_tofro_string);
+
+	return g_test_run ();
+}
diff --git a/clients/nm-online.c b/clients/nm-online.c
index 18ca713b..9eb0b41b 100644
--- a/clients/nm-online.c
+++ b/clients/nm-online.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * 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
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 668212ab..e3d259cd 100644
--- a/clients/tests/test-client.check-on-disk/test_002.expected
+++ b/clients/tests/test-client.check-on-disk/test_002.expected
@@ -484,12 +484,12 @@ NAME   UUID                                  TYPE      DEVICE
 con-1  5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --     
 
 <<<
-size: 1224
+size: 1267
 location: clients/tests/test-client.py:874:test_002()/23
 cmd: $NMCLI c s con-1
 lang: C
 returncode: 0
-stdout: 1095 bytes
+stdout: 1138 bytes
 >>>
 connection.id:                          con-1
 connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -514,14 +514,15 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 
 <<<
-size: 1236
+size: 1279
 location: clients/tests/test-client.py:874:test_002()/24
 cmd: $NMCLI c s con-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1097 bytes
+stdout: 1140 bytes
 >>>
 connection.id:                          con-1
 connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -546,5 +547,6 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 
 <<<
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 ded1e9d7..20980164 100644
--- a/clients/tests/test-client.check-on-disk/test_003.expected
+++ b/clients/tests/test-client.check-on-disk/test_003.expected
@@ -32,9 +32,9 @@ con-1    5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --
 con-xx1  UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --     
 
 <<<
-size: 332
+size: 353
 location: clients/tests/test-client.py:893:test_003()/4
-cmd: $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
+cmd: $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 ' '
 lang: C
 returncode: 0
 stdout: 81 bytes
@@ -150,12 +150,12 @@ id
 path
 uuid
 <<<
-size: 4073
+size: 4116
 location: clients/tests/test-client.py:911:test_003()/12
 cmd: $NMCLI con s con-gsm1
 lang: C
 returncode: 0
-stdout: 3939 bytes
+stdout: 3982 bytes
 >>>
 connection.id:                          con-gsm1
 connection.uuid:                        UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -180,6 +180,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
@@ -204,7 +205,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -246,12 +247,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4102
+size: 4145
 location: clients/tests/test-client.py:911:test_003()/13
 cmd: $NMCLI con s con-gsm1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3958 bytes
+stdout: 4001 bytes
 >>>
 connection.id:                          con-gsm1
 connection.uuid:                        UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -276,6 +277,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
@@ -300,7 +302,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -474,12 +476,12 @@ UUID                                  NAME
 UUID-ethernet-REPLACED-REPLACED-REPL  ethernet 
 
 <<<
-size: 3891
+size: 3934
 location: clients/tests/test-client.py:942:test_003()/25
 cmd: $NMCLI -f ALL con s ethernet
 lang: C
 returncode: 0
-stdout: 3750 bytes
+stdout: 3793 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -504,6 +506,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -521,7 +524,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -542,7 +545,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -566,12 +569,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3919
+size: 3962
 location: clients/tests/test-client.py:942:test_003()/26
 cmd: $NMCLI -f ALL con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3768 bytes
+stdout: 3811 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -596,6 +599,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -613,7 +617,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -634,7 +638,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -678,12 +682,12 @@ stdout: 51 bytes
 GENERAL.STATE:                          aktywowano
 
 <<<
-size: 4548
+size: 4591
 location: clients/tests/test-client.py:948:test_003()/29
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
-stdout: 4414 bytes
+stdout: 4457 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -708,6 +712,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -725,7 +730,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -746,7 +751,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -782,12 +787,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4580
+size: 4623
 location: clients/tests/test-client.py:948:test_003()/30
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4436 bytes
+stdout: 4479 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -812,6 +817,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -829,7 +835,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -850,7 +856,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -1330,12 +1336,12 @@ UUID                                  NAME
 UUID-ethernet-REPLACED-REPLACED-REPL  ethernet 
 
 <<<
-size: 3891
+size: 3934
 location: clients/tests/test-client.py:942:test_003()/48
 cmd: $NMCLI -f ALL con s ethernet
 lang: C
 returncode: 0
-stdout: 3750 bytes
+stdout: 3793 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1360,6 +1366,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -1377,7 +1384,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -1398,7 +1405,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -1422,12 +1429,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3919
+size: 3962
 location: clients/tests/test-client.py:942:test_003()/49
 cmd: $NMCLI -f ALL con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3768 bytes
+stdout: 3811 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1452,6 +1459,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -1469,7 +1477,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -1490,7 +1498,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -1538,12 +1546,12 @@ GENERAL.STATE:                          aktywowano
 GENERAL.STATE:                          aktywowano
 
 <<<
-size: 5213
+size: 5256
 location: clients/tests/test-client.py:948:test_003()/52
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
-stdout: 5079 bytes
+stdout: 5122 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1568,6 +1576,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -1585,7 +1594,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -1606,7 +1615,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -1655,12 +1664,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5249
+size: 5292
 location: clients/tests/test-client.py:948:test_003()/53
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5105 bytes
+stdout: 5148 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1685,6 +1694,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -1702,7 +1712,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -1723,7 +1733,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -2134,12 +2144,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 5216
+size: 5259
 location: clients/tests/test-client.py:978:test_003()/64
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
-stdout: 5082 bytes
+stdout: 5125 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2164,6 +2174,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -2181,7 +2192,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -2202,7 +2213,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -2251,12 +2262,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5253
+size: 5296
 location: clients/tests/test-client.py:978:test_003()/65
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5109 bytes
+stdout: 5152 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2281,6 +2292,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -2298,7 +2310,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -2319,7 +2331,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -2368,12 +2380,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4591
+size: 4634
 location: clients/tests/test-client.py:981:test_003()/66
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4417 bytes
+stdout: 4460 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2398,6 +2410,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -2415,7 +2428,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -2436,7 +2449,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -2472,12 +2485,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4624
+size: 4667
 location: clients/tests/test-client.py:981:test_003()/67
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4440 bytes
+stdout: 4483 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2502,6 +2515,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -2519,7 +2533,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -2540,7 +2554,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -2766,12 +2780,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 5228
+size: 5271
 location: clients/tests/test-client.py:978:test_003()/74
 cmd: $NMCLI --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 5082 bytes
+stdout: 5125 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2796,6 +2810,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -2813,7 +2828,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -2834,7 +2849,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -2883,12 +2898,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5265
+size: 5308
 location: clients/tests/test-client.py:978:test_003()/75
 cmd: $NMCLI --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5109 bytes
+stdout: 5152 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2913,6 +2928,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -2930,7 +2946,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -2951,7 +2967,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -3000,12 +3016,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4603
+size: 4646
 location: clients/tests/test-client.py:981:test_003()/76
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4417 bytes
+stdout: 4460 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -3030,6 +3046,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -3047,7 +3064,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -3068,7 +3085,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -3104,12 +3121,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4636
+size: 4679
 location: clients/tests/test-client.py:981:test_003()/77
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4440 bytes
+stdout: 4483 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -3134,6 +3151,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -3151,7 +3169,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -3172,7 +3190,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -3414,12 +3432,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 6470
+size: 6513
 location: clients/tests/test-client.py:978:test_003()/84
 cmd: $NMCLI --pretty con s ethernet
 lang: C
 returncode: 0
-stdout: 6327 bytes
+stdout: 6370 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -3447,6 +3465,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -3466,7 +3485,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -3488,7 +3507,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -3547,12 +3566,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6526
+size: 6569
 location: clients/tests/test-client.py:978:test_003()/85
 cmd: $NMCLI --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6373 bytes
+stdout: 6416 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -3580,6 +3599,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -3599,7 +3619,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -3621,7 +3641,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -3680,12 +3700,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5532
+size: 5575
 location: clients/tests/test-client.py:981:test_003()/86
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 5349 bytes
+stdout: 5392 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -3713,6 +3733,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -3732,7 +3753,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -3754,7 +3775,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -3796,12 +3817,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5577
+size: 5620
 location: clients/tests/test-client.py:981:test_003()/87
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5384 bytes
+stdout: 5427 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -3829,6 +3850,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -3848,7 +3870,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -3870,7 +3892,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -4140,12 +4162,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 6482
+size: 6525
 location: clients/tests/test-client.py:978:test_003()/94
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 6327 bytes
+stdout: 6370 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -4173,6 +4195,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -4192,7 +4215,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -4214,7 +4237,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -4273,12 +4296,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6538
+size: 6581
 location: clients/tests/test-client.py:978:test_003()/95
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6373 bytes
+stdout: 6416 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -4306,6 +4329,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -4325,7 +4349,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -4347,7 +4371,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -4406,12 +4430,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5544
+size: 5587
 location: clients/tests/test-client.py:981:test_003()/96
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 5349 bytes
+stdout: 5392 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -4439,6 +4463,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -4458,7 +4483,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -4480,7 +4505,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -4522,12 +4547,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5589
+size: 5632
 location: clients/tests/test-client.py:981:test_003()/97
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5384 bytes
+stdout: 5427 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -4555,6 +4580,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -4574,7 +4600,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -4596,7 +4622,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -4846,12 +4872,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 2809
+size: 2841
 location: clients/tests/test-client.py:978:test_003()/104
 cmd: $NMCLI --terse con s ethernet
 lang: C
 returncode: 0
-stdout: 2666 bytes
+stdout: 2698 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -4876,6 +4902,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
 802-3-ethernet.duplex:
@@ -4893,7 +4920,7 @@ connection.llmnr:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -4914,7 +4941,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -4963,12 +4990,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2819
+size: 2851
 location: clients/tests/test-client.py:978:test_003()/105
 cmd: $NMCLI --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2666 bytes
+stdout: 2698 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -4993,6 +5020,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
 802-3-ethernet.duplex:
@@ -5010,7 +5038,7 @@ connection.llmnr:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -5031,7 +5059,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -5080,12 +5108,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2481
+size: 2513
 location: clients/tests/test-client.py:981:test_003()/106
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2298 bytes
+stdout: 2330 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5110,6 +5138,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
 802-3-ethernet.duplex:
@@ -5127,7 +5156,7 @@ connection.llmnr:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -5148,7 +5177,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -5184,12 +5213,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2491
+size: 2523
 location: clients/tests/test-client.py:981:test_003()/107
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2298 bytes
+stdout: 2330 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5214,6 +5243,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
 802-3-ethernet.duplex:
@@ -5231,7 +5261,7 @@ connection.llmnr:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -5252,7 +5282,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -5474,12 +5504,12 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 2821
+size: 2853
 location: clients/tests/test-client.py:978:test_003()/114
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 2666 bytes
+stdout: 2698 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5504,6 +5534,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
 802-3-ethernet.duplex:
@@ -5521,7 +5552,7 @@ connection.llmnr:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -5542,7 +5573,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -5591,12 +5622,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2831
+size: 2863
 location: clients/tests/test-client.py:978:test_003()/115
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2666 bytes
+stdout: 2698 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5621,6 +5652,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
 802-3-ethernet.duplex:
@@ -5638,7 +5670,7 @@ connection.llmnr:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -5659,7 +5691,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -5708,12 +5740,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2493
+size: 2525
 location: clients/tests/test-client.py:981:test_003()/116
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2298 bytes
+stdout: 2330 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5738,6 +5770,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
 802-3-ethernet.duplex:
@@ -5755,7 +5788,7 @@ connection.llmnr:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -5776,7 +5809,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -5812,12 +5845,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2503
+size: 2535
 location: clients/tests/test-client.py:981:test_003()/117
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2298 bytes
+stdout: 2330 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -5842,6 +5875,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
 802-3-ethernet.duplex:
@@ -5859,7 +5893,7 @@ connection.llmnr:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -5880,7 +5914,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -6106,24 +6140,24 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 3476
+size: 3518
 location: clients/tests/test-client.py:978:test_003()/124
 cmd: $NMCLI --mode tabular con s ethernet
 lang: C
 returncode: 0
-stdout: 3326 bytes
+stdout: 3368 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        
-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) 
+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                  
 
 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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
@@ -6137,24 +6171,24 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 
 <<<
-size: 3510
+size: 3552
 location: clients/tests/test-client.py:978:test_003()/125
 cmd: $NMCLI --mode tabular con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3350 bytes
+stdout: 3392 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        
-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) 
+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                  
 
 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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
@@ -6168,24 +6202,24 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 
 <<<
-size: 3034
+size: 3076
 location: clients/tests/test-client.py:981:test_003()/126
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2844 bytes
+stdout: 2886 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        
-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) 
+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                  
 
 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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
@@ -6195,24 +6229,24 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 
 <<<
-size: 3066
+size: 3108
 location: clients/tests/test-client.py:981:test_003()/127
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2866 bytes
+stdout: 2908 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        
-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) 
+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                  
 
 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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
@@ -6344,24 +6378,24 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 3488
+size: 3530
 location: clients/tests/test-client.py:978:test_003()/134
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 3326 bytes
+stdout: 3368 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        
-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) 
+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                  
 
 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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
@@ -6375,24 +6409,24 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 
 <<<
-size: 3522
+size: 3564
 location: clients/tests/test-client.py:978:test_003()/135
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3350 bytes
+stdout: 3392 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        
-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) 
+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                  
 
 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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
@@ -6406,24 +6440,24 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 
 <<<
-size: 3046
+size: 3088
 location: clients/tests/test-client.py:981:test_003()/136
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2844 bytes
+stdout: 2886 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        
-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) 
+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                  
 
 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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
@@ -6433,24 +6467,24 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 
 <<<
-size: 3078
+size: 3120
 location: clients/tests/test-client.py:981:test_003()/137
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2866 bytes
+stdout: 2908 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        
-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) 
+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                  
 
 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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
 
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
@@ -6598,19 +6632,19 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 5697
+size: 5760
 location: clients/tests/test-client.py:978:test_003()/144
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: C
 returncode: 0
-stdout: 5538 bytes
+stdout: 5601 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
 =========================================
-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        
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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) 
+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                  
 
 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 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -6618,11 +6652,11 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 
 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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -6645,19 +6679,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 
 <<<
-size: 5791
+size: 5854
 location: clients/tests/test-client.py:978:test_003()/145
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5622 bytes
+stdout: 5685 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
 ===========================================
-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        
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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) 
+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                  
 
 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 
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -6665,11 +6699,11 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 
 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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -6692,19 +6726,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 
 <<<
-size: 4803
+size: 4866
 location: clients/tests/test-client.py:981:test_003()/146
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4604 bytes
+stdout: 4667 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
 =========================================
-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        
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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) 
+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                  
 
 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 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -6712,11 +6746,11 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 
 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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -6731,19 +6765,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 
 <<<
-size: 4875
+size: 4938
 location: clients/tests/test-client.py:981:test_003()/147
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4666 bytes
+stdout: 4729 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
 ===========================================
-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        
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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) 
+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                  
 
 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 
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -6751,11 +6785,11 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 
 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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -6930,19 +6964,19 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 5709
+size: 5772
 location: clients/tests/test-client.py:978:test_003()/154
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 5538 bytes
+stdout: 5601 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
 =========================================
-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        
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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) 
+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                  
 
 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 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -6950,11 +6984,11 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 
 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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -6977,19 +7011,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 
 <<<
-size: 5803
+size: 5866
 location: clients/tests/test-client.py:978:test_003()/155
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5622 bytes
+stdout: 5685 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
 ===========================================
-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        
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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) 
+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                  
 
 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 
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -6997,11 +7031,11 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 
 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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -7024,19 +7058,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     dezaktywowanie
 
 
 <<<
-size: 4815
+size: 4878
 location: clients/tests/test-client.py:981:test_003()/156
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4604 bytes
+stdout: 4667 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
 =========================================
-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        
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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) 
+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                  
 
 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 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -7044,11 +7078,11 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 
 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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -7063,19 +7097,19 @@ GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     deactivating
 
 
 <<<
-size: 4887
+size: 4950
 location: clients/tests/test-client.py:981:test_003()/157
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4666 bytes
+stdout: 4729 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
 ===========================================
-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        
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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) 
+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                  
 
 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 
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -7083,11 +7117,11 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 
 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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
 
 name   method  browser-only  pac-url  pac-script 
 --------------------------------------------------
@@ -7242,66 +7276,66 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 830
+size: 831
 location: clients/tests/test-client.py:978:test_003()/164
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: C
 returncode: 0
-stdout: 673 bytes
+stdout: 674 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1
+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:::no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
 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:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 840
+size: 841
 location: clients/tests/test-client.py:978:test_003()/165
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 673 bytes
+stdout: 674 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1
+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:::no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
 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:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 683
+size: 684
 location: clients/tests/test-client.py:981:test_003()/166
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 486 bytes
+stdout: 487 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1
+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:::no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
 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::
 
 <<<
-size: 693
+size: 694
 location: clients/tests/test-client.py:981:test_003()/167
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 486 bytes
+stdout: 487 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1
+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:::no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
 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::
 
@@ -7394,66 +7428,66 @@ UUID-con-gsm1-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 842
+size: 843
 location: clients/tests/test-client.py:978:test_003()/174
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 673 bytes
+stdout: 674 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1
+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:::no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
 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:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 852
+size: 853
 location: clients/tests/test-client.py:978:test_003()/175
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 673 bytes
+stdout: 674 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1
+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:::no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
 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:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/4::
 
 <<<
-size: 695
+size: 696
 location: clients/tests/test-client.py:981:test_003()/176
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 486 bytes
+stdout: 487 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1
+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:::no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
 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::
 
 <<<
-size: 705
+size: 706
 location: clients/tests/test-client.py:981:test_003()/177
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 486 bytes
+stdout: 487 bytes
 >>>
-connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:no:::::-1::0:unknown:default:-1:-1
+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:::no:yes:-1
+ipv6:auto::::0::::-1:0::no:no:no:yes:-1:stable-privacy::yes::
 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::
 
@@ -7694,12 +7728,12 @@ UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:                                   ethernet
 
 <<<
-size: 5234
+size: 5277
 location: clients/tests/test-client.py:978:test_003()/184
 cmd: $NMCLI --mode multiline con s ethernet
 lang: C
 returncode: 0
-stdout: 5082 bytes
+stdout: 5125 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -7724,6 +7758,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -7741,7 +7776,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -7762,7 +7797,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -7811,12 +7846,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5271
+size: 5314
 location: clients/tests/test-client.py:978:test_003()/185
 cmd: $NMCLI --mode multiline con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5109 bytes
+stdout: 5152 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -7841,6 +7876,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -7858,7 +7894,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -7879,7 +7915,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -7928,12 +7964,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4609
+size: 4652
 location: clients/tests/test-client.py:981:test_003()/186
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4417 bytes
+stdout: 4460 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -7958,6 +7994,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -7975,7 +8012,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -7996,7 +8033,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -8032,12 +8069,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4642
+size: 4685
 location: clients/tests/test-client.py:981:test_003()/187
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4440 bytes
+stdout: 4483 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8062,6 +8099,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -8079,7 +8117,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -8100,7 +8138,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -8470,12 +8508,12 @@ UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:                                   ethernet
 
 <<<
-size: 5246
+size: 5289
 location: clients/tests/test-client.py:978:test_003()/194
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 5082 bytes
+stdout: 5125 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8500,6 +8538,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -8517,7 +8556,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -8538,7 +8577,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -8587,12 +8626,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 5283
+size: 5326
 location: clients/tests/test-client.py:978:test_003()/195
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5109 bytes
+stdout: 5152 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8617,6 +8656,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -8634,7 +8674,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -8655,7 +8695,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -8704,12 +8744,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4621
+size: 4664
 location: clients/tests/test-client.py:981:test_003()/196
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4417 bytes
+stdout: 4460 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8734,6 +8774,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -8751,7 +8792,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -8772,7 +8813,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -8808,12 +8849,12 @@ GENERAL.ZONE:                           --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 4654
+size: 4697
 location: clients/tests/test-client.py:981:test_003()/197
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4440 bytes
+stdout: 4483 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8838,6 +8879,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
 802-3-ethernet.duplex:                  --
@@ -8855,7 +8897,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -8876,7 +8918,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -9276,12 +9318,12 @@ TYPE:                                   ethernet
 -------------------------------------------------------------------------------
 
 <<<
-size: 6488
+size: 6531
 location: clients/tests/test-client.py:978:test_003()/204
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: C
 returncode: 0
-stdout: 6327 bytes
+stdout: 6370 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -9309,6 +9351,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -9328,7 +9371,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -9350,7 +9393,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -9409,12 +9452,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6544
+size: 6587
 location: clients/tests/test-client.py:978:test_003()/205
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6373 bytes
+stdout: 6416 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -9442,6 +9485,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -9461,7 +9505,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -9483,7 +9527,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -9542,12 +9586,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5550
+size: 5593
 location: clients/tests/test-client.py:981:test_003()/206
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 5349 bytes
+stdout: 5392 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -9575,6 +9619,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -9594,7 +9639,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -9616,7 +9661,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -9658,12 +9703,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5595
+size: 5638
 location: clients/tests/test-client.py:981:test_003()/207
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5384 bytes
+stdout: 5427 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -9691,6 +9736,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -9710,7 +9756,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -9732,7 +9778,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -10160,12 +10206,12 @@ TYPE:                                   ethernet
 -------------------------------------------------------------------------------
 
 <<<
-size: 6500
+size: 6543
 location: clients/tests/test-client.py:978:test_003()/214
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 6327 bytes
+stdout: 6370 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -10193,6 +10239,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -10212,7 +10259,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -10234,7 +10281,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -10293,12 +10340,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6556
+size: 6599
 location: clients/tests/test-client.py:978:test_003()/215
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6373 bytes
+stdout: 6416 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -10326,6 +10373,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -10345,7 +10393,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -10367,7 +10415,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -10426,12 +10474,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5562
+size: 5605
 location: clients/tests/test-client.py:981:test_003()/216
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 5349 bytes
+stdout: 5392 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -10459,6 +10507,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -10478,7 +10527,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -10500,7 +10549,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -10542,12 +10591,12 @@ GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 5607
+size: 5650
 location: clients/tests/test-client.py:981:test_003()/217
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5384 bytes
+stdout: 5427 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -10575,6 +10624,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 802-3-ethernet.port:                    --
 802-3-ethernet.speed:                   0
@@ -10594,7 +10644,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -10616,7 +10666,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -11014,12 +11064,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:802-3-ethernet
 
 <<<
-size: 2826
+size: 2858
 location: clients/tests/test-client.py:978:test_003()/224
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: C
 returncode: 0
-stdout: 2666 bytes
+stdout: 2698 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11044,6 +11094,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
 802-3-ethernet.duplex:
@@ -11061,7 +11112,7 @@ connection.llmnr:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -11082,7 +11133,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -11131,12 +11182,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2836
+size: 2868
 location: clients/tests/test-client.py:978:test_003()/225
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2666 bytes
+stdout: 2698 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11161,6 +11212,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
 802-3-ethernet.duplex:
@@ -11178,7 +11230,7 @@ connection.llmnr:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -11199,7 +11251,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -11248,12 +11300,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2498
+size: 2530
 location: clients/tests/test-client.py:981:test_003()/226
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2298 bytes
+stdout: 2330 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11278,6 +11330,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
 802-3-ethernet.duplex:
@@ -11295,7 +11348,7 @@ connection.llmnr:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -11316,7 +11369,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -11352,12 +11405,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2508
+size: 2540
 location: clients/tests/test-client.py:981:test_003()/227
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2298 bytes
+stdout: 2330 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11382,6 +11435,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
 802-3-ethernet.duplex:
@@ -11399,7 +11453,7 @@ connection.llmnr:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -11420,7 +11474,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -11790,12 +11844,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:802-3-ethernet
 
 <<<
-size: 2838
+size: 2870
 location: clients/tests/test-client.py:978:test_003()/234
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 2666 bytes
+stdout: 2698 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11820,6 +11874,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
 802-3-ethernet.duplex:
@@ -11837,7 +11892,7 @@ connection.llmnr:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -11858,7 +11913,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -11907,12 +11962,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2848
+size: 2880
 location: clients/tests/test-client.py:978:test_003()/235
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2666 bytes
+stdout: 2698 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11937,6 +11992,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
 802-3-ethernet.duplex:
@@ -11954,7 +12010,7 @@ connection.llmnr:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -11975,7 +12031,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -12024,12 +12080,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2510
+size: 2542
 location: clients/tests/test-client.py:981:test_003()/236
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 2298 bytes
+stdout: 2330 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -12054,6 +12110,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
 802-3-ethernet.duplex:
@@ -12071,7 +12128,7 @@ connection.llmnr:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -12092,7 +12149,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -12128,12 +12185,12 @@ GENERAL.ZONE:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2520
+size: 2552
 location: clients/tests/test-client.py:981:test_003()/237
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2298 bytes
+stdout: 2330 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -12158,6 +12215,7 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 802-3-ethernet.port:
 802-3-ethernet.speed:0
 802-3-ethernet.duplex:
@@ -12175,7 +12233,7 @@ connection.llmnr:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -12196,7 +12254,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.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 48f68a5b..e3746b60 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:1002: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: 4134
+size: 4177
 location: clients/tests/test-client.py:1004:test_004()/8
 cmd: $NMCLI con s con-xx1
 lang: C
 returncode: 0
-stdout: 4001 bytes
+stdout: 4044 bytes
 >>>
 connection.id:                          con-xx1
 connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -88,6 +88,7 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-11-wireless.ssid:                   foobar
 802-11-wireless.mode:                   infrastructure
 802-11-wireless.band:                   a
@@ -108,7 +109,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         192.168.77.5/24
 ipv4.gateway:                           --
@@ -129,7 +130,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         1:2:3:4::6/64
 ipv6.gateway:                           --
@@ -153,12 +154,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 4162
+size: 4205
 location: clients/tests/test-client.py:1004:test_004()/9
 cmd: $NMCLI con s con-xx1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4019 bytes
+stdout: 4062 bytes
 >>>
 connection.id:                          con-xx1
 connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -183,6 +184,7 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 802-11-wireless.ssid:                   foobar
 802-11-wireless.mode:                   infrastructure
 802-11-wireless.band:                   a
@@ -203,7 +205,7 @@ connection.llmnr:                       -1 (default)
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         192.168.77.5/24
 ipv4.gateway:                           --
@@ -224,7 +226,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         1:2:3:4::6/64
 ipv6.gateway:                           --
@@ -284,12 +286,12 @@ con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  vpn       --
 con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      --     
 
 <<<
-size: 3601
+size: 3644
 location: clients/tests/test-client.py:1016:test_004()/13
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3465 bytes
+stdout: 3508 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -314,10 +316,11 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -338,7 +341,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -368,12 +371,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3621
+size: 3664
 location: clients/tests/test-client.py:1016:test_004()/14
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3475 bytes
+stdout: 3518 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -398,10 +401,11 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -422,7 +426,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -524,12 +528,12 @@ con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      wlan0
 con-1      5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --     
 
 <<<
-size: 4683
+size: 4726
 location: clients/tests/test-client.py:1026:test_004()/21
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4547 bytes
+stdout: 4590 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -554,10 +558,11 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -578,7 +583,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -628,12 +633,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4709
+size: 4752
 location: clients/tests/test-client.py:1026:test_004()/22
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4563 bytes
+stdout: 4606 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -658,10 +663,11 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -682,7 +688,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -732,12 +738,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4689
+size: 4732
 location: clients/tests/test-client.py:1037:test_004()/23
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4553 bytes
+stdout: 4596 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -762,10 +768,11 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -786,7 +793,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -836,12 +843,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4719
+size: 4762
 location: clients/tests/test-client.py:1037:test_004()/24
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4573 bytes
+stdout: 4616 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -866,10 +873,11 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -890,7 +898,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -940,12 +948,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4689
+size: 4732
 location: clients/tests/test-client.py:1039:test_004()/25
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4553 bytes
+stdout: 4596 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -970,10 +978,11 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -994,7 +1003,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -1044,12 +1053,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4719
+size: 4762
 location: clients/tests/test-client.py:1039:test_004()/26
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4573 bytes
+stdout: 4616 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1074,10 +1083,11 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -1098,7 +1108,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -1148,12 +1158,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 3608
+size: 3651
 location: clients/tests/test-client.py:1042:test_004()/27
 cmd: $NMCLI -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3465 bytes
+stdout: 3508 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1178,10 +1188,11 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -1202,7 +1213,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -1232,12 +1243,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3628
+size: 3671
 location: clients/tests/test-client.py:1042:test_004()/28
 cmd: $NMCLI -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3475 bytes
+stdout: 3518 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1262,10 +1273,11 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -1286,7 +1298,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -1740,12 +1752,12 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
-size: 20660
+size: 20789
 location: clients/tests/test-client.py:1063:test_004()/39
 cmd: $NMCLI -f all dev show
 lang: C
 returncode: 0
-stdout: 20523 bytes
+stdout: 20652 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -1786,6 +1798,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
@@ -2011,6 +2024,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infra
@@ -2099,6 +2113,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
 IP4.GATEWAY:                            --
@@ -2129,12 +2144,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 20810
+size: 20942
 location: clients/tests/test-client.py:1063:test_004()/40
 cmd: $NMCLI -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 20663 bytes
+stdout: 20795 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -2175,6 +2190,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
@@ -2400,6 +2416,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infrastruktura
@@ -2488,6 +2505,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
 IP4.GATEWAY:                            --
@@ -2584,12 +2602,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 4847
+size: 4890
 location: clients/tests/test-client.py:1069:test_004()/43
 cmd: $NMCLI -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4705 bytes
+stdout: 4748 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -2630,6 +2648,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
@@ -2684,12 +2703,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 4902
+size: 4946
 location: clients/tests/test-client.py:1069:test_004()/44
 cmd: $NMCLI -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4750 bytes
+stdout: 4794 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -2730,6 +2749,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
@@ -2784,12 +2804,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1960
+size: 2003
 location: clients/tests/test-client.py:1072:test_004()/45
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1783 bytes
+stdout: 1826 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -2827,14 +2847,15 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 
 <<<
-size: 1984
+size: 2028
 location: clients/tests/test-client.py:1072:test_004()/46
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1797 bytes
+stdout: 1841 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -2872,14 +2893,15 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 
 <<<
-size: 1960
+size: 2003
 location: clients/tests/test-client.py:1075:test_004()/47
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1783 bytes
+stdout: 1826 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -2917,14 +2939,15 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 
 <<<
-size: 1984
+size: 2028
 location: clients/tests/test-client.py:1075:test_004()/48
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1797 bytes
+stdout: 1841 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -2962,6 +2985,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 
 <<<
 size: 514
@@ -3180,12 +3204,12 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1
 
 
 <<<
-size: 4850
+size: 4893
 location: clients/tests/test-client.py:1095:test_004()/63
 cmd: $NMCLI -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4705 bytes
+stdout: 4748 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -3226,6 +3250,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
@@ -3280,12 +3305,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 4905
+size: 4949
 location: clients/tests/test-client.py:1095:test_004()/64
 cmd: $NMCLI -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4750 bytes
+stdout: 4794 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -3326,6 +3351,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
@@ -3446,12 +3472,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 4988
+size: 5031
 location: clients/tests/test-client.py:1099: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: 4705 bytes
+stdout: 4748 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -3492,6 +3518,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
@@ -3546,12 +3573,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5043
+size: 5087
 location: clients/tests/test-client.py:1099: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: 4750 bytes
+stdout: 4794 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -3592,6 +3619,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
@@ -3706,12 +3734,12 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION:         Test system #3
 NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 
 <<<
-size: 4701
+size: 4744
 location: clients/tests/test-client.py:1037:test_004()/71
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4553 bytes
+stdout: 4596 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -3736,10 +3764,11 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -3760,7 +3789,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -3810,12 +3839,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4731
+size: 4774
 location: clients/tests/test-client.py:1037:test_004()/72
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4573 bytes
+stdout: 4616 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -3840,10 +3869,11 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -3864,7 +3894,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -3914,12 +3944,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4701
+size: 4744
 location: clients/tests/test-client.py:1039:test_004()/73
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4553 bytes
+stdout: 4596 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -3944,10 +3974,11 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -3968,7 +3999,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -4018,12 +4049,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4731
+size: 4774
 location: clients/tests/test-client.py:1039:test_004()/74
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4573 bytes
+stdout: 4616 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4048,10 +4079,11 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -4072,7 +4104,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -4122,12 +4154,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 3620
+size: 3663
 location: clients/tests/test-client.py:1042:test_004()/75
 cmd: $NMCLI --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3465 bytes
+stdout: 3508 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4152,10 +4184,11 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -4176,7 +4209,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -4206,12 +4239,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3640
+size: 3683
 location: clients/tests/test-client.py:1042:test_004()/76
 cmd: $NMCLI --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3475 bytes
+stdout: 3518 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4236,10 +4269,11 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -4260,7 +4294,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -4714,12 +4748,12 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
-size: 20960
+size: 21089
 location: clients/tests/test-client.py:1063:test_004()/87
 cmd: $NMCLI --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 20811 bytes
+stdout: 20940 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -4760,6 +4794,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
@@ -4985,6 +5020,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infra
@@ -5073,6 +5109,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
 IP4.GATEWAY:                            --
@@ -5103,12 +5140,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 21110
+size: 21242
 location: clients/tests/test-client.py:1063:test_004()/88
 cmd: $NMCLI --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 20951 bytes
+stdout: 21083 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -5149,6 +5186,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
@@ -5374,6 +5412,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infrastruktura
@@ -5462,6 +5501,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
 IP4.GATEWAY:                            --
@@ -5558,12 +5598,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5075
+size: 5118
 location: clients/tests/test-client.py:1069:test_004()/91
 cmd: $NMCLI --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4921 bytes
+stdout: 4964 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -5604,6 +5644,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
@@ -5658,12 +5699,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5130
+size: 5174
 location: clients/tests/test-client.py:1069:test_004()/92
 cmd: $NMCLI --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4966 bytes
+stdout: 5010 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -5704,6 +5745,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
@@ -5758,12 +5800,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1972
+size: 2015
 location: clients/tests/test-client.py:1072:test_004()/93
 cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1783 bytes
+stdout: 1826 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -5801,14 +5843,15 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 
 <<<
-size: 1996
+size: 2040
 location: clients/tests/test-client.py:1072:test_004()/94
 cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1797 bytes
+stdout: 1841 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -5846,14 +5889,15 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 
 <<<
-size: 1972
+size: 2015
 location: clients/tests/test-client.py:1075:test_004()/95
 cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1783 bytes
+stdout: 1826 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -5891,14 +5935,15 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 
 <<<
-size: 1996
+size: 2040
 location: clients/tests/test-client.py:1075:test_004()/96
 cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1797 bytes
+stdout: 1841 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -5936,6 +5981,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 
 <<<
 size: 646
@@ -6154,12 +6200,12 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 
 
 <<<
-size: 5079
+size: 5122
 location: clients/tests/test-client.py:1095:test_004()/111
 cmd: $NMCLI --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4921 bytes
+stdout: 4964 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -6200,6 +6246,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
@@ -6254,12 +6301,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5134
+size: 5178
 location: clients/tests/test-client.py:1095:test_004()/112
 cmd: $NMCLI --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4966 bytes
+stdout: 5010 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -6300,6 +6347,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
@@ -6420,12 +6468,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5217
+size: 5260
 location: clients/tests/test-client.py:1099:test_004()/115
 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: 4921 bytes
+stdout: 4964 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -6466,6 +6514,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
@@ -6520,12 +6569,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5272
+size: 5316
 location: clients/tests/test-client.py:1099:test_004()/116
 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: 4966 bytes
+stdout: 5010 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -6566,6 +6615,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
@@ -6680,12 +6730,12 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION:         Test system #3
 NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 
 <<<
-size: 5711
+size: 5754
 location: clients/tests/test-client.py:1037:test_004()/119
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5565 bytes
+stdout: 5608 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -6713,11 +6763,12 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -6739,7 +6790,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -6797,12 +6848,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5753
+size: 5796
 location: clients/tests/test-client.py:1037:test_004()/120
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5597 bytes
+stdout: 5640 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -6830,11 +6881,12 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -6856,7 +6908,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -6914,12 +6966,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5711
+size: 5754
 location: clients/tests/test-client.py:1039:test_004()/121
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5565 bytes
+stdout: 5608 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -6947,11 +6999,12 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -6973,7 +7026,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -7031,12 +7084,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5753
+size: 5796
 location: clients/tests/test-client.py:1039:test_004()/122
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5597 bytes
+stdout: 5640 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -7064,11 +7117,12 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -7090,7 +7144,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -7148,12 +7202,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 4237
+size: 4280
 location: clients/tests/test-client.py:1042:test_004()/123
 cmd: $NMCLI --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4084 bytes
+stdout: 4127 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -7181,11 +7235,12 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -7207,7 +7262,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -7240,12 +7295,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4262
+size: 4305
 location: clients/tests/test-client.py:1042:test_004()/124
 cmd: $NMCLI --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4099 bytes
+stdout: 4142 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -7273,11 +7328,12 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -7299,7 +7355,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -7912,12 +7968,12 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
 <<<
-size: 25245
+size: 25374
 location: clients/tests/test-client.py:1063:test_004()/135
 cmd: $NMCLI --pretty -f all dev show
 lang: C
 returncode: 0
-stdout: 25098 bytes
+stdout: 25227 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -7963,6 +8019,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -8224,6 +8281,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan1-ap-4
@@ -8324,6 +8382,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
@@ -8360,12 +8419,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 25428
+size: 25560
 location: clients/tests/test-client.py:1063:test_004()/136
 cmd: $NMCLI --pretty -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 25271 bytes
+stdout: 25403 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -8411,6 +8470,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -8672,6 +8732,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan1-ap-4
@@ -8772,6 +8833,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
@@ -8898,12 +8960,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 5948
+size: 5991
 location: clients/tests/test-client.py:1069:test_004()/139
 cmd: $NMCLI --pretty -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 5796 bytes
+stdout: 5839 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -8949,6 +9011,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -9012,12 +9075,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6010
+size: 6054
 location: clients/tests/test-client.py:1069:test_004()/140
 cmd: $NMCLI --pretty -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5848 bytes
+stdout: 5892 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -9063,6 +9126,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -9126,12 +9190,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 2421
+size: 2464
 location: clients/tests/test-client.py:1072:test_004()/141
 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2234 bytes
+stdout: 2277 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -9174,15 +9238,16 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 
 <<<
-size: 2452
+size: 2496
 location: clients/tests/test-client.py:1072:test_004()/142
 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2255 bytes
+stdout: 2299 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -9225,15 +9290,16 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 
 <<<
-size: 2421
+size: 2464
 location: clients/tests/test-client.py:1075:test_004()/143
 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2234 bytes
+stdout: 2277 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -9276,15 +9342,16 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 
 <<<
-size: 2452
+size: 2496
 location: clients/tests/test-client.py:1075:test_004()/144
 cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2255 bytes
+stdout: 2299 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -9327,6 +9394,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 
 <<<
@@ -9650,12 +9718,12 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1
 
 
 <<<
-size: 5951
+size: 5994
 location: clients/tests/test-client.py:1095:test_004()/159
 cmd: $NMCLI --pretty -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 5796 bytes
+stdout: 5839 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -9701,6 +9769,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -9764,12 +9833,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6013
+size: 6057
 location: clients/tests/test-client.py:1095:test_004()/160
 cmd: $NMCLI --pretty -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5848 bytes
+stdout: 5892 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -9815,6 +9884,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -9968,12 +10038,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6089
+size: 6132
 location: clients/tests/test-client.py:1099:test_004()/163
 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: 5796 bytes
+stdout: 5839 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -10019,6 +10089,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -10082,12 +10153,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6151
+size: 6195
 location: clients/tests/test-client.py:1099:test_004()/164
 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: 5848 bytes
+stdout: 5892 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -10133,6 +10204,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -10268,12 +10340,12 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 -------------------------------------------------------------------------------
 
 <<<
-size: 5723
+size: 5766
 location: clients/tests/test-client.py:1037:test_004()/167
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5565 bytes
+stdout: 5608 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -10301,11 +10373,12 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -10327,7 +10400,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -10385,12 +10458,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5765
+size: 5808
 location: clients/tests/test-client.py:1037:test_004()/168
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5597 bytes
+stdout: 5640 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -10418,11 +10491,12 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -10444,7 +10518,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -10502,12 +10576,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5723
+size: 5766
 location: clients/tests/test-client.py:1039:test_004()/169
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5565 bytes
+stdout: 5608 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -10535,11 +10609,12 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -10561,7 +10636,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -10619,12 +10694,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5765
+size: 5808
 location: clients/tests/test-client.py:1039:test_004()/170
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5597 bytes
+stdout: 5640 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -10652,11 +10727,12 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -10678,7 +10754,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -10736,12 +10812,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 4249
+size: 4292
 location: clients/tests/test-client.py:1042:test_004()/171
 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4084 bytes
+stdout: 4127 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -10769,11 +10845,12 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -10795,7 +10872,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -10828,12 +10905,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4274
+size: 4317
 location: clients/tests/test-client.py:1042:test_004()/172
 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4099 bytes
+stdout: 4142 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -10861,11 +10938,12 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -10887,7 +10965,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -11500,12 +11578,12 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
 <<<
-size: 25545
+size: 25674
 location: clients/tests/test-client.py:1063:test_004()/183
 cmd: $NMCLI --pretty --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 25386 bytes
+stdout: 25515 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -11551,6 +11629,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -11812,6 +11891,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan1-ap-4
@@ -11912,6 +11992,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
@@ -11948,12 +12029,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 25728
+size: 25860
 location: clients/tests/test-client.py:1063:test_004()/184
 cmd: $NMCLI --pretty --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 25559 bytes
+stdout: 25691 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -11999,6 +12080,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -12260,6 +12342,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan1-ap-4
@@ -12360,6 +12443,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
@@ -12486,12 +12570,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6176
+size: 6219
 location: clients/tests/test-client.py:1069:test_004()/187
 cmd: $NMCLI --pretty --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 6012 bytes
+stdout: 6055 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -12537,6 +12621,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -12600,12 +12685,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6238
+size: 6282
 location: clients/tests/test-client.py:1069:test_004()/188
 cmd: $NMCLI --pretty --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6064 bytes
+stdout: 6108 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -12651,6 +12736,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -12714,12 +12800,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 2433
+size: 2476
 location: clients/tests/test-client.py:1072:test_004()/189
 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2234 bytes
+stdout: 2277 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -12762,15 +12848,16 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 
 <<<
-size: 2464
+size: 2508
 location: clients/tests/test-client.py:1072:test_004()/190
 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2255 bytes
+stdout: 2299 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -12813,15 +12900,16 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 
 <<<
-size: 2433
+size: 2476
 location: clients/tests/test-client.py:1075:test_004()/191
 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2234 bytes
+stdout: 2277 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -12864,15 +12952,16 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 
 <<<
-size: 2464
+size: 2508
 location: clients/tests/test-client.py:1075:test_004()/192
 cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2255 bytes
+stdout: 2299 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -12915,6 +13004,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 
 <<<
@@ -13238,12 +13328,12 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 
 
 <<<
-size: 6179
+size: 6222
 location: clients/tests/test-client.py:1095:test_004()/207
 cmd: $NMCLI --pretty --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 6012 bytes
+stdout: 6055 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -13289,6 +13379,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -13352,12 +13443,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6241
+size: 6285
 location: clients/tests/test-client.py:1095:test_004()/208
 cmd: $NMCLI --pretty --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6064 bytes
+stdout: 6108 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -13403,6 +13494,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -13556,12 +13648,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6317
+size: 6360
 location: clients/tests/test-client.py:1099:test_004()/211
 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: 6012 bytes
+stdout: 6055 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -13607,6 +13699,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -13670,12 +13763,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6379
+size: 6423
 location: clients/tests/test-client.py:1099:test_004()/212
 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: 6064 bytes
+stdout: 6108 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -13721,6 +13814,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -13856,12 +13950,12 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 -------------------------------------------------------------------------------
 
 <<<
-size: 2363
+size: 2395
 location: clients/tests/test-client.py:1037:test_004()/215
 cmd: $NMCLI --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2218 bytes
+stdout: 2250 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -13886,10 +13980,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -13910,7 +14005,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -13960,12 +14055,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2373
+size: 2405
 location: clients/tests/test-client.py:1037:test_004()/216
 cmd: $NMCLI --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2218 bytes
+stdout: 2250 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -13990,10 +14085,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -14014,7 +14110,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -14064,12 +14160,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2363
+size: 2395
 location: clients/tests/test-client.py:1039:test_004()/217
 cmd: $NMCLI --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2218 bytes
+stdout: 2250 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -14094,10 +14190,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -14118,7 +14215,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -14168,12 +14265,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2373
+size: 2405
 location: clients/tests/test-client.py:1039:test_004()/218
 cmd: $NMCLI --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2218 bytes
+stdout: 2250 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -14198,10 +14295,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -14222,7 +14320,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -14272,12 +14370,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 1811
+size: 1843
 location: clients/tests/test-client.py:1042:test_004()/219
 cmd: $NMCLI --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1659 bytes
+stdout: 1691 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -14302,10 +14400,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -14326,7 +14425,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -14356,12 +14455,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 1821
+size: 1853
 location: clients/tests/test-client.py:1042:test_004()/220
 cmd: $NMCLI --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1659 bytes
+stdout: 1691 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -14386,10 +14485,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -14410,7 +14510,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -14860,12 +14960,12 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 11927
+size: 11999
 location: clients/tests/test-client.py:1063:test_004()/231
 cmd: $NMCLI --terse -f all dev show
 lang: C
 returncode: 0
-stdout: 11781 bytes
+stdout: 11853 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -14906,6 +15006,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
@@ -15131,6 +15232,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infra
@@ -15219,6 +15321,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 IP4.ADDRESS[1]:192.168.97.124/29
 IP4.ADDRESS[2]:192.168.76.154/18
 IP4.GATEWAY:
@@ -15249,12 +15352,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 11973
+size: 12045
 location: clients/tests/test-client.py:1063:test_004()/232
 cmd: $NMCLI --terse -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 11817 bytes
+stdout: 11889 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -15295,6 +15398,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
@@ -15520,6 +15624,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infrastruktura
@@ -15608,6 +15713,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 IP4.ADDRESS[1]:192.168.97.124/29
 IP4.ADDRESS[2]:192.168.76.154/18
 IP4.GATEWAY:
@@ -15704,12 +15810,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2693
+size: 2717
 location: clients/tests/test-client.py:1069:test_004()/235
 cmd: $NMCLI --terse -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2542 bytes
+stdout: 2566 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -15750,6 +15856,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
@@ -15804,12 +15911,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2730
+size: 2754
 location: clients/tests/test-client.py:1069:test_004()/236
 cmd: $NMCLI --terse -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2569 bytes
+stdout: 2593 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -15850,6 +15957,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
@@ -15904,12 +16012,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1191
+size: 1215
 location: clients/tests/test-client.py:1072:test_004()/237
 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1005 bytes
+stdout: 1029 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -15947,14 +16055,15 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 
 <<<
-size: 1201
+size: 1225
 location: clients/tests/test-client.py:1072:test_004()/238
 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1005 bytes
+stdout: 1029 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -15992,14 +16101,15 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 
 <<<
-size: 1191
+size: 1215
 location: clients/tests/test-client.py:1075:test_004()/239
 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1005 bytes
+stdout: 1029 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -16037,14 +16147,15 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 
 <<<
-size: 1201
+size: 1225
 location: clients/tests/test-client.py:1075:test_004()/240
 cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1005 bytes
+stdout: 1029 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -16082,6 +16193,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 
 <<<
 size: 428
@@ -16274,12 +16386,12 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:24
 
 
 <<<
-size: 2696
+size: 2720
 location: clients/tests/test-client.py:1095:test_004()/255
 cmd: $NMCLI --terse -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2542 bytes
+stdout: 2566 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -16320,6 +16432,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
@@ -16374,12 +16487,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2733
+size: 2757
 location: clients/tests/test-client.py:1095:test_004()/256
 cmd: $NMCLI --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2569 bytes
+stdout: 2593 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -16420,6 +16533,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
@@ -16540,12 +16654,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2834
+size: 2858
 location: clients/tests/test-client.py:1099:test_004()/259
 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: 2542 bytes
+stdout: 2566 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -16586,6 +16700,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
@@ -16640,12 +16755,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2871
+size: 2895
 location: clients/tests/test-client.py:1099:test_004()/260
 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: 2569 bytes
+stdout: 2593 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -16686,6 +16801,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
@@ -16800,12 +16916,12 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION:Test system #3
 NEIGHBOR[2].SYSTEM-CAPABILITIES:40 (wlan-access-point,telephone)
 
 <<<
-size: 2375
+size: 2407
 location: clients/tests/test-client.py:1037:test_004()/263
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2218 bytes
+stdout: 2250 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -16830,10 +16946,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -16854,7 +16971,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -16904,12 +17021,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2385
+size: 2417
 location: clients/tests/test-client.py:1037:test_004()/264
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2218 bytes
+stdout: 2250 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -16934,10 +17051,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -16958,7 +17076,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -17008,12 +17126,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2375
+size: 2407
 location: clients/tests/test-client.py:1039:test_004()/265
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2218 bytes
+stdout: 2250 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -17038,10 +17156,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -17062,7 +17181,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -17112,12 +17231,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2385
+size: 2417
 location: clients/tests/test-client.py:1039:test_004()/266
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2218 bytes
+stdout: 2250 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -17142,10 +17261,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -17166,7 +17286,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -17216,12 +17336,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 1823
+size: 1855
 location: clients/tests/test-client.py:1042:test_004()/267
 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1659 bytes
+stdout: 1691 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -17246,10 +17366,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -17270,7 +17391,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -17300,12 +17421,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 1833
+size: 1865
 location: clients/tests/test-client.py:1042:test_004()/268
 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1659 bytes
+stdout: 1691 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -17330,10 +17451,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -17354,7 +17476,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -17804,12 +17926,12 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 12227
+size: 12299
 location: clients/tests/test-client.py:1063:test_004()/279
 cmd: $NMCLI --terse --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 12069 bytes
+stdout: 12141 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -17850,6 +17972,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
@@ -18075,6 +18198,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infra
@@ -18163,6 +18287,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 IP4.ADDRESS[1]:192.168.97.124/29
 IP4.ADDRESS[2]:192.168.76.154/18
 IP4.GATEWAY:
@@ -18193,12 +18318,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 12273
+size: 12345
 location: clients/tests/test-client.py:1063:test_004()/280
 cmd: $NMCLI --terse --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 12105 bytes
+stdout: 12177 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18239,6 +18364,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
@@ -18464,6 +18590,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infrastruktura
@@ -18552,6 +18679,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 IP4.ADDRESS[1]:192.168.97.124/29
 IP4.ADDRESS[2]:192.168.76.154/18
 IP4.GATEWAY:
@@ -18648,12 +18776,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2921
+size: 2945
 location: clients/tests/test-client.py:1069:test_004()/283
 cmd: $NMCLI --terse --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2758 bytes
+stdout: 2782 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18694,6 +18822,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
@@ -18748,12 +18877,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2958
+size: 2982
 location: clients/tests/test-client.py:1069:test_004()/284
 cmd: $NMCLI --terse --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2785 bytes
+stdout: 2809 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18794,6 +18923,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
@@ -18848,12 +18978,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1203
+size: 1227
 location: clients/tests/test-client.py:1072:test_004()/285
 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1005 bytes
+stdout: 1029 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18891,14 +19021,15 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 
 <<<
-size: 1213
+size: 1237
 location: clients/tests/test-client.py:1072:test_004()/286
 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1005 bytes
+stdout: 1029 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18936,14 +19067,15 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 
 <<<
-size: 1203
+size: 1227
 location: clients/tests/test-client.py:1075:test_004()/287
 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1005 bytes
+stdout: 1029 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18981,14 +19113,15 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 
 <<<
-size: 1213
+size: 1237
 location: clients/tests/test-client.py:1075:test_004()/288
 cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1005 bytes
+stdout: 1029 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -19026,6 +19159,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 
 <<<
 size: 560
@@ -19218,12 +19352,12 @@ stdout: 422 bytes
 
 
 <<<
-size: 2924
+size: 2948
 location: clients/tests/test-client.py:1095:test_004()/303
 cmd: $NMCLI --terse --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2758 bytes
+stdout: 2782 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -19264,6 +19398,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
@@ -19318,12 +19453,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2961
+size: 2985
 location: clients/tests/test-client.py:1095:test_004()/304
 cmd: $NMCLI --terse --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2785 bytes
+stdout: 2809 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -19364,6 +19499,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
@@ -19484,12 +19620,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 3062
+size: 3086
 location: clients/tests/test-client.py:1099:test_004()/307
 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: 2758 bytes
+stdout: 2782 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -19530,6 +19666,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
@@ -19584,12 +19721,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 3099
+size: 3123
 location: clients/tests/test-client.py:1099:test_004()/308
 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: 2785 bytes
+stdout: 2809 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -19630,6 +19767,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
@@ -19744,21 +19882,21 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION:Test system #3
 NEIGHBOR[2].SYSTEM-CAPABILITIES:40 (wlan-access-point,telephone)
 
 <<<
-size: 3038
+size: 3080
 location: clients/tests/test-client.py:1037:test_004()/311
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2886 bytes
+stdout: 2928 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        
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  no          0       
@@ -19773,21 +19911,21 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3061
+size: 3103
 location: clients/tests/test-client.py:1037:test_004()/312
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2899 bytes
+stdout: 2941 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        
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
@@ -19802,21 +19940,21 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3038
+size: 3080
 location: clients/tests/test-client.py:1039:test_004()/313
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2886 bytes
+stdout: 2928 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        
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  no          0       
@@ -19831,21 +19969,21 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3061
+size: 3103
 location: clients/tests/test-client.py:1039:test_004()/314
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2899 bytes
+stdout: 2941 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        
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
@@ -19860,21 +19998,21 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 2306
+size: 2348
 location: clients/tests/test-client.py:1042:test_004()/315
 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2147 bytes
+stdout: 2189 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        
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  no          0       
@@ -19884,21 +20022,21 @@ proxy  none    no            --       --
 
 
 <<<
-size: 2318
+size: 2360
 location: clients/tests/test-client.py:1042:test_004()/316
 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2149 bytes
+stdout: 2191 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        
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
@@ -20310,12 +20448,12 @@ 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: 14861
+size: 14897
 location: clients/tests/test-client.py:1063:test_004()/327
 cmd: $NMCLI --mode tabular -f all dev show
 lang: C
 returncode: 0
-stdout: 14708 bytes
+stdout: 14744 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 
@@ -20323,8 +20461,8 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
@@ -20400,8 +20538,8 @@ GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
@@ -20427,8 +20565,8 @@ GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME  IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
@@ -20448,12 +20586,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 15020
+size: 15056
 location: clients/tests/test-client.py:1063:test_004()/328
 cmd: $NMCLI --mode tabular -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 14857 bytes
+stdout: 14893 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 
@@ -20461,8 +20599,8 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
@@ -20538,8 +20676,8 @@ GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
@@ -20565,8 +20703,8 @@ GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME  IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
@@ -20656,12 +20794,12 @@ 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: 3012
+size: 3024
 location: clients/tests/test-client.py:1069:test_004()/331
 cmd: $NMCLI --mode tabular -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2854 bytes
+stdout: 2866 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 
@@ -20669,8 +20807,8 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
@@ -20693,12 +20831,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3075
+size: 3087
 location: clients/tests/test-client.py:1069:test_004()/332
 cmd: $NMCLI --mode tabular -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2907 bytes
+stdout: 2919 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 
@@ -20706,8 +20844,8 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
@@ -20730,12 +20868,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 1251
+size: 1263
 location: clients/tests/test-client.py:1072:test_004()/333
 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1058 bytes
+stdout: 1070 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 
@@ -20743,16 +20881,16 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 HWADDR            
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 <<<
-size: 1278
+size: 1290
 location: clients/tests/test-client.py:1072:test_004()/334
 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1075 bytes
+stdout: 1087 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 
@@ -20760,16 +20898,16 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 HWADDR            
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 <<<
-size: 1251
+size: 1263
 location: clients/tests/test-client.py:1075:test_004()/335
 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1058 bytes
+stdout: 1070 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 
@@ -20777,16 +20915,16 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 HWADDR            
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 <<<
-size: 1278
+size: 1290
 location: clients/tests/test-client.py:1075:test_004()/336
 cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1075 bytes
+stdout: 1087 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 
@@ -20794,8 +20932,8 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 HWADDR            
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 <<<
 size: 530
@@ -21014,12 +21152,12 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1
 
 
 <<<
-size: 3015
+size: 3027
 location: clients/tests/test-client.py:1095:test_004()/351
 cmd: $NMCLI --mode tabular -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2854 bytes
+stdout: 2866 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 
@@ -21027,8 +21165,8 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
@@ -21051,12 +21189,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3078
+size: 3090
 location: clients/tests/test-client.py:1095:test_004()/352
 cmd: $NMCLI --mode tabular -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2907 bytes
+stdout: 2919 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 
@@ -21064,8 +21202,8 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
@@ -21158,12 +21296,12 @@ 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: 3153
+size: 3165
 location: clients/tests/test-client.py:1099:test_004()/355
 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: 2854 bytes
+stdout: 2866 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 
@@ -21171,8 +21309,8 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
@@ -21195,12 +21333,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3216
+size: 3228
 location: clients/tests/test-client.py:1099:test_004()/356
 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: 2907 bytes
+stdout: 2919 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 
@@ -21208,8 +21346,8 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
@@ -21258,21 +21396,21 @@ 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: 3050
+size: 3092
 location: clients/tests/test-client.py:1037:test_004()/359
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2886 bytes
+stdout: 2928 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        
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  no          0       
@@ -21287,21 +21425,21 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3073
+size: 3115
 location: clients/tests/test-client.py:1037:test_004()/360
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2899 bytes
+stdout: 2941 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        
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
@@ -21316,21 +21454,21 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3050
+size: 3092
 location: clients/tests/test-client.py:1039:test_004()/361
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2886 bytes
+stdout: 2928 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        
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  no          0       
@@ -21345,21 +21483,21 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3073
+size: 3115
 location: clients/tests/test-client.py:1039:test_004()/362
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2899 bytes
+stdout: 2941 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        
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
@@ -21374,21 +21512,21 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 2318
+size: 2360
 location: clients/tests/test-client.py:1042:test_004()/363
 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2147 bytes
+stdout: 2189 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        
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  no          0       
@@ -21398,21 +21536,21 @@ proxy  none    no            --       --
 
 
 <<<
-size: 2330
+size: 2372
 location: clients/tests/test-client.py:1042:test_004()/364
 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2149 bytes
+stdout: 2191 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        
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
@@ -21824,12 +21962,12 @@ 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: 15197
+size: 15233
 location: clients/tests/test-client.py:1063:test_004()/375
 cmd: $NMCLI --mode tabular --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 15032 bytes
+stdout: 15068 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 
@@ -21837,8 +21975,8 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
@@ -21914,8 +22052,8 @@ GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
@@ -21941,8 +22079,8 @@ GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME  IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
@@ -21962,12 +22100,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 15356
+size: 15392
 location: clients/tests/test-client.py:1063:test_004()/376
 cmd: $NMCLI --mode tabular --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 15181 bytes
+stdout: 15217 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 
@@ -21975,8 +22113,8 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
@@ -22052,8 +22190,8 @@ GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
@@ -22079,8 +22217,8 @@ GENERAL  wlan1   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME  IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
@@ -22170,12 +22308,12 @@ 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: 3267
+size: 3279
 location: clients/tests/test-client.py:1069:test_004()/379
 cmd: $NMCLI --mode tabular --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 3097 bytes
+stdout: 3109 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 
@@ -22183,8 +22321,8 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
@@ -22207,12 +22345,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3330
+size: 3342
 location: clients/tests/test-client.py:1069:test_004()/380
 cmd: $NMCLI --mode tabular --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3150 bytes
+stdout: 3162 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 
@@ -22220,8 +22358,8 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
@@ -22244,12 +22382,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 1263
+size: 1275
 location: clients/tests/test-client.py:1072:test_004()/381
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1058 bytes
+stdout: 1070 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 
@@ -22257,16 +22395,16 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 HWADDR            
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 <<<
-size: 1290
+size: 1302
 location: clients/tests/test-client.py:1072:test_004()/382
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1075 bytes
+stdout: 1087 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 
@@ -22274,16 +22412,16 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 HWADDR            
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 <<<
-size: 1263
+size: 1275
 location: clients/tests/test-client.py:1075:test_004()/383
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1058 bytes
+stdout: 1070 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 
@@ -22291,16 +22429,16 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 HWADDR            
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 <<<
-size: 1290
+size: 1302
 location: clients/tests/test-client.py:1075:test_004()/384
 cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1075 bytes
+stdout: 1087 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 
@@ -22308,8 +22446,8 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 HWADDR            
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 <<<
 size: 662
@@ -22528,12 +22666,12 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 
 
 <<<
-size: 3270
+size: 3282
 location: clients/tests/test-client.py:1095:test_004()/399
 cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 3097 bytes
+stdout: 3109 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 
@@ -22541,8 +22679,8 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
@@ -22565,12 +22703,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3333
+size: 3345
 location: clients/tests/test-client.py:1095:test_004()/400
 cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3150 bytes
+stdout: 3162 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 
@@ -22578,8 +22716,8 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
@@ -22672,12 +22810,12 @@ 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: 3408
+size: 3420
 location: clients/tests/test-client.py:1099:test_004()/403
 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: 3097 bytes
+stdout: 3109 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 
@@ -22685,8 +22823,8 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV 
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
@@ -22709,12 +22847,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3471
+size: 3483
 location: clients/tests/test-client.py:1099:test_004()/404
 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: 3150 bytes
+stdout: 3162 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 
@@ -22722,8 +22860,8 @@ GENERAL  wlan0   wifi  NMDeviceWifi  --      --       virtual  --              -
 NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV 
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 AP[1]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
@@ -22772,27 +22910,27 @@ 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: 4832
+size: 4895
 location: clients/tests/test-client.py:1037:test_004()/407
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4671 bytes
+stdout: 4734 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
 ==========================================
-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        
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -22814,27 +22952,27 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4888
+size: 4951
 location: clients/tests/test-client.py:1037:test_004()/408
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4717 bytes
+stdout: 4780 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
 ============================================
-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        
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -22856,27 +22994,27 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4832
+size: 4895
 location: clients/tests/test-client.py:1039:test_004()/409
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4671 bytes
+stdout: 4734 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
 ==========================================
-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        
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -22898,27 +23036,27 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4888
+size: 4951
 location: clients/tests/test-client.py:1039:test_004()/410
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4717 bytes
+stdout: 4780 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
 ============================================
-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        
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -22940,27 +23078,27 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3518
+size: 3581
 location: clients/tests/test-client.py:1042:test_004()/411
 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3350 bytes
+stdout: 3413 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
 ==========================================
-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        
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -22972,27 +23110,27 @@ proxy  none    no            --       --
 
 
 <<<
-size: 3541
+size: 3604
 location: clients/tests/test-client.py:1042:test_004()/412
 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3363 bytes
+stdout: 3426 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
 ============================================
-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        
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -23562,12 +23700,12 @@ 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: 22590
+size: 22644
 location: clients/tests/test-client.py:1063:test_004()/423
 cmd: $NMCLI --mode tabular --pretty -f all dev show
 lang: C
 returncode: 0
-stdout: 22428 bytes
+stdout: 22482 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -23580,9 +23718,9 @@ NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
----------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+---------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
@@ -23691,9 +23829,9 @@ NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
----------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+---------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
@@ -23730,9 +23868,9 @@ NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
----------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+---------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME  IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 --------------------------------------------------------------
@@ -23758,12 +23896,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 22951
+size: 23005
 location: clients/tests/test-client.py:1063:test_004()/424
 cmd: $NMCLI --mode tabular --pretty -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 22779 bytes
+stdout: 22833 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -23776,9 +23914,9 @@ NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+-----------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
@@ -23887,9 +24025,9 @@ NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+-----------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
@@ -23926,9 +24064,9 @@ NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+-----------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME  IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 --------------------------------------------------------------
@@ -24048,12 +24186,12 @@ 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: 4456
+size: 4474
 location: clients/tests/test-client.py:1069:test_004()/427
 cmd: $NMCLI --mode tabular --pretty -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4289 bytes
+stdout: 4307 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -24066,9 +24204,9 @@ NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
----------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+---------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
@@ -24097,12 +24235,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 4564
+size: 4582
 location: clients/tests/test-client.py:1069:test_004()/428
 cmd: $NMCLI --mode tabular --pretty -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4387 bytes
+stdout: 4405 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -24115,9 +24253,9 @@ NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+-----------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
@@ -24146,12 +24284,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 1870
+size: 1888
 location: clients/tests/test-client.py:1072:test_004()/429
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1668 bytes
+stdout: 1686 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -24164,17 +24302,17 @@ HWADDR
 -------------------
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
----------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+---------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 <<<
-size: 1934
+size: 1952
 location: clients/tests/test-client.py:1072:test_004()/430
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1722 bytes
+stdout: 1740 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -24187,17 +24325,17 @@ HWADDR
 -------------------
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+-----------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 <<<
-size: 1870
+size: 1888
 location: clients/tests/test-client.py:1075:test_004()/431
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1668 bytes
+stdout: 1686 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -24210,17 +24348,17 @@ HWADDR
 -------------------
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
----------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+---------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 <<<
-size: 1934
+size: 1952
 location: clients/tests/test-client.py:1075:test_004()/432
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1722 bytes
+stdout: 1740 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -24233,9 +24371,9 @@ HWADDR
 -------------------
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+-----------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 <<<
 size: 686
@@ -24558,12 +24696,12 @@ AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1
 
 
 <<<
-size: 4459
+size: 4477
 location: clients/tests/test-client.py:1095:test_004()/447
 cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4289 bytes
+stdout: 4307 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -24576,9 +24714,9 @@ NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
----------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+---------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
@@ -24607,12 +24745,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 4567
+size: 4585
 location: clients/tests/test-client.py:1095:test_004()/448
 cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4387 bytes
+stdout: 4405 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -24625,9 +24763,9 @@ NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+-----------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
@@ -24750,12 +24888,12 @@ 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: 4597
+size: 4615
 location: clients/tests/test-client.py:1099:test_004()/451
 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: 4289 bytes
+stdout: 4307 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -24768,9 +24906,9 @@ NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
----------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+---------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
@@ -24799,12 +24937,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 4705
+size: 4723
 location: clients/tests/test-client.py:1099:test_004()/452
 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: 4387 bytes
+stdout: 4405 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -24817,9 +24955,9 @@ NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+-----------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
@@ -24882,27 +25020,27 @@ 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: 4844
+size: 4907
 location: clients/tests/test-client.py:1037:test_004()/455
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4671 bytes
+stdout: 4734 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
 ==========================================
-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        
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -24924,27 +25062,27 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4900
+size: 4963
 location: clients/tests/test-client.py:1037:test_004()/456
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4717 bytes
+stdout: 4780 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
 ============================================
-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        
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -24966,27 +25104,27 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4844
+size: 4907
 location: clients/tests/test-client.py:1039:test_004()/457
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4671 bytes
+stdout: 4734 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
 ==========================================
-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        
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -25008,27 +25146,27 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4900
+size: 4963
 location: clients/tests/test-client.py:1039:test_004()/458
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4717 bytes
+stdout: 4780 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
 ============================================
-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        
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -25050,27 +25188,27 @@ NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3530
+size: 3593
 location: clients/tests/test-client.py:1042:test_004()/459
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3350 bytes
+stdout: 3413 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
 ==========================================
-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        
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             no                  no               no             yes       -1 (unknown)  stable-privacy  --         yes                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -25082,27 +25220,27 @@ proxy  none    no            --       --
 
 
 <<<
-size: 3553
+size: 3616
 location: clients/tests/test-client.py:1042:test_004()/460
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3363 bytes
+stdout: 3426 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
 ============================================
-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        
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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) 
+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) 
+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  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                 --             --    
+ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             nie                 nie              nie            tak       -1 (unknown)  stable-privacy  --         tak                 --             --    
 
 name  service-type                            user-name  data                                   secrets   persistent  timeout 
 -------------------------------------------------------------------------------------------------------------------------------
@@ -25672,12 +25810,12 @@ 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: 22926
+size: 22980
 location: clients/tests/test-client.py:1063:test_004()/471
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 22752 bytes
+stdout: 22806 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -25690,9 +25828,9 @@ NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
----------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+---------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
@@ -25801,9 +25939,9 @@ NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
----------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+---------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
@@ -25840,9 +25978,9 @@ NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
----------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+---------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME  IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 --------------------------------------------------------------
@@ -25868,12 +26006,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 23287
+size: 23341
 location: clients/tests/test-client.py:1063:test_004()/472
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 23103 bytes
+stdout: 23157 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -25886,9 +26024,9 @@ NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+-----------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
@@ -25997,9 +26135,9 @@ NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+-----------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
@@ -26036,9 +26174,9 @@ NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+-----------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME  IN-USE  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
 --------------------------------------------------------------
@@ -26158,12 +26296,12 @@ 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: 4711
+size: 4729
 location: clients/tests/test-client.py:1069:test_004()/475
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4532 bytes
+stdout: 4550 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -26176,9 +26314,9 @@ NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
----------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+---------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
@@ -26207,12 +26345,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 4819
+size: 4837
 location: clients/tests/test-client.py:1069:test_004()/476
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4630 bytes
+stdout: 4648 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -26225,9 +26363,9 @@ NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+-----------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
@@ -26256,12 +26394,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 1882
+size: 1900
 location: clients/tests/test-client.py:1072:test_004()/477
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1668 bytes
+stdout: 1686 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -26274,17 +26412,17 @@ HWADDR
 -------------------
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
----------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+---------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 <<<
-size: 1946
+size: 1964
 location: clients/tests/test-client.py:1072:test_004()/478
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1722 bytes
+stdout: 1740 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -26297,17 +26435,17 @@ HWADDR
 -------------------
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+-----------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 <<<
-size: 1882
+size: 1900
 location: clients/tests/test-client.py:1075:test_004()/479
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1668 bytes
+stdout: 1686 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -26320,17 +26458,17 @@ HWADDR
 -------------------
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
----------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+---------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 <<<
-size: 1946
+size: 1964
 location: clients/tests/test-client.py:1075:test_004()/480
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1722 bytes
+stdout: 1740 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -26343,9 +26481,9 @@ HWADDR
 -------------------
 13:E0:74:85:7C:D9 
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+-----------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 <<<
 size: 818
@@ -26668,12 +26806,12 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 
 
 <<<
-size: 4714
+size: 4732
 location: clients/tests/test-client.py:1095:test_004()/495
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4532 bytes
+stdout: 4550 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -26686,9 +26824,9 @@ NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
----------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+---------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
@@ -26717,12 +26855,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 4822
+size: 4840
 location: clients/tests/test-client.py:1095:test_004()/496
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4630 bytes
+stdout: 4648 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -26735,9 +26873,9 @@ NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+-----------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
@@ -26860,12 +26998,12 @@ 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: 4852
+size: 4870
 location: clients/tests/test-client.py:1099:test_004()/499
 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: 4532 bytes
+stdout: 4550 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -26878,9 +27016,9 @@ NAME          CARRIER-DETECT  SPEED    IS-SOFTWARE  SRIOV
 -----------------------------------------------------------
 CAPABILITIES  no              unknown  no           no    
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ    
----------------------------------------------------------------------------
-WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     MESH 
+---------------------------------------------------------------------------------
+WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  no   
 
 NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
 ----------------------------------------------------------------------------
@@ -26909,12 +27047,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 4960
+size: 4978
 location: clients/tests/test-client.py:1099:test_004()/500
 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: 4630 bytes
+stdout: 4648 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -26927,9 +27065,9 @@ NAME          CARRIER-DETECT  SPEED     IS-SOFTWARE  SRIOV
 ------------------------------------------------------------
 CAPABILITIES  nie             nieznane  nie          nie   
 
-NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ     
------------------------------------------------------------------------------
-WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane 
+NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      MESH 
+-----------------------------------------------------------------------------------
+WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nie  
 
 NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
 -----------------------------------------------------------------------------------
@@ -26992,94 +27130,94 @@ 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: 793
+size: 794
 location: clients/tests/test-client.py:1037:test_004()/503
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 634 bytes
+stdout: 635 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
-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::
+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::
 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::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 803
+size: 804
 location: clients/tests/test-client.py:1037:test_004()/504
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 634 bytes
+stdout: 635 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
-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::
+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::
 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::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 793
+size: 794
 location: clients/tests/test-client.py:1039:test_004()/505
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 634 bytes
+stdout: 635 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
-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::
+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::
 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::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 803
+size: 804
 location: clients/tests/test-client.py:1039:test_004()/506
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 634 bytes
+stdout: 635 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
-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::
+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::
 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::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 506
+size: 507
 location: clients/tests/test-client.py:1042:test_004()/507
 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 340 bytes
+stdout: 341 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
-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::
+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::
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 
 <<<
-size: 516
+size: 517
 location: clients/tests/test-client.py:1042:test_004()/508
 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 340 bytes
+stdout: 341 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
-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::
+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::
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 
@@ -27300,16 +27438,16 @@ 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: 6315
+size: 6324
 location: clients/tests/test-client.py:1063:test_004()/519
 cmd: $NMCLI --mode tabular --terse -f all dev show
 lang: C
 returncode: 0
-stdout: 6155 bytes
+stdout: 6164 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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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
@@ -27339,7 +27477,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e6
 
 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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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
 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
@@ -27349,7 +27487,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown: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
@@ -27357,16 +27495,16 @@ 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: 6361
+size: 6370
 location: clients/tests/test-client.py:1063:test_004()/520
 cmd: $NMCLI --mode tabular --terse -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6191 bytes
+stdout: 6200 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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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
@@ -27396,7 +27534,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e6
 
 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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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
 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
@@ -27406,7 +27544,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown: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
@@ -27450,16 +27588,16 @@ 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: 1355
+size: 1358
 location: clients/tests/test-client.py:1069:test_004()/523
 cmd: $NMCLI --mode tabular --terse -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 1189 bytes
+stdout: 1192 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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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
@@ -27470,16 +27608,16 @@ 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: 1392
+size: 1395
 location: clients/tests/test-client.py:1069:test_004()/524
 cmd: $NMCLI --mode tabular --terse -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1216 bytes
+stdout: 1219 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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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
@@ -27490,52 +27628,52 @@ 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: 565
+size: 568
 location: clients/tests/test-client.py:1072:test_004()/525
 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 365 bytes
+stdout: 368 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
 13\:E0\:74\:85\:7C\:D9
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
 
 <<<
-size: 575
+size: 578
 location: clients/tests/test-client.py:1072:test_004()/526
 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 365 bytes
+stdout: 368 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
 13\:E0\:74\:85\:7C\:D9
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
 
 <<<
-size: 565
+size: 568
 location: clients/tests/test-client.py:1075:test_004()/527
 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 365 bytes
+stdout: 368 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
 13\:E0\:74\:85\:7C\:D9
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
 
 <<<
-size: 575
+size: 578
 location: clients/tests/test-client.py:1075:test_004()/528
 cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 365 bytes
+stdout: 368 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
 13\:E0\:74\:85\:7C\:D9
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
 
 <<<
 size: 443
@@ -27728,16 +27866,16 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:24
 
 
 <<<
-size: 1358
+size: 1361
 location: clients/tests/test-client.py:1095:test_004()/543
 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 1189 bytes
+stdout: 1192 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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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
@@ -27748,16 +27886,16 @@ 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: 1395
+size: 1398
 location: clients/tests/test-client.py:1095:test_004()/544
 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1216 bytes
+stdout: 1219 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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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
@@ -27804,16 +27942,16 @@ 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: 1496
+size: 1499
 location: clients/tests/test-client.py:1099:test_004()/547
 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: 1189 bytes
+stdout: 1192 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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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
@@ -27824,16 +27962,16 @@ 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: 1533
+size: 1536
 location: clients/tests/test-client.py:1099:test_004()/548
 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: 1216 bytes
+stdout: 1219 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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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
@@ -27868,94 +28006,94 @@ 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: 805
+size: 806
 location: clients/tests/test-client.py:1037:test_004()/551
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 634 bytes
+stdout: 635 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
-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::
+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::
 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::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 815
+size: 816
 location: clients/tests/test-client.py:1037:test_004()/552
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 634 bytes
+stdout: 635 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
-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::
+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::
 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::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 805
+size: 806
 location: clients/tests/test-client.py:1039:test_004()/553
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 634 bytes
+stdout: 635 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
-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::
+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::
 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::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 815
+size: 816
 location: clients/tests/test-client.py:1039:test_004()/554
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 634 bytes
+stdout: 635 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
-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::
+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::
 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::
 VPN:openvpn:::*** VPN connection con-vpn-1 ***:5 - VPN connected:key1 = val1 | key2 = val2 | key3 = val3
 
 <<<
-size: 518
+size: 519
 location: clients/tests/test-client.py:1042:test_004()/555
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 340 bytes
+stdout: 341 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
-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::
+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::
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 
 <<<
-size: 528
+size: 529
 location: clients/tests/test-client.py:1042:test_004()/556
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 340 bytes
+stdout: 341 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
-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::
+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::
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 
@@ -28176,16 +28314,16 @@ 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: 6651
+size: 6660
 location: clients/tests/test-client.py:1063:test_004()/567
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 6479 bytes
+stdout: 6488 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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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
@@ -28215,7 +28353,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e6
 
 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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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
 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
@@ -28225,7 +28363,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown: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
@@ -28233,16 +28371,16 @@ 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: 6697
+size: 6706
 location: clients/tests/test-client.py:1063:test_004()/568
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6515 bytes
+stdout: 6524 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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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
@@ -28272,7 +28410,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1}:5fcfd6d7-1e6
 
 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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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
 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
@@ -28282,7 +28420,7 @@ CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown: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
@@ -28326,16 +28464,16 @@ 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: 1610
+size: 1613
 location: clients/tests/test-client.py:1069:test_004()/571
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 1432 bytes
+stdout: 1435 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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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
@@ -28346,16 +28484,16 @@ 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: 1647
+size: 1650
 location: clients/tests/test-client.py:1069:test_004()/572
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1459 bytes
+stdout: 1462 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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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
@@ -28366,52 +28504,52 @@ 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: 577
+size: 580
 location: clients/tests/test-client.py:1072:test_004()/573
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 365 bytes
+stdout: 368 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
 13\:E0\:74\:85\:7C\:D9
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
 
 <<<
-size: 587
+size: 590
 location: clients/tests/test-client.py:1072:test_004()/574
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 365 bytes
+stdout: 368 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
 13\:E0\:74\:85\:7C\:D9
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
 
 <<<
-size: 577
+size: 580
 location: clients/tests/test-client.py:1075:test_004()/575
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 365 bytes
+stdout: 368 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
 13\:E0\:74\:85\:7C\:D9
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
 
 <<<
-size: 587
+size: 590
 location: clients/tests/test-client.py:1075:test_004()/576
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 365 bytes
+stdout: 368 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
 13\:E0\:74\:85\:7C\:D9
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no
 
 <<<
 size: 575
@@ -28604,16 +28742,16 @@ stdout: 422 bytes
 
 
 <<<
-size: 1613
+size: 1616
 location: clients/tests/test-client.py:1095:test_004()/591
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 1432 bytes
+stdout: 1435 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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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
@@ -28624,16 +28762,16 @@ 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: 1650
+size: 1653
 location: clients/tests/test-client.py:1095:test_004()/592
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1459 bytes
+stdout: 1462 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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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
@@ -28680,16 +28818,16 @@ 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: 1751
+size: 1754
 location: clients/tests/test-client.py:1099:test_004()/595
 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: 1432 bytes
+stdout: 1435 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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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
@@ -28700,16 +28838,16 @@ 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: 1788
+size: 1791
 location: clients/tests/test-client.py:1099:test_004()/596
 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: 1459 bytes
+stdout: 1462 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
 CAPABILITIES:no:unknown:no:no
-WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown
+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
@@ -28744,12 +28882,12 @@ 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: 4707
+size: 4750
 location: clients/tests/test-client.py:1037:test_004()/599
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4553 bytes
+stdout: 4596 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -28774,10 +28912,11 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -28798,7 +28937,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -28848,12 +28987,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4737
+size: 4780
 location: clients/tests/test-client.py:1037:test_004()/600
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4573 bytes
+stdout: 4616 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -28878,10 +29017,11 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -28902,7 +29042,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -28952,12 +29092,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4707
+size: 4750
 location: clients/tests/test-client.py:1039:test_004()/601
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4553 bytes
+stdout: 4596 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -28982,10 +29122,11 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -29006,7 +29147,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -29056,12 +29197,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4737
+size: 4780
 location: clients/tests/test-client.py:1039:test_004()/602
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4573 bytes
+stdout: 4616 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -29086,10 +29227,11 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -29110,7 +29252,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -29160,12 +29302,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 3626
+size: 3669
 location: clients/tests/test-client.py:1042:test_004()/603
 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3465 bytes
+stdout: 3508 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -29190,10 +29332,11 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -29214,7 +29357,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -29244,12 +29387,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3646
+size: 3689
 location: clients/tests/test-client.py:1042:test_004()/604
 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3475 bytes
+stdout: 3518 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -29274,10 +29417,11 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -29298,7 +29442,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -29858,12 +30002,12 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
-size: 20678
+size: 20807
 location: clients/tests/test-client.py:1063:test_004()/615
 cmd: $NMCLI --mode multiline -f all dev show
 lang: C
 returncode: 0
-stdout: 20523 bytes
+stdout: 20652 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -29904,6 +30048,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
@@ -30129,6 +30274,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infra
@@ -30217,6 +30363,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
 IP4.GATEWAY:                            --
@@ -30247,12 +30394,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 20828
+size: 20960
 location: clients/tests/test-client.py:1063:test_004()/616
 cmd: $NMCLI --mode multiline -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 20663 bytes
+stdout: 20795 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -30293,6 +30440,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
@@ -30518,6 +30666,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infrastruktura
@@ -30606,6 +30755,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
 IP4.GATEWAY:                            --
@@ -30702,12 +30852,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 4865
+size: 4908
 location: clients/tests/test-client.py:1069:test_004()/619
 cmd: $NMCLI --mode multiline -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4705 bytes
+stdout: 4748 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -30748,6 +30898,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
@@ -30802,12 +30953,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 4920
+size: 4964
 location: clients/tests/test-client.py:1069:test_004()/620
 cmd: $NMCLI --mode multiline -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4750 bytes
+stdout: 4794 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -30848,6 +30999,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
@@ -30902,12 +31054,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1978
+size: 2021
 location: clients/tests/test-client.py:1072:test_004()/621
 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1783 bytes
+stdout: 1826 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -30945,14 +31097,15 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 
 <<<
-size: 2002
+size: 2046
 location: clients/tests/test-client.py:1072:test_004()/622
 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1797 bytes
+stdout: 1841 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -30990,14 +31143,15 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 
 <<<
-size: 1978
+size: 2021
 location: clients/tests/test-client.py:1075:test_004()/623
 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1783 bytes
+stdout: 1826 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -31035,14 +31189,15 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 
 <<<
-size: 2002
+size: 2046
 location: clients/tests/test-client.py:1075:test_004()/624
 cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1797 bytes
+stdout: 1841 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -31080,6 +31235,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 
 <<<
 size: 1037
@@ -31682,12 +31838,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 4868
+size: 4911
 location: clients/tests/test-client.py:1095:test_004()/639
 cmd: $NMCLI --mode multiline -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4705 bytes
+stdout: 4748 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -31728,6 +31884,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
@@ -31782,12 +31939,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 4923
+size: 4967
 location: clients/tests/test-client.py:1095:test_004()/640
 cmd: $NMCLI --mode multiline -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4750 bytes
+stdout: 4794 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -31828,6 +31985,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
@@ -31948,12 +32106,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5006
+size: 5049
 location: clients/tests/test-client.py:1099:test_004()/643
 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: 4705 bytes
+stdout: 4748 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -31994,6 +32152,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
@@ -32048,12 +32207,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5061
+size: 5105
 location: clients/tests/test-client.py:1099:test_004()/644
 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: 4750 bytes
+stdout: 4794 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -32094,6 +32253,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
@@ -32208,12 +32368,12 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION:         Test system #3
 NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 
 <<<
-size: 4719
+size: 4762
 location: clients/tests/test-client.py:1037:test_004()/647
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4553 bytes
+stdout: 4596 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -32238,10 +32398,11 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -32262,7 +32423,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -32312,12 +32473,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4749
+size: 4792
 location: clients/tests/test-client.py:1037:test_004()/648
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4573 bytes
+stdout: 4616 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -32342,10 +32503,11 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -32366,7 +32528,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -32416,12 +32578,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4719
+size: 4762
 location: clients/tests/test-client.py:1039:test_004()/649
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4553 bytes
+stdout: 4596 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -32446,10 +32608,11 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -32470,7 +32633,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -32520,12 +32683,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 4749
+size: 4792
 location: clients/tests/test-client.py:1039:test_004()/650
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4573 bytes
+stdout: 4616 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -32550,10 +32713,11 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -32574,7 +32738,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -32624,12 +32788,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 3638
+size: 3681
 location: clients/tests/test-client.py:1042:test_004()/651
 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3465 bytes
+stdout: 3508 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -32654,10 +32818,11 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -32678,7 +32843,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -32708,12 +32873,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 3658
+size: 3701
 location: clients/tests/test-client.py:1042:test_004()/652
 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3475 bytes
+stdout: 3518 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -32738,10 +32903,11 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -32762,7 +32928,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -33322,12 +33488,12 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
-size: 20978
+size: 21107
 location: clients/tests/test-client.py:1063:test_004()/663
 cmd: $NMCLI --mode multiline --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 20811 bytes
+stdout: 20940 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -33368,6 +33534,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
@@ -33593,6 +33760,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infra
@@ -33681,6 +33849,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
 IP4.GATEWAY:                            --
@@ -33711,12 +33880,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 21128
+size: 21260
 location: clients/tests/test-client.py:1063:test_004()/664
 cmd: $NMCLI --mode multiline --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 20951 bytes
+stdout: 21083 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -33757,6 +33926,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
@@ -33982,6 +34152,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infrastruktura
@@ -34070,6 +34241,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
 IP4.GATEWAY:                            --
@@ -34166,12 +34338,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5093
+size: 5136
 location: clients/tests/test-client.py:1069:test_004()/667
 cmd: $NMCLI --mode multiline --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4921 bytes
+stdout: 4964 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -34212,6 +34384,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
@@ -34266,12 +34439,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5148
+size: 5192
 location: clients/tests/test-client.py:1069:test_004()/668
 cmd: $NMCLI --mode multiline --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4966 bytes
+stdout: 5010 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -34312,6 +34485,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
@@ -34366,12 +34540,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1990
+size: 2033
 location: clients/tests/test-client.py:1072:test_004()/669
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1783 bytes
+stdout: 1826 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -34409,14 +34583,15 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 
 <<<
-size: 2014
+size: 2058
 location: clients/tests/test-client.py:1072:test_004()/670
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1797 bytes
+stdout: 1841 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -34454,14 +34629,15 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 
 <<<
-size: 1990
+size: 2033
 location: clients/tests/test-client.py:1075:test_004()/671
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1783 bytes
+stdout: 1826 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -34499,14 +34675,15 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 
 <<<
-size: 2014
+size: 2058
 location: clients/tests/test-client.py:1075:test_004()/672
 cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1797 bytes
+stdout: 1841 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -34544,6 +34721,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 
 <<<
 size: 1169
@@ -35146,12 +35324,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 5096
+size: 5139
 location: clients/tests/test-client.py:1095:test_004()/687
 cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4921 bytes
+stdout: 4964 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -35192,6 +35370,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
@@ -35246,12 +35425,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5151
+size: 5195
 location: clients/tests/test-client.py:1095:test_004()/688
 cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4966 bytes
+stdout: 5010 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -35292,6 +35471,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
@@ -35412,12 +35592,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5234
+size: 5277
 location: clients/tests/test-client.py:1099:test_004()/691
 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: 4921 bytes
+stdout: 4964 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -35458,6 +35638,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
@@ -35512,12 +35693,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5289
+size: 5333
 location: clients/tests/test-client.py:1099:test_004()/692
 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: 4966 bytes
+stdout: 5010 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -35558,6 +35739,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
@@ -35672,12 +35854,12 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION:         Test system #3
 NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 
 <<<
-size: 5728
+size: 5771
 location: clients/tests/test-client.py:1037:test_004()/695
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5565 bytes
+stdout: 5608 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -35705,11 +35887,12 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -35731,7 +35914,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -35789,12 +35972,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5770
+size: 5813
 location: clients/tests/test-client.py:1037:test_004()/696
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5597 bytes
+stdout: 5640 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -35822,11 +36005,12 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -35848,7 +36032,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -35906,12 +36090,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5728
+size: 5771
 location: clients/tests/test-client.py:1039:test_004()/697
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5565 bytes
+stdout: 5608 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -35939,11 +36123,12 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -35965,7 +36150,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -36023,12 +36208,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5770
+size: 5813
 location: clients/tests/test-client.py:1039:test_004()/698
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5597 bytes
+stdout: 5640 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -36056,11 +36241,12 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -36082,7 +36268,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -36140,12 +36326,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 4254
+size: 4297
 location: clients/tests/test-client.py:1042:test_004()/699
 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4084 bytes
+stdout: 4127 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -36173,11 +36359,12 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -36199,7 +36386,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -36232,12 +36419,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4279
+size: 4322
 location: clients/tests/test-client.py:1042:test_004()/700
 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4099 bytes
+stdout: 4142 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -36265,11 +36452,12 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -36291,7 +36479,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -37026,12 +37214,12 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
 <<<
-size: 25262
+size: 25391
 location: clients/tests/test-client.py:1063:test_004()/711
 cmd: $NMCLI --mode multiline --pretty -f all dev show
 lang: C
 returncode: 0
-stdout: 25098 bytes
+stdout: 25227 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -37077,6 +37265,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -37338,6 +37527,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan1-ap-4
@@ -37438,6 +37628,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
@@ -37474,12 +37665,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 25445
+size: 25577
 location: clients/tests/test-client.py:1063:test_004()/712
 cmd: $NMCLI --mode multiline --pretty -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 25271 bytes
+stdout: 25403 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -37525,6 +37716,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -37786,6 +37978,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan1-ap-4
@@ -37886,6 +38079,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
@@ -38012,12 +38206,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 5965
+size: 6008
 location: clients/tests/test-client.py:1069:test_004()/715
 cmd: $NMCLI --mode multiline --pretty -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 5796 bytes
+stdout: 5839 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -38063,6 +38257,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -38126,12 +38321,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6027
+size: 6071
 location: clients/tests/test-client.py:1069:test_004()/716
 cmd: $NMCLI --mode multiline --pretty -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5848 bytes
+stdout: 5892 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -38177,6 +38372,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -38240,12 +38436,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 2438
+size: 2481
 location: clients/tests/test-client.py:1072:test_004()/717
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2234 bytes
+stdout: 2277 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -38288,15 +38484,16 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 
 <<<
-size: 2469
+size: 2513
 location: clients/tests/test-client.py:1072:test_004()/718
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2255 bytes
+stdout: 2299 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -38339,15 +38536,16 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 
 <<<
-size: 2438
+size: 2481
 location: clients/tests/test-client.py:1075:test_004()/719
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2234 bytes
+stdout: 2277 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -38390,15 +38588,16 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 
 <<<
-size: 2469
+size: 2513
 location: clients/tests/test-client.py:1075:test_004()/720
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2255 bytes
+stdout: 2299 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -38441,6 +38640,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 
 <<<
@@ -39162,12 +39362,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 5968
+size: 6011
 location: clients/tests/test-client.py:1095:test_004()/735
 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 5796 bytes
+stdout: 5839 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -39213,6 +39413,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -39276,12 +39477,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6030
+size: 6074
 location: clients/tests/test-client.py:1095:test_004()/736
 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5848 bytes
+stdout: 5892 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -39327,6 +39528,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -39480,12 +39682,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6106
+size: 6149
 location: clients/tests/test-client.py:1099:test_004()/739
 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: 5796 bytes
+stdout: 5839 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -39531,6 +39733,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -39594,12 +39797,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6168
+size: 6212
 location: clients/tests/test-client.py:1099:test_004()/740
 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: 5848 bytes
+stdout: 5892 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -39645,6 +39848,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -39780,12 +39984,12 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 -------------------------------------------------------------------------------
 
 <<<
-size: 5740
+size: 5783
 location: clients/tests/test-client.py:1037:test_004()/743
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5565 bytes
+stdout: 5608 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -39813,11 +40017,12 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -39839,7 +40044,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -39897,12 +40102,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5782
+size: 5825
 location: clients/tests/test-client.py:1037:test_004()/744
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5597 bytes
+stdout: 5640 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -39930,11 +40135,12 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -39956,7 +40162,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -40014,12 +40220,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5740
+size: 5783
 location: clients/tests/test-client.py:1039:test_004()/745
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5565 bytes
+stdout: 5608 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -40047,11 +40253,12 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -40073,7 +40280,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -40131,12 +40338,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 5782
+size: 5825
 location: clients/tests/test-client.py:1039:test_004()/746
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5597 bytes
+stdout: 5640 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -40164,11 +40371,12 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -40190,7 +40398,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -40248,12 +40456,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 4266
+size: 4309
 location: clients/tests/test-client.py:1042:test_004()/747
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4084 bytes
+stdout: 4127 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -40281,11 +40489,12 @@ connection.metered:                     unknown
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -40307,7 +40516,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -40340,12 +40549,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4291
+size: 4334
 location: clients/tests/test-client.py:1042:test_004()/748
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4099 bytes
+stdout: 4142 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -40373,11 +40582,12 @@ connection.metered:                     nieznane
 connection.lldp:                        default
 connection.mdns:                        -1 (default)
 connection.llmnr:                       -1 (default)
+connection.wait-device-timeout:         -1
 -------------------------------------------------------------------------------
 ipv4.method:                            auto
 ipv4.dns:                               --
 ipv4.dns-search:                        --
-ipv4.dns-options:                       ""
+ipv4.dns-options:                       --
 ipv4.dns-priority:                      0
 ipv4.addresses:                         --
 ipv4.gateway:                           --
@@ -40399,7 +40609,7 @@ ipv4.dad-timeout:                       -1 (default)
 ipv6.method:                            auto
 ipv6.dns:                               --
 ipv6.dns-search:                        --
-ipv6.dns-options:                       ""
+ipv6.dns-options:                       --
 ipv6.dns-priority:                      0
 ipv6.addresses:                         --
 ipv6.gateway:                           --
@@ -41134,12 +41344,12 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
 <<<
-size: 25562
+size: 25691
 location: clients/tests/test-client.py:1063:test_004()/759
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 25386 bytes
+stdout: 25515 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -41185,6 +41395,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -41446,6 +41657,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan1-ap-4
@@ -41546,6 +41758,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
@@ -41582,12 +41795,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 25745
+size: 25877
 location: clients/tests/test-client.py:1063:test_004()/760
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 25559 bytes
+stdout: 25691 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -41633,6 +41846,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -41894,6 +42108,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan1-ap-4
@@ -41994,6 +42209,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 IP4.ADDRESS[1]:                         192.168.97.124/29
 IP4.ADDRESS[2]:                         192.168.76.154/18
@@ -42120,12 +42336,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6193
+size: 6236
 location: clients/tests/test-client.py:1069:test_004()/763
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 6012 bytes
+stdout: 6055 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -42171,6 +42387,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -42234,12 +42451,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6255
+size: 6299
 location: clients/tests/test-client.py:1069:test_004()/764
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6064 bytes
+stdout: 6108 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -42285,6 +42502,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -42348,12 +42566,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 2450
+size: 2493
 location: clients/tests/test-client.py:1072:test_004()/765
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2234 bytes
+stdout: 2277 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -42396,15 +42614,16 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 
 <<<
-size: 2481
+size: 2525
 location: clients/tests/test-client.py:1072:test_004()/766
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2255 bytes
+stdout: 2299 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -42447,15 +42666,16 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 
 <<<
-size: 2450
+size: 2493
 location: clients/tests/test-client.py:1075:test_004()/767
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 2234 bytes
+stdout: 2277 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -42498,15 +42718,16 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 
 <<<
-size: 2481
+size: 2525
 location: clients/tests/test-client.py:1075:test_004()/768
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2255 bytes
+stdout: 2299 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -42549,6 +42770,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 
 <<<
@@ -43270,12 +43492,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 6196
+size: 6239
 location: clients/tests/test-client.py:1095:test_004()/783
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 6012 bytes
+stdout: 6055 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -43321,6 +43543,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -43384,12 +43607,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6258
+size: 6302
 location: clients/tests/test-client.py:1095:test_004()/784
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6064 bytes
+stdout: 6108 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -43435,6 +43658,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -43588,12 +43812,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6334
+size: 6377
 location: clients/tests/test-client.py:1099:test_004()/787
 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: 6012 bytes
+stdout: 6055 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -43639,6 +43863,7 @@ WIFI-PROPERTIES.AP:                     yes
 WIFI-PROPERTIES.ADHOC:                  yes
 WIFI-PROPERTIES.2GHZ:                   unknown
 WIFI-PROPERTIES.5GHZ:                   unknown
+WIFI-PROPERTIES.MESH:                   no
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -43702,12 +43927,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6396
+size: 6440
 location: clients/tests/test-client.py:1099:test_004()/788
 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: 6064 bytes
+stdout: 6108 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -43753,6 +43978,7 @@ WIFI-PROPERTIES.AP:                     tak
 WIFI-PROPERTIES.ADHOC:                  tak
 WIFI-PROPERTIES.2GHZ:                   nieznane
 WIFI-PROPERTIES.5GHZ:                   nieznane
+WIFI-PROPERTIES.MESH:                   nie
 -------------------------------------------------------------------------------
 AP[1].IN-USE:                            
 AP[1].SSID:                             wlan0-ap-2
@@ -43888,12 +44114,12 @@ NEIGHBOR[2].SYSTEM-CAPABILITIES:        40 (wlan-access-point,telephone)
 -------------------------------------------------------------------------------
 
 <<<
-size: 2380
+size: 2412
 location: clients/tests/test-client.py:1037:test_004()/791
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2218 bytes
+stdout: 2250 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -43918,10 +44144,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -43942,7 +44169,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -43992,12 +44219,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2390
+size: 2422
 location: clients/tests/test-client.py:1037:test_004()/792
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2218 bytes
+stdout: 2250 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -44022,10 +44249,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -44046,7 +44274,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -44096,12 +44324,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2380
+size: 2412
 location: clients/tests/test-client.py:1039:test_004()/793
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2218 bytes
+stdout: 2250 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -44126,10 +44354,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -44150,7 +44379,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -44200,12 +44429,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2390
+size: 2422
 location: clients/tests/test-client.py:1039:test_004()/794
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2218 bytes
+stdout: 2250 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -44230,10 +44459,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -44254,7 +44484,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -44304,12 +44534,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 1828
+size: 1860
 location: clients/tests/test-client.py:1042:test_004()/795
 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1659 bytes
+stdout: 1691 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -44334,10 +44564,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -44358,7 +44589,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -44388,12 +44619,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 1838
+size: 1870
 location: clients/tests/test-client.py:1042:test_004()/796
 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1659 bytes
+stdout: 1691 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -44418,10 +44649,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -44442,7 +44674,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -45002,12 +45234,12 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 11944
+size: 12016
 location: clients/tests/test-client.py:1063:test_004()/807
 cmd: $NMCLI --mode multiline --terse -f all dev show
 lang: C
 returncode: 0
-stdout: 11781 bytes
+stdout: 11853 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -45048,6 +45280,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
@@ -45273,6 +45506,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infra
@@ -45361,6 +45595,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 IP4.ADDRESS[1]:192.168.97.124/29
 IP4.ADDRESS[2]:192.168.76.154/18
 IP4.GATEWAY:
@@ -45391,12 +45626,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 11990
+size: 12062
 location: clients/tests/test-client.py:1063:test_004()/808
 cmd: $NMCLI --mode multiline --terse -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 11817 bytes
+stdout: 11889 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -45437,6 +45672,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
@@ -45662,6 +45898,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infrastruktura
@@ -45750,6 +45987,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 IP4.ADDRESS[1]:192.168.97.124/29
 IP4.ADDRESS[2]:192.168.76.154/18
 IP4.GATEWAY:
@@ -45846,12 +46084,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2710
+size: 2734
 location: clients/tests/test-client.py:1069:test_004()/811
 cmd: $NMCLI --mode multiline --terse -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2542 bytes
+stdout: 2566 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -45892,6 +46130,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
@@ -45946,12 +46185,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2747
+size: 2771
 location: clients/tests/test-client.py:1069:test_004()/812
 cmd: $NMCLI --mode multiline --terse -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2569 bytes
+stdout: 2593 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -45992,6 +46231,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
@@ -46046,12 +46286,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1208
+size: 1232
 location: clients/tests/test-client.py:1072:test_004()/813
 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1005 bytes
+stdout: 1029 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -46089,14 +46329,15 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 
 <<<
-size: 1218
+size: 1242
 location: clients/tests/test-client.py:1072:test_004()/814
 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1005 bytes
+stdout: 1029 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -46134,14 +46375,15 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 
 <<<
-size: 1208
+size: 1232
 location: clients/tests/test-client.py:1075:test_004()/815
 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1005 bytes
+stdout: 1029 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -46179,14 +46421,15 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 
 <<<
-size: 1218
+size: 1242
 location: clients/tests/test-client.py:1075:test_004()/816
 cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1005 bytes
+stdout: 1029 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -46224,6 +46467,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 
 <<<
 size: 555
@@ -46826,12 +47070,12 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 <<<
-size: 2713
+size: 2737
 location: clients/tests/test-client.py:1095:test_004()/831
 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2542 bytes
+stdout: 2566 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -46872,6 +47116,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
@@ -46926,12 +47171,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2750
+size: 2774
 location: clients/tests/test-client.py:1095:test_004()/832
 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2569 bytes
+stdout: 2593 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -46972,6 +47217,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
@@ -47092,12 +47338,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2851
+size: 2875
 location: clients/tests/test-client.py:1099:test_004()/835
 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: 2542 bytes
+stdout: 2566 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -47138,6 +47384,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
@@ -47192,12 +47439,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2888
+size: 2912
 location: clients/tests/test-client.py:1099:test_004()/836
 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: 2569 bytes
+stdout: 2593 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -47238,6 +47485,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
@@ -47352,12 +47600,12 @@ NEIGHBOR[2].SYSTEM-DESCRIPTION:Test system #3
 NEIGHBOR[2].SYSTEM-CAPABILITIES:40 (wlan-access-point,telephone)
 
 <<<
-size: 2392
+size: 2424
 location: clients/tests/test-client.py:1037:test_004()/839
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2218 bytes
+stdout: 2250 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47382,10 +47630,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -47406,7 +47655,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -47456,12 +47705,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2402
+size: 2434
 location: clients/tests/test-client.py:1037:test_004()/840
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2218 bytes
+stdout: 2250 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47486,10 +47735,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -47510,7 +47760,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -47560,12 +47810,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2392
+size: 2424
 location: clients/tests/test-client.py:1039:test_004()/841
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2218 bytes
+stdout: 2250 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47590,10 +47840,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -47614,7 +47865,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -47664,12 +47915,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2402
+size: 2434
 location: clients/tests/test-client.py:1039:test_004()/842
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2218 bytes
+stdout: 2250 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47694,10 +47945,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -47718,7 +47970,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -47768,12 +48020,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 1840
+size: 1872
 location: clients/tests/test-client.py:1042:test_004()/843
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1659 bytes
+stdout: 1691 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47798,10 +48050,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -47822,7 +48075,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -47852,12 +48105,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 1850
+size: 1882
 location: clients/tests/test-client.py:1042:test_004()/844
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1659 bytes
+stdout: 1691 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -47882,10 +48135,11 @@ connection.metered:unknown
 connection.lldp:default
 connection.mdns:-1
 connection.llmnr:-1
+connection.wait-device-timeout:-1
 ipv4.method:auto
 ipv4.dns:
 ipv4.dns-search:
-ipv4.dns-options: 
+ipv4.dns-options:
 ipv4.dns-priority:0
 ipv4.addresses:
 ipv4.gateway:
@@ -47906,7 +48160,7 @@ ipv4.dad-timeout:-1
 ipv6.method:auto
 ipv6.dns:
 ipv6.dns-search:
-ipv6.dns-options: 
+ipv6.dns-options:
 ipv6.dns-priority:0
 ipv6.addresses:
 ipv6.gateway:
@@ -48466,12 +48720,12 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 12244
+size: 12316
 location: clients/tests/test-client.py:1063:test_004()/855
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 12069 bytes
+stdout: 12141 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -48512,6 +48766,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
@@ -48737,6 +48992,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infra
@@ -48825,6 +49081,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 IP4.ADDRESS[1]:192.168.97.124/29
 IP4.ADDRESS[2]:192.168.76.154/18
 IP4.GATEWAY:
@@ -48855,12 +49112,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 12290
+size: 12362
 location: clients/tests/test-client.py:1063:test_004()/856
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 12105 bytes
+stdout: 12177 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -48901,6 +49158,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
@@ -49126,6 +49384,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infrastruktura
@@ -49214,6 +49473,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 IP4.ADDRESS[1]:192.168.97.124/29
 IP4.ADDRESS[2]:192.168.76.154/18
 IP4.GATEWAY:
@@ -49310,12 +49570,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 2938
+size: 2962
 location: clients/tests/test-client.py:1069:test_004()/859
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2758 bytes
+stdout: 2782 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -49356,6 +49616,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
@@ -49410,12 +49671,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2975
+size: 2999
 location: clients/tests/test-client.py:1069:test_004()/860
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2785 bytes
+stdout: 2809 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -49456,6 +49717,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
@@ -49510,12 +49772,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1220
+size: 1244
 location: clients/tests/test-client.py:1072:test_004()/861
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1005 bytes
+stdout: 1029 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -49553,14 +49815,15 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 
 <<<
-size: 1230
+size: 1254
 location: clients/tests/test-client.py:1072:test_004()/862
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1005 bytes
+stdout: 1029 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -49598,14 +49861,15 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 
 <<<
-size: 1220
+size: 1244
 location: clients/tests/test-client.py:1075:test_004()/863
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
-stdout: 1005 bytes
+stdout: 1029 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -49643,14 +49907,15 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 
 <<<
-size: 1230
+size: 1254
 location: clients/tests/test-client.py:1075:test_004()/864
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1005 bytes
+stdout: 1029 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -49688,6 +49953,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 
 <<<
 size: 687
@@ -50290,12 +50556,12 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 <<<
-size: 2941
+size: 2965
 location: clients/tests/test-client.py:1095:test_004()/879
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2758 bytes
+stdout: 2782 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -50336,6 +50602,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
@@ -50390,12 +50657,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 2978
+size: 3002
 location: clients/tests/test-client.py:1095:test_004()/880
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2785 bytes
+stdout: 2809 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -50436,6 +50703,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
@@ -50556,12 +50824,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 3079
+size: 3103
 location: clients/tests/test-client.py:1099:test_004()/883
 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: 2758 bytes
+stdout: 2782 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -50602,6 +50870,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
@@ -50656,12 +50925,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 3116
+size: 3140
 location: clients/tests/test-client.py:1099:test_004()/884
 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: 2785 bytes
+stdout: 2809 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -50702,6 +50971,7 @@ WIFI-PROPERTIES.AP:yes
 WIFI-PROPERTIES.ADHOC:yes
 WIFI-PROPERTIES.2GHZ:unknown
 WIFI-PROPERTIES.5GHZ:unknown
+WIFI-PROPERTIES.MESH:no
 AP[1].IN-USE: 
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py
index 08b0b951..ff5a3604 100755
--- a/clients/tests/test-client.py
+++ b/clients/tests/test-client.py
@@ -324,7 +324,7 @@ class NMStubServer:
             nmobj = self._conn_get_main_object(self._conn)
             if nmobj is not None:
                 break
-            if (NM.utils_get_timestamp_msec() - start) >= 2000:
+            if (NM.utils_get_timestamp_msec() - start) >= 4000:
                 p.stdin.close()
                 p.kill()
                 Util.popen_wait(p, 1000)
@@ -889,7 +889,7 @@ class TestNmcli(NmTestBase):
 
         replace_stdout.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'],
+        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.append((Util.memoize_nullary(lambda: self.srv.findConnectionUuid('ethernet')), 'UUID-ethernet-REPLACED-REPLACED-REPL'))
diff --git a/clients/tui/newt/nmt-newt-button-box.c b/clients/tui/newt/nmt-newt-button-box.c
index 02d8f5cb..79222c9a 100644
--- a/clients/tui/newt/nmt-newt-button-box.c
+++ b/clients/tui/newt/nmt-newt-button-box.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-button-box.h b/clients/tui/newt/nmt-newt-button-box.h
index 2dce1689..dc9eb2b3 100644
--- a/clients/tui/newt/nmt-newt-button-box.h
+++ b/clients/tui/newt/nmt-newt-button-box.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-button.c b/clients/tui/newt/nmt-newt-button.c
index c797e222..0a720be7 100644
--- a/clients/tui/newt/nmt-newt-button.c
+++ b/clients/tui/newt/nmt-newt-button.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-button.h b/clients/tui/newt/nmt-newt-button.h
index 646d0053..eb5e2a82 100644
--- a/clients/tui/newt/nmt-newt-button.h
+++ b/clients/tui/newt/nmt-newt-button.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-checkbox.c b/clients/tui/newt/nmt-newt-checkbox.c
index af7724b2..c5a648e3 100644
--- a/clients/tui/newt/nmt-newt-checkbox.c
+++ b/clients/tui/newt/nmt-newt-checkbox.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-checkbox.h b/clients/tui/newt/nmt-newt-checkbox.h
index e46e3ec2..5e1ba768 100644
--- a/clients/tui/newt/nmt-newt-checkbox.h
+++ b/clients/tui/newt/nmt-newt-checkbox.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-component.c b/clients/tui/newt/nmt-newt-component.c
index 034d6d2d..0123a72a 100644
--- a/clients/tui/newt/nmt-newt-component.c
+++ b/clients/tui/newt/nmt-newt-component.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-component.h b/clients/tui/newt/nmt-newt-component.h
index bf8f2bb8..f86c8cad 100644
--- a/clients/tui/newt/nmt-newt-component.h
+++ b/clients/tui/newt/nmt-newt-component.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-container.c b/clients/tui/newt/nmt-newt-container.c
index 40259025..a081f5c2 100644
--- a/clients/tui/newt/nmt-newt-container.c
+++ b/clients/tui/newt/nmt-newt-container.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-container.h b/clients/tui/newt/nmt-newt-container.h
index 32d6abcc..10fdc640 100644
--- a/clients/tui/newt/nmt-newt-container.h
+++ b/clients/tui/newt/nmt-newt-container.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-entry-numeric.c b/clients/tui/newt/nmt-newt-entry-numeric.c
index 92855fcb..032a6174 100644
--- a/clients/tui/newt/nmt-newt-entry-numeric.c
+++ b/clients/tui/newt/nmt-newt-entry-numeric.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-entry-numeric.h b/clients/tui/newt/nmt-newt-entry-numeric.h
index bfcabd88..d61bd146 100644
--- a/clients/tui/newt/nmt-newt-entry-numeric.h
+++ b/clients/tui/newt/nmt-newt-entry-numeric.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-entry.c b/clients/tui/newt/nmt-newt-entry.c
index 90c2e467..4d534ee5 100644
--- a/clients/tui/newt/nmt-newt-entry.c
+++ b/clients/tui/newt/nmt-newt-entry.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-entry.h b/clients/tui/newt/nmt-newt-entry.h
index 36bd9d51..628d733b 100644
--- a/clients/tui/newt/nmt-newt-entry.h
+++ b/clients/tui/newt/nmt-newt-entry.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-form.c b/clients/tui/newt/nmt-newt-form.c
index cd87a216..a8b53eef 100644
--- a/clients/tui/newt/nmt-newt-form.c
+++ b/clients/tui/newt/nmt-newt-form.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-form.h b/clients/tui/newt/nmt-newt-form.h
index 2cae5b5e..114d5fbc 100644
--- a/clients/tui/newt/nmt-newt-form.h
+++ b/clients/tui/newt/nmt-newt-form.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-grid.c b/clients/tui/newt/nmt-newt-grid.c
index e6c487f5..f9ebd66f 100644
--- a/clients/tui/newt/nmt-newt-grid.c
+++ b/clients/tui/newt/nmt-newt-grid.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-grid.h b/clients/tui/newt/nmt-newt-grid.h
index 11bfdec3..2f92f199 100644
--- a/clients/tui/newt/nmt-newt-grid.h
+++ b/clients/tui/newt/nmt-newt-grid.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-hacks.c b/clients/tui/newt/nmt-newt-hacks.c
index 5f69643a..67db7379 100644
--- a/clients/tui/newt/nmt-newt-hacks.c
+++ b/clients/tui/newt/nmt-newt-hacks.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-hacks.h b/clients/tui/newt/nmt-newt-hacks.h
index d4eb3fd2..ec692895 100644
--- a/clients/tui/newt/nmt-newt-hacks.h
+++ b/clients/tui/newt/nmt-newt-hacks.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-label.c b/clients/tui/newt/nmt-newt-label.c
index 63bd28da..0f510393 100644
--- a/clients/tui/newt/nmt-newt-label.c
+++ b/clients/tui/newt/nmt-newt-label.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-label.h b/clients/tui/newt/nmt-newt-label.h
index ef894d91..d55a2c48 100644
--- a/clients/tui/newt/nmt-newt-label.h
+++ b/clients/tui/newt/nmt-newt-label.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-listbox.c b/clients/tui/newt/nmt-newt-listbox.c
index 4f8120f1..9edb5b31 100644
--- a/clients/tui/newt/nmt-newt-listbox.c
+++ b/clients/tui/newt/nmt-newt-listbox.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-listbox.h b/clients/tui/newt/nmt-newt-listbox.h
index eba17a7c..331738ab 100644
--- a/clients/tui/newt/nmt-newt-listbox.h
+++ b/clients/tui/newt/nmt-newt-listbox.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-popup.c b/clients/tui/newt/nmt-newt-popup.c
index e171e153..54e4c2a7 100644
--- a/clients/tui/newt/nmt-newt-popup.c
+++ b/clients/tui/newt/nmt-newt-popup.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-popup.h b/clients/tui/newt/nmt-newt-popup.h
index be2bc34c..7c0f120c 100644
--- a/clients/tui/newt/nmt-newt-popup.h
+++ b/clients/tui/newt/nmt-newt-popup.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-section.c b/clients/tui/newt/nmt-newt-section.c
index 9b7e44e4..6f8064ad 100644
--- a/clients/tui/newt/nmt-newt-section.c
+++ b/clients/tui/newt/nmt-newt-section.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-section.h b/clients/tui/newt/nmt-newt-section.h
index 569e86e5..9cb163d8 100644
--- a/clients/tui/newt/nmt-newt-section.h
+++ b/clients/tui/newt/nmt-newt-section.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-separator.c b/clients/tui/newt/nmt-newt-separator.c
index 0317069a..93a8771a 100644
--- a/clients/tui/newt/nmt-newt-separator.c
+++ b/clients/tui/newt/nmt-newt-separator.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-separator.h b/clients/tui/newt/nmt-newt-separator.h
index 71503099..73442b29 100644
--- a/clients/tui/newt/nmt-newt-separator.h
+++ b/clients/tui/newt/nmt-newt-separator.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-stack.c b/clients/tui/newt/nmt-newt-stack.c
index da4beb8b..ec68687d 100644
--- a/clients/tui/newt/nmt-newt-stack.c
+++ b/clients/tui/newt/nmt-newt-stack.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-stack.h b/clients/tui/newt/nmt-newt-stack.h
index c9bb5a07..e088ae45 100644
--- a/clients/tui/newt/nmt-newt-stack.h
+++ b/clients/tui/newt/nmt-newt-stack.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-textbox.c b/clients/tui/newt/nmt-newt-textbox.c
index 0850e60c..00d2b5cc 100644
--- a/clients/tui/newt/nmt-newt-textbox.c
+++ b/clients/tui/newt/nmt-newt-textbox.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-textbox.h b/clients/tui/newt/nmt-newt-textbox.h
index 31a159e2..563ffe5c 100644
--- a/clients/tui/newt/nmt-newt-textbox.h
+++ b/clients/tui/newt/nmt-newt-textbox.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-toggle-button.c b/clients/tui/newt/nmt-newt-toggle-button.c
index 5397bfec..da7624d4 100644
--- a/clients/tui/newt/nmt-newt-toggle-button.c
+++ b/clients/tui/newt/nmt-newt-toggle-button.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-toggle-button.h b/clients/tui/newt/nmt-newt-toggle-button.h
index 69c0b7d1..f5b88139 100644
--- a/clients/tui/newt/nmt-newt-toggle-button.h
+++ b/clients/tui/newt/nmt-newt-toggle-button.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-types.h b/clients/tui/newt/nmt-newt-types.h
index af550ca0..583c8ff8 100644
--- a/clients/tui/newt/nmt-newt-types.h
+++ b/clients/tui/newt/nmt-newt-types.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c
index 475faf7e..90388ff1 100644
--- a/clients/tui/newt/nmt-newt-utils.c
+++ b/clients/tui/newt/nmt-newt-utils.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-utils.h b/clients/tui/newt/nmt-newt-utils.h
index 49d717d2..4aa78d72 100644
--- a/clients/tui/newt/nmt-newt-utils.h
+++ b/clients/tui/newt/nmt-newt-utils.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-widget.c b/clients/tui/newt/nmt-newt-widget.c
index 94f3011e..050e94cb 100644
--- a/clients/tui/newt/nmt-newt-widget.c
+++ b/clients/tui/newt/nmt-newt-widget.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt-widget.h b/clients/tui/newt/nmt-newt-widget.h
index 34ce943c..f2424282 100644
--- a/clients/tui/newt/nmt-newt-widget.h
+++ b/clients/tui/newt/nmt-newt-widget.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/newt/nmt-newt.h b/clients/tui/newt/nmt-newt.h
index 6a9c8d9f..8ec9c895 100644
--- a/clients/tui/newt/nmt-newt.h
+++ b/clients/tui/newt/nmt-newt.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c
index df6387c3..f9c07ccd 100644
--- a/clients/tui/nm-editor-bindings.c
+++ b/clients/tui/nm-editor-bindings.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nm-editor-bindings.h b/clients/tui/nm-editor-bindings.h
index 174fb929..3eee05ce 100644
--- a/clients/tui/nm-editor-bindings.h
+++ b/clients/tui/nm-editor-bindings.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c
index 9dd95c08..9698c1d7 100644
--- a/clients/tui/nm-editor-utils.c
+++ b/clients/tui/nm-editor-utils.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -69,14 +68,23 @@ bond_connection_setup_func (NMConnection        *connection,
                             NMSetting           *s_hw)
 {
 	NMSettingBond *s_bond = NM_SETTING_BOND (s_hw);
-	const char **options, *def, *cur;
-	int i;
-
-	options = nm_setting_bond_get_valid_options (s_bond);
-	for (i = 0; options[i]; i++) {
+	const char *def, *cur;
+	static const char *const options[] = {
+		NM_SETTING_BOND_OPTION_ARP_INTERVAL,
+		NM_SETTING_BOND_OPTION_ARP_IP_TARGET,
+		NM_SETTING_BOND_OPTION_DOWNDELAY,
+		NM_SETTING_BOND_OPTION_MIIMON,
+		NM_SETTING_BOND_OPTION_MODE,
+		NM_SETTING_BOND_OPTION_PRIMARY,
+		NM_SETTING_BOND_OPTION_UPDELAY,
+	};
+	guint i;
+
+	/* Only add options supported by the UI */
+	for (i = 0; i < G_N_ELEMENTS (options); i++) {
 		def = nm_setting_bond_get_option_default (s_bond, options[i]);
 		cur = nm_setting_bond_get_option_by_name (s_bond, options[i]);
-		if (g_strcmp0 (def, cur) != 0)
+		if (!nm_streq0 (def, cur))
 			nm_setting_bond_add_option (s_bond, options[i], def);
 	}
 }
diff --git a/clients/tui/nm-editor-utils.h b/clients/tui/nm-editor-utils.h
index e15cc5e8..3631e18f 100644
--- a/clients/tui/nm-editor-utils.h
+++ b/clients/tui/nm-editor-utils.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-address-list.c b/clients/tui/nmt-address-list.c
index ae1a6b2f..d7b4f496 100644
--- a/clients/tui/nmt-address-list.c
+++ b/clients/tui/nmt-address-list.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-address-list.h b/clients/tui/nmt-address-list.h
index f82f2181..904353ca 100644
--- a/clients/tui/nmt-address-list.h
+++ b/clients/tui/nmt-address-list.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-connect-connection-list.c b/clients/tui/nmt-connect-connection-list.c
index ae633ec0..630d5760 100644
--- a/clients/tui/nmt-connect-connection-list.c
+++ b/clients/tui/nmt-connect-connection-list.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-connect-connection-list.h b/clients/tui/nmt-connect-connection-list.h
index bf4721b9..f39d454c 100644
--- a/clients/tui/nmt-connect-connection-list.h
+++ b/clients/tui/nmt-connect-connection-list.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c
index 43fbbc16..09544da2 100644
--- a/clients/tui/nmt-device-entry.c
+++ b/clients/tui/nmt-device-entry.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-device-entry.h b/clients/tui/nmt-device-entry.h
index 9c288822..3bc2a92d 100644
--- a/clients/tui/nmt-device-entry.h
+++ b/clients/tui/nmt-device-entry.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-edit-connection-list.c b/clients/tui/nmt-edit-connection-list.c
index 356c0b4b..314d902b 100644
--- a/clients/tui/nmt-edit-connection-list.c
+++ b/clients/tui/nmt-edit-connection-list.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-edit-connection-list.h b/clients/tui/nmt-edit-connection-list.h
index cb02ea4b..45ee010f 100644
--- a/clients/tui/nmt-edit-connection-list.h
+++ b/clients/tui/nmt-edit-connection-list.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-editor-grid.c b/clients/tui/nmt-editor-grid.c
index bb3e78b8..38b220ba 100644
--- a/clients/tui/nmt-editor-grid.c
+++ b/clients/tui/nmt-editor-grid.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-editor-grid.h b/clients/tui/nmt-editor-grid.h
index 48676896..3999506b 100644
--- a/clients/tui/nmt-editor-grid.h
+++ b/clients/tui/nmt-editor-grid.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-editor-page-device.c b/clients/tui/nmt-editor-page-device.c
index d303604a..effd5f3c 100644
--- a/clients/tui/nmt-editor-page-device.c
+++ b/clients/tui/nmt-editor-page-device.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-editor-page-device.h b/clients/tui/nmt-editor-page-device.h
index 75aecd01..37b41adc 100644
--- a/clients/tui/nmt-editor-page-device.h
+++ b/clients/tui/nmt-editor-page-device.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-editor-page.c b/clients/tui/nmt-editor-page.c
index 99475a91..3019d710 100644
--- a/clients/tui/nmt-editor-page.c
+++ b/clients/tui/nmt-editor-page.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-editor-page.h b/clients/tui/nmt-editor-page.h
index 687f84a7..e885692c 100644
--- a/clients/tui/nmt-editor-page.h
+++ b/clients/tui/nmt-editor-page.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-editor-section.c b/clients/tui/nmt-editor-section.c
index e7e51913..28d793bf 100644
--- a/clients/tui/nmt-editor-section.c
+++ b/clients/tui/nmt-editor-section.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-editor-section.h b/clients/tui/nmt-editor-section.h
index 3c2537be..ee4175e0 100644
--- a/clients/tui/nmt-editor-section.h
+++ b/clients/tui/nmt-editor-section.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-editor.c b/clients/tui/nmt-editor.c
index c28288a2..49f0615c 100644
--- a/clients/tui/nmt-editor.c
+++ b/clients/tui/nmt-editor.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-editor.h b/clients/tui/nmt-editor.h
index ea51723e..39289da1 100644
--- a/clients/tui/nmt-editor.h
+++ b/clients/tui/nmt-editor.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-ip-entry.c b/clients/tui/nmt-ip-entry.c
index 66838680..b3b2209b 100644
--- a/clients/tui/nmt-ip-entry.c
+++ b/clients/tui/nmt-ip-entry.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-ip-entry.h b/clients/tui/nmt-ip-entry.h
index 2338a873..0dd4145e 100644
--- a/clients/tui/nmt-ip-entry.h
+++ b/clients/tui/nmt-ip-entry.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-mac-entry.c b/clients/tui/nmt-mac-entry.c
index 6c775bc5..f9dc26d0 100644
--- a/clients/tui/nmt-mac-entry.c
+++ b/clients/tui/nmt-mac-entry.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-mac-entry.h b/clients/tui/nmt-mac-entry.h
index 68d9a208..d755494f 100644
--- a/clients/tui/nmt-mac-entry.h
+++ b/clients/tui/nmt-mac-entry.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-mtu-entry.c b/clients/tui/nmt-mtu-entry.c
index 3909c836..82cbe605 100644
--- a/clients/tui/nmt-mtu-entry.c
+++ b/clients/tui/nmt-mtu-entry.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-mtu-entry.h b/clients/tui/nmt-mtu-entry.h
index b7b2cf46..e13078da 100644
--- a/clients/tui/nmt-mtu-entry.h
+++ b/clients/tui/nmt-mtu-entry.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c
index 1629c8b0..11a68eaa 100644
--- a/clients/tui/nmt-page-bond.c
+++ b/clients/tui/nmt-page-bond.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -46,6 +45,9 @@ typedef enum {
 typedef struct {
 	NmtSlaveList *slaves;
 
+	/* Note: when adding new options to the UI also ensure they are
+	 * initialized in bond_connection_setup_func()
+	 */
 	NmtNewtPopup *mode;
 	NmtNewtEntry *primary;
 	NmtNewtPopup *monitoring;
diff --git a/clients/tui/nmt-page-bond.h b/clients/tui/nmt-page-bond.h
index d9b071ef..a21bad9c 100644
--- a/clients/tui/nmt-page-bond.h
+++ b/clients/tui/nmt-page-bond.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-bridge-port.c b/clients/tui/nmt-page-bridge-port.c
index 47e584a1..e014641d 100644
--- a/clients/tui/nmt-page-bridge-port.c
+++ b/clients/tui/nmt-page-bridge-port.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-bridge-port.h b/clients/tui/nmt-page-bridge-port.h
index 95689fff..5bda6286 100644
--- a/clients/tui/nmt-page-bridge-port.h
+++ b/clients/tui/nmt-page-bridge-port.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-bridge.c b/clients/tui/nmt-page-bridge.c
index cf141f59..1140e78f 100644
--- a/clients/tui/nmt-page-bridge.c
+++ b/clients/tui/nmt-page-bridge.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-bridge.h b/clients/tui/nmt-page-bridge.h
index 21d850af..8498808e 100644
--- a/clients/tui/nmt-page-bridge.h
+++ b/clients/tui/nmt-page-bridge.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-dsl.c b/clients/tui/nmt-page-dsl.c
index cd8175b9..2e7b3d82 100644
--- a/clients/tui/nmt-page-dsl.c
+++ b/clients/tui/nmt-page-dsl.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-dsl.h b/clients/tui/nmt-page-dsl.h
index aa436e71..3d078a85 100644
--- a/clients/tui/nmt-page-dsl.h
+++ b/clients/tui/nmt-page-dsl.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-ethernet.c b/clients/tui/nmt-page-ethernet.c
index 6b924327..9b7b6af1 100644
--- a/clients/tui/nmt-page-ethernet.c
+++ b/clients/tui/nmt-page-ethernet.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-ethernet.h b/clients/tui/nmt-page-ethernet.h
index 56d917e1..ba0816e0 100644
--- a/clients/tui/nmt-page-ethernet.h
+++ b/clients/tui/nmt-page-ethernet.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-infiniband.c b/clients/tui/nmt-page-infiniband.c
index 91445f75..198c488b 100644
--- a/clients/tui/nmt-page-infiniband.c
+++ b/clients/tui/nmt-page-infiniband.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-infiniband.h b/clients/tui/nmt-page-infiniband.h
index e2e0fbbc..7223fc60 100644
--- a/clients/tui/nmt-page-infiniband.h
+++ b/clients/tui/nmt-page-infiniband.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-ip-tunnel.c b/clients/tui/nmt-page-ip-tunnel.c
index 563abf76..c6301443 100644
--- a/clients/tui/nmt-page-ip-tunnel.c
+++ b/clients/tui/nmt-page-ip-tunnel.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-ip-tunnel.h b/clients/tui/nmt-page-ip-tunnel.h
index 5cbb87a7..99f60b33 100644
--- a/clients/tui/nmt-page-ip-tunnel.h
+++ b/clients/tui/nmt-page-ip-tunnel.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-ip4.c b/clients/tui/nmt-page-ip4.c
index cfeb2d1e..825fd4fd 100644
--- a/clients/tui/nmt-page-ip4.c
+++ b/clients/tui/nmt-page-ip4.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-ip4.h b/clients/tui/nmt-page-ip4.h
index f120e57d..b61af4d8 100644
--- a/clients/tui/nmt-page-ip4.h
+++ b/clients/tui/nmt-page-ip4.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-ip6.c b/clients/tui/nmt-page-ip6.c
index 2444a93d..a923bd98 100644
--- a/clients/tui/nmt-page-ip6.c
+++ b/clients/tui/nmt-page-ip6.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -40,6 +39,7 @@ static NmtNewtPopupEntry ip6methods[] = {
 	{ N_("Automatic (DHCP-only)"), NM_SETTING_IP6_CONFIG_METHOD_DHCP },
 	{ N_("Link-Local"), NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL },
 	{ N_("Manual"), NM_SETTING_IP6_CONFIG_METHOD_MANUAL },
+	{ N_("Disabled"), NM_SETTING_IP6_CONFIG_METHOD_DISABLED },
 	{ NULL, NULL }
 };
 
diff --git a/clients/tui/nmt-page-ip6.h b/clients/tui/nmt-page-ip6.h
index 3a471447..52e7c556 100644
--- a/clients/tui/nmt-page-ip6.h
+++ b/clients/tui/nmt-page-ip6.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-ppp.c b/clients/tui/nmt-page-ppp.c
index 64f4b9b8..1c1ceeea 100644
--- a/clients/tui/nmt-page-ppp.c
+++ b/clients/tui/nmt-page-ppp.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-ppp.h b/clients/tui/nmt-page-ppp.h
index 634323d4..17490c47 100644
--- a/clients/tui/nmt-page-ppp.h
+++ b/clients/tui/nmt-page-ppp.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-team-port.c b/clients/tui/nmt-page-team-port.c
index 0d40373d..f5502ee8 100644
--- a/clients/tui/nmt-page-team-port.c
+++ b/clients/tui/nmt-page-team-port.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-team-port.h b/clients/tui/nmt-page-team-port.h
index 75c42849..f15a347e 100644
--- a/clients/tui/nmt-page-team-port.h
+++ b/clients/tui/nmt-page-team-port.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-team.c b/clients/tui/nmt-page-team.c
index cfe12703..39f0a724 100644
--- a/clients/tui/nmt-page-team.c
+++ b/clients/tui/nmt-page-team.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-team.h b/clients/tui/nmt-page-team.h
index a04c2a95..8d8b58e6 100644
--- a/clients/tui/nmt-page-team.h
+++ b/clients/tui/nmt-page-team.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-vlan.c b/clients/tui/nmt-page-vlan.c
index 5ff3fa58..2e3bfee4 100644
--- a/clients/tui/nmt-page-vlan.c
+++ b/clients/tui/nmt-page-vlan.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-vlan.h b/clients/tui/nmt-page-vlan.h
index 043c3bc0..d617aa5f 100644
--- a/clients/tui/nmt-page-vlan.h
+++ b/clients/tui/nmt-page-vlan.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-wifi.c b/clients/tui/nmt-page-wifi.c
index 00439c19..a104e760 100644
--- a/clients/tui/nmt-page-wifi.c
+++ b/clients/tui/nmt-page-wifi.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-page-wifi.h b/clients/tui/nmt-page-wifi.h
index ed16bdc5..bc45e78b 100644
--- a/clients/tui/nmt-page-wifi.h
+++ b/clients/tui/nmt-page-wifi.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-password-dialog.c b/clients/tui/nmt-password-dialog.c
index 16920fcf..6c6e8a9e 100644
--- a/clients/tui/nmt-password-dialog.c
+++ b/clients/tui/nmt-password-dialog.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-password-dialog.h b/clients/tui/nmt-password-dialog.h
index efdab7ec..dc91157a 100644
--- a/clients/tui/nmt-password-dialog.h
+++ b/clients/tui/nmt-password-dialog.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-password-fields.c b/clients/tui/nmt-password-fields.c
index 013d9695..80971900 100644
--- a/clients/tui/nmt-password-fields.c
+++ b/clients/tui/nmt-password-fields.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-password-fields.h b/clients/tui/nmt-password-fields.h
index 6a6017ba..b72ec8dc 100644
--- a/clients/tui/nmt-password-fields.h
+++ b/clients/tui/nmt-password-fields.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-route-editor.c b/clients/tui/nmt-route-editor.c
index 964e3ff4..4487047b 100644
--- a/clients/tui/nmt-route-editor.c
+++ b/clients/tui/nmt-route-editor.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-route-editor.h b/clients/tui/nmt-route-editor.h
index d83523bc..03590c83 100644
--- a/clients/tui/nmt-route-editor.h
+++ b/clients/tui/nmt-route-editor.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-route-entry.c b/clients/tui/nmt-route-entry.c
index 109759cc..586a262e 100644
--- a/clients/tui/nmt-route-entry.c
+++ b/clients/tui/nmt-route-entry.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-route-entry.h b/clients/tui/nmt-route-entry.h
index fa76fa7b..866b26ae 100644
--- a/clients/tui/nmt-route-entry.h
+++ b/clients/tui/nmt-route-entry.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-route-table.c b/clients/tui/nmt-route-table.c
index c2e55542..ca066e6e 100644
--- a/clients/tui/nmt-route-table.c
+++ b/clients/tui/nmt-route-table.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-route-table.h b/clients/tui/nmt-route-table.h
index 1aa92e6b..3a7ebe13 100644
--- a/clients/tui/nmt-route-table.h
+++ b/clients/tui/nmt-route-table.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-slave-list.c b/clients/tui/nmt-slave-list.c
index a2c088b0..29b4c909 100644
--- a/clients/tui/nmt-slave-list.c
+++ b/clients/tui/nmt-slave-list.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-slave-list.h b/clients/tui/nmt-slave-list.h
index e0d836c7..2487cf43 100644
--- a/clients/tui/nmt-slave-list.h
+++ b/clients/tui/nmt-slave-list.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-utils.c b/clients/tui/nmt-utils.c
index 96b97158..eaa091b7 100644
--- a/clients/tui/nmt-utils.c
+++ b/clients/tui/nmt-utils.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-utils.h b/clients/tui/nmt-utils.h
index 067c6512..04bb8435 100644
--- a/clients/tui/nmt-utils.h
+++ b/clients/tui/nmt-utils.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-widget-list.c b/clients/tui/nmt-widget-list.c
index ad35f3de..6f1c744c 100644
--- a/clients/tui/nmt-widget-list.c
+++ b/clients/tui/nmt-widget-list.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmt-widget-list.h b/clients/tui/nmt-widget-list.h
index b7bf0151..af200e8c 100644
--- a/clients/tui/nmt-widget-list.h
+++ b/clients/tui/nmt-widget-list.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c
index e43c22e4..6a63b28f 100644
--- a/clients/tui/nmtui-connect.c
+++ b/clients/tui/nmtui-connect.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmtui-connect.h b/clients/tui/nmtui-connect.h
index 569d191a..158e05ae 100644
--- a/clients/tui/nmtui-connect.h
+++ b/clients/tui/nmtui-connect.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmtui-edit.c b/clients/tui/nmtui-edit.c
index 657724e3..5eeb305b 100644
--- a/clients/tui/nmtui-edit.c
+++ b/clients/tui/nmtui-edit.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmtui-edit.h b/clients/tui/nmtui-edit.h
index 041e7859..c2b0c3ee 100644
--- a/clients/tui/nmtui-edit.h
+++ b/clients/tui/nmtui-edit.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmtui-hostname.c b/clients/tui/nmtui-hostname.c
index 2c4fb28e..27e06a5d 100644
--- a/clients/tui/nmtui-hostname.c
+++ b/clients/tui/nmtui-hostname.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmtui-hostname.h b/clients/tui/nmtui-hostname.h
index 772d9a72..48d388a3 100644
--- a/clients/tui/nmtui-hostname.h
+++ b/clients/tui/nmtui-hostname.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c
index aacc07cb..ee246f96 100644
--- a/clients/tui/nmtui.c
+++ b/clients/tui/nmtui.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/clients/tui/nmtui.h b/clients/tui/nmtui.h
index 5ef8e82a..acaa40af 100644
--- a/clients/tui/nmtui.h
+++ b/clients/tui/nmtui.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as