New upstream version 1.58~rc1 upstream/1.58_rc1

215 files changed, 13005 insertions, 8400 deletions

diff --git a/src/c-list/.github/workflows/ci.yml b/src/c-list/.github/workflows/ci.yml
index 00bca960..31c0548f 100644
--- a/src/c-list/.github/workflows/ci.yml
+++ b/src/c-list/.github/workflows/ci.yml
@@ -1,10 +1,15 @@
-name: Continuous Integration
+name: "Continuous Integration"
 
 on:
-  push:
   pull_request:
-  schedule:
-  - cron:  '0 0 * * *'
+  push:
+    branches-ignore: ["pr/**"]
+    tags: ["**"]
+  workflow_dispatch:
+
+defaults:
+  run:
+    shell: "bash"
 
 jobs:
   ci-linux:
@@ -23,10 +28,15 @@ jobs:
       cabuild_ref: "v1"
       linux: false
       macos: true
-  ci-windows:
-    name: Windows CI
-    uses: bus1/cabuild/.github/workflows/ci-c-util.yml@v1
-    with:
-      cabuild_ref: "v1"
-      linux: false
-      windows: true
+#
+# Windows CI is disabled, as it constantly causes headaches and no-one
+# takes care of them. If you need c-stdaux on Windows, feel free to help out.
+#
+#  ci-windows:
+#    name: Windows CI
+#    uses: bus1/cabuild/.github/workflows/ci-c-util.yml@v1
+#    with:
+#      cabuild_ref: "v1"
+#      linux: false
+#      windows: true
+#
diff --git a/src/c-rbtree/.github/workflows/ci.yml b/src/c-rbtree/.github/workflows/ci.yml
index 489433c2..ac00c843 100644
--- a/src/c-rbtree/.github/workflows/ci.yml
+++ b/src/c-rbtree/.github/workflows/ci.yml
@@ -1,10 +1,15 @@
-name: Continuous Integration
+name: "Continuous Integration"
 
 on:
-  push:
   pull_request:
-  schedule:
-  - cron:  '0 0 * * *'
+  push:
+    branches-ignore: ["pr/**"]
+    tags: ["**"]
+  workflow_dispatch:
+
+defaults:
+  run:
+    shell: "bash"
 
 jobs:
   ci-linux:
diff --git a/src/c-rbtree/NEWS.md b/src/c-rbtree/NEWS.md
index 71415f67..f3829b7d 100644
--- a/src/c-rbtree/NEWS.md
+++ b/src/c-rbtree/NEWS.md
@@ -1,5 +1,19 @@
 # c-rbtree - Intrusive Red-Black Tree Collection
 
+## CHANGES WITH 3.2.0:
+
+        * Use new c-stdaux variables to allow dynamic-linking and fix
+          problems with pkg-config and variables including dashes.
+
+        * Add hawmoth/sphinx based documentation.
+
+        * Adjust to the new c-util CI workflows. This simplifies the entire
+          CI system significantly.
+
+        Contributions from: David Rheinsberg
+
+        - Dußlingen, 2023-12-12
+
 ## CHANGES WITH 3.1.0:
 
         * Add 'ptrace' build option to enable running tests using 'ptrace'
diff --git a/src/c-rbtree/meson.build b/src/c-rbtree/meson.build
index 3e7af9ce..7eb415ae 100644
--- a/src/c-rbtree/meson.build
+++ b/src/c-rbtree/meson.build
@@ -6,7 +6,7 @@ project(
         ],
         license: 'Apache',
         meson_version: '>=0.60.0',
-        version: '3.1.0',
+        version: '3.2.0',
 )
 major = meson.project_version().split('.')[0]
 project_description = 'Intrusive Red-Black Tree Collection'
@@ -14,7 +14,7 @@ project_description = 'Intrusive Red-Black Tree Collection'
 mod_pkgconfig = import('pkgconfig')
 use_ptrace = get_option('ptrace')
 
-dep_cstdaux = dependency('libcstdaux-1')
+dep_cstdaux = dependency('libcstdaux-1', version: '>=1.5.0')
 add_project_arguments(dep_cstdaux.get_variable('cflags').split(' '), language: 'c')
 
 subdir('src')
diff --git a/src/c-rbtree/src/c-rbtree.h b/src/c-rbtree/src/c-rbtree.h
index 2d9a1d20..74a402ab 100644
--- a/src/c-rbtree/src/c-rbtree.h
+++ b/src/c-rbtree/src/c-rbtree.h
@@ -71,9 +71,9 @@ typedef struct CRBTree CRBTree;
  * or :c:macro:`C_RBNODE_INIT()`.
  */
 struct CRBNode {
-        /** Anonymous union for alignment guarantees */
+        /* Anonymous union for alignment guarantees */
         union {
-                /** Internal state encoding the parent pointer and state */
+                /* Internal state encoding the parent pointer and state */
                 unsigned long __parent_and_flags;
                 /* enforce >=4-byte alignment for @__parent_and_flags */
                 alignas(4) unsigned char __align_dummy;
diff --git a/src/c-rbtree/.readthedocs.yaml b/src/c-rbtree/src/docs/.readthedocs.yaml
index fd02d297..8a63c034 100644
--- a/src/c-rbtree/.readthedocs.yaml
+++ b/src/c-rbtree/src/docs/.readthedocs.yaml
@@ -4,11 +4,13 @@ version: 2
 
 build:
   apt_packages:
-  - "clang"
+  - "libclang-14-dev"
   jobs:
     pre_build:
     - meson subprojects download
-  os: "ubuntu-22.04"
+    post_install:
+    - python -m pip install --upgrade --no-cache-dir clang==14.0.6
+  os: "ubuntu-lts-latest"
   tools:
     python: "3"
 
@@ -17,7 +19,6 @@ formats: "all"
 python:
   install:
   - requirements: "src/docs/requirements.txt"
-  system_packages: true
 
 sphinx:
   configuration: "src/docs/conf.py"
diff --git a/src/c-rbtree/src/docs/conf.py b/src/c-rbtree/src/docs/conf.py
index f804486c..f945ead0 100644
--- a/src/c-rbtree/src/docs/conf.py
+++ b/src/c-rbtree/src/docs/conf.py
@@ -25,20 +25,17 @@ capidocs.kerneldoc.hawkmoth_conf()
 exclude_patterns = []
 
 extensions = [
+    'capidocs.kerneldoc',
     'hawkmoth',
 ]
 
 # Hawkmoth Options
 
-cautodoc_clang = capidocs.kerneldoc.hawkmoth_include_args()
-cautodoc_clang += ["-I" + os.path.abspath("..")]
-cautodoc_clang += capidocs.kerneldoc.hawkmoth_glob_includes("../../subprojects", "libc*/src")
+hawkmoth_clang = capidocs.kerneldoc.hawkmoth_include_args()
+hawkmoth_clang += ["-I" + os.path.abspath("..")]
+hawkmoth_clang += capidocs.kerneldoc.hawkmoth_glob_includes("../../subprojects", "libc*/src")
 
-cautodoc_root = os.path.abspath('..')
-
-cautodoc_transformations = {
-    'kerneldoc': capidocs.kerneldoc.hawkmoth_converter,
-}
+hawkmoth_root = os.path.abspath('..')
 
 # HTML Options
 
diff --git a/src/c-rbtree/src/docs/requirements.txt b/src/c-rbtree/src/docs/requirements.txt
index 77973ebd..e2ee14cb 100644
--- a/src/c-rbtree/src/docs/requirements.txt
+++ b/src/c-rbtree/src/docs/requirements.txt
@@ -1,5 +1,5 @@
-c-apidocs>=0.0.3
-clang>=6
-hawkmoth>=0.7
+c-apidocs>=1.0.0
+hawkmoth>=0.20
 meson>=0.60
 ninja>=1.10
+sphinx-rtd-theme>=3.0.0
diff --git a/src/c-rbtree/src/meson.build b/src/c-rbtree/src/meson.build
index 94612031..cd7542be 100644
--- a/src/c-rbtree/src/meson.build
+++ b/src/c-rbtree/src/meson.build
@@ -19,7 +19,7 @@ libcrbtree_both = both_libraries(
         ],
         dependencies: libcrbtree_deps,
         install: not meson.is_subproject(),
-        link_args: dep_cstdaux.get_variable('version-scripts') == 'yes' ? [
+        link_args: dep_cstdaux.get_variable('version_scripts') == 'yes' ? [
                 '-Wl,--version-script=@0@'.format(libcrbtree_symfile),
         ] : [],
         link_depends: libcrbtree_symfile,
diff --git a/src/c-siphash/.github/workflows/ci.yml b/src/c-siphash/.github/workflows/ci.yml
index 00bca960..92d40131 100644
--- a/src/c-siphash/.github/workflows/ci.yml
+++ b/src/c-siphash/.github/workflows/ci.yml
@@ -1,10 +1,15 @@
-name: Continuous Integration
+name: "Continuous Integration"
 
 on:
-  push:
   pull_request:
-  schedule:
-  - cron:  '0 0 * * *'
+  push:
+    branches-ignore: ["pr/**"]
+    tags: ["**"]
+  workflow_dispatch:
+
+defaults:
+  run:
+    shell: "bash"
 
 jobs:
   ci-linux:
diff --git a/src/c-siphash/NEWS.md b/src/c-siphash/NEWS.md
index a0227c04..0b9e272d 100644
--- a/src/c-siphash/NEWS.md
+++ b/src/c-siphash/NEWS.md
@@ -1,5 +1,19 @@
 # c-siphash - Streaming-capable SipHash Implementation
 
+## CHANGES WITH 1.1.0:
+
+        * Support MacOS and Windows builds.
+
+        * Support SipHash variants other than SipHash24 by parameterizing
+          the N and M variables of SipHash.
+
+        * Update the c-stdaux dependency to provide the new build variables
+          and thus allow linking through pkg-config.
+
+        Contributions from: Daniele Nicolodi, David Rheinsberg
+
+        - Dußlingen, 2023-12-12
+
 ## CHANGES WITH 1.0.0:
 
         * Initial release of c-siphash.
diff --git a/src/c-siphash/meson.build b/src/c-siphash/meson.build
index ffcb6a76..08389d97 100644
--- a/src/c-siphash/meson.build
+++ b/src/c-siphash/meson.build
@@ -6,14 +6,14 @@ project(
         ],
         license: 'Apache',
         meson_version: '>=0.60.0',
-        version: '1.0.0',
+        version: '1.1.0',
 )
 major = meson.project_version().split('.')[0]
 project_description = 'Streaming-capable SipHash Implementation'
 
 mod_pkgconfig = import('pkgconfig')
 
-dep_cstdaux = dependency('libcstdaux-1')
+dep_cstdaux = dependency('libcstdaux-1', version: '>=1.5.0')
 add_project_arguments(dep_cstdaux.get_variable('cflags').split(' '), language: 'c')
 
 subdir('src')
diff --git a/src/c-siphash/src/meson.build b/src/c-siphash/src/meson.build
index f2cc1864..1d322ce3 100644
--- a/src/c-siphash/src/meson.build
+++ b/src/c-siphash/src/meson.build
@@ -20,7 +20,7 @@ libcsiphash_both = both_libraries(
         ],
         dependencies: libcsiphash_deps,
         install: not meson.is_subproject(),
-        link_args: dep_cstdaux.get_variable('version-scripts') == 'yes' ? [
+        link_args: dep_cstdaux.get_variable('version_scripts') == 'yes' ? [
                 '-Wl,--version-script=@0@'.format(libcsiphash_symfile),
         ] : [],
         link_depends: libcsiphash_symfile,
diff --git a/src/c-stdaux/.github/workflows/ci.yml b/src/c-stdaux/.github/workflows/ci.yml
index 70a673f7..38676604 100644
--- a/src/c-stdaux/.github/workflows/ci.yml
+++ b/src/c-stdaux/.github/workflows/ci.yml
@@ -1,10 +1,15 @@
-name: Continuous Integration
+name: "Continuous Integration"
 
 on:
-  push:
   pull_request:
-  schedule:
-  - cron:  '0 0 * * *'
+  push:
+    branches-ignore: ["pr/**"]
+    tags: ["**"]
+  workflow_dispatch:
+
+defaults:
+  run:
+    shell: "bash"
 
 jobs:
   ci-linux:
@@ -23,13 +28,18 @@ jobs:
       cabuild_ref: "v1"
       linux: false
       macos: true
-  ci-windows:
-    name: Windows CI
-    uses: bus1/cabuild/.github/workflows/ci-c-util.yml@v1
-    with:
-      cabuild_ref: "v1"
-      linux: false
-      windows: true
+#
+# Windows CI is disabled, as it constantly causes headaches and no-one
+# takes care of them. If you need c-stdaux on Windows, feel free to help out.
+#
+#  ci-windows:
+#    name: Windows CI
+#    uses: bus1/cabuild/.github/workflows/ci-c-util.yml@v1
+#    with:
+#      cabuild_ref: "v1"
+#      linux: false
+#      windows: true
+#
   ci-docs:
     name: Documentation CI
     uses: bus1/cabuild/.github/workflows/ci-sphinx.yml@v1
diff --git a/src/c-stdaux/AUTHORS b/src/c-stdaux/AUTHORS
index 0f2a73fd..7d0e3c90 100644
--- a/src/c-stdaux/AUTHORS
+++ b/src/c-stdaux/AUTHORS
@@ -31,13 +31,16 @@ AUTHORS-LGPL:
 
 COPYRIGHT: (ordered alphabetically)
         Copyright (C) 2018-2022 Red Hat, Inc.
+        Copyright (C) 2022-2023 David Rheinsberg
 
 AUTHORS: (ordered alphabetically)
-        David Rheinsberg <david.rheinsberg@gmail.com>
+        Adrian Vovk <adrianvovk@gmail.com>
+        David Rheinsberg <david@readahead.eu>
         Evgeny Vereshchagin <evvers@ya.ru>
         Jan Engelhardt <jengelh@inai.de>
         Lorenzo Arena <lorenzo.arena@powersoft.com>
         Michele Dionisio <michele.dionisio@gmail.com>
+        Nikita Popov <npopov@redhat.com>
         Thomas Haller <thaller@redhat.com>
         Tom Gundersen <teg@jklm.no>
         Yuri Chornoivan <yurchor@ukr.net>
diff --git a/src/c-stdaux/NEWS.md b/src/c-stdaux/NEWS.md
index 8e7b3c71..823a584e 100644
--- a/src/c-stdaux/NEWS.md
+++ b/src/c-stdaux/NEWS.md
@@ -1,5 +1,27 @@
 # c-stdaux - Auxiliary macros and functions for the C standard library
 
+## CHANGES WITH 1.6.0:
+
+        * Multiple fixes to the test-suite, which fix differences in the
+          optimizations performed by GCC and clang.
+
+        Contributions from: David Rheinsberg, ms178, Nikita Popov
+
+        - Dußlingen, 2025-06-16
+
+## CHANGES WITH 1.5.0:
+
+        * Change the meson variable exports to avoid dashes in variable names,
+          given that pkg-config seems to be unable to deal with them. The old
+          variables are still exported for compatibility, but new variables
+          without dashes are now provided as well.
+
+        * Improve warning-resiliency of `c_assume_aligned` on older compilers.
+
+        Contributions from: Adrian Vovk, David Rheinsberg, Thomas Haller
+
+        - Dußlingen, 2023-12-12
+
 ## CHANGES WITH 1.4.0:
 
         * New compiler-builtin c_assume_aligned() allows hinting alignment
diff --git a/src/c-stdaux/meson.build b/src/c-stdaux/meson.build
index 6af822be..94a40b28 100644
--- a/src/c-stdaux/meson.build
+++ b/src/c-stdaux/meson.build
@@ -10,7 +10,7 @@ project(
         ],
         license: 'Apache',
         meson_version: '>=0.60.0',
-        version: '1.4.0',
+        version: '1.6.0',
 )
 major = meson.project_version().split('.')[0]
 project_description = 'Auxiliary macros and functions for the C standard library'
diff --git a/src/c-stdaux/.readthedocs.yaml b/src/c-stdaux/src/docs/.readthedocs.yaml
index 5bbe6ac1..6b1f0d69 100644
--- a/src/c-stdaux/.readthedocs.yaml
+++ b/src/c-stdaux/src/docs/.readthedocs.yaml
@@ -4,17 +4,19 @@ version: 2
 
 build:
   apt_packages:
-  - "clang"
-  os: "ubuntu-22.04"
+  - "libclang-14-dev"
+  os: "ubuntu-lts-latest"
   tools:
     python: "3"
+  jobs:
+    post_install:
+      - python -m pip install --upgrade --no-cache-dir clang==14.0.6
 
 formats: "all"
 
 python:
   install:
   - requirements: "src/docs/requirements.txt"
-  system_packages: true
 
 sphinx:
   configuration: "src/docs/conf.py"
diff --git a/src/c-stdaux/src/docs/conf.py b/src/c-stdaux/src/docs/conf.py
index b036efa5..a4f29629 100644
--- a/src/c-stdaux/src/docs/conf.py
+++ b/src/c-stdaux/src/docs/conf.py
@@ -25,20 +25,17 @@ capidocs.kerneldoc.hawkmoth_conf()
 exclude_patterns = []
 
 extensions = [
+    'capidocs.kerneldoc',
     'hawkmoth',
 ]
 
 # Hawkmoth Options
 
-cautodoc_clang = capidocs.kerneldoc.hawkmoth_include_args()
-cautodoc_clang += ["-I" + os.path.abspath("..")]
-cautodoc_clang += ["-DC_COMPILER_DOCS"]
+hawkmoth_clang = capidocs.kerneldoc.hawkmoth_include_args()
+hawkmoth_clang += ["-I" + os.path.abspath("..")]
+hawkmoth_clang += ["-DC_COMPILER_DOCS"]
 
-cautodoc_root = os.path.abspath('..')
-
-cautodoc_transformations = {
-    'kerneldoc': capidocs.kerneldoc.hawkmoth_converter,
-}
+hawkmoth_root = os.path.abspath('..')
 
 # HTML Options
 
diff --git a/src/c-stdaux/src/docs/requirements.txt b/src/c-stdaux/src/docs/requirements.txt
index 97872db1..f333d192 100644
--- a/src/c-stdaux/src/docs/requirements.txt
+++ b/src/c-stdaux/src/docs/requirements.txt
@@ -1,3 +1,3 @@
-c-apidocs>=0.0.2
-clang>=6
-hawkmoth>=0.7
+c-apidocs>=1.0.0
+hawkmoth>=0.20
+sphinx-rtd-theme>=3.0.0
diff --git a/src/c-stdaux/src/meson.build b/src/c-stdaux/src/meson.build
index f0efa90b..0e958af2 100644
--- a/src/c-stdaux/src/meson.build
+++ b/src/c-stdaux/src/meson.build
@@ -6,7 +6,9 @@
 
 libcstdaux_vars = {
         'cflags': ' '.join(cflags),
+        # Deprecated: pkg-config does not support dashes in variable names.
         'version-scripts': use_version_scripts,
+        'version_scripts': use_version_scripts,
 }
 
 libcstdaux_dep = declare_dependency(
diff --git a/src/c-stdaux/src/test-basic.c b/src/c-stdaux/src/test-basic.c
index 1d16a828..6fc63e63 100644
--- a/src/c-stdaux/src/test-basic.c
+++ b/src/c-stdaux/src/test-basic.c
@@ -503,7 +503,7 @@ static void test_basic_gnuc(int non_constant_expr) {
                 c_assert(foo == 11);
 
                 c_assert(__builtin_constant_p(c_div_round_up(1, 5)));
-                c_assert(!__builtin_constant_p(c_div_round_up(1, non_constant_expr)));
+                c_assert(!__builtin_constant_p(c_div_round_up(8, 1 + !non_constant_expr)));
 
                 /* alternative calculation is [(x + y - 1) / y], but it may overflow */
                 for (i = 0; i <= 0xffff; ++i) {
@@ -545,7 +545,7 @@ static void test_basic_gnuc(int non_constant_expr) {
                 c_assert(__builtin_constant_p(c_align_to(16, 8)));
                 c_assert(!__builtin_constant_p(c_align_to(non_constant_expr, 8)));
                 c_assert(!__builtin_constant_p(c_align_to(16, non_constant_expr)));
-                c_assert(!__builtin_constant_p(c_align_to(16, non_constant_expr ? 8 : 16)));
+                c_assert(!__builtin_constant_p(c_align_to(8, non_constant_expr ? 8 : 16)));
                 c_assert(__builtin_constant_p(c_align_to(16, 7 + 1)));
                 c_assert(c_align_to(15, non_constant_expr ? 8 : 16) == 16);
         }
diff --git a/src/core/bpf/clat.bpf.c b/src/core/bpf/clat.bpf.c
new file mode 100644
index 00000000..97d74a61
--- /dev/null
+++ b/src/core/bpf/clat.bpf.c
@@ -0,0 +1,1203 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright 2021 Toke Høiland-Jørgensen <toke@toke.dk> */
+/* Copyright 2025 Mary Strodl <mstrodl@csh.rit.edu> */
+/* Copyright 2026 Beniamino Galvani <bgalvani@redhat.com> */
+
+/**
+ * This is an implementation of a CLAT in eBPF. BPF is a different environment
+ * than the rest of NetworkManager, and we don't have access to most of the
+ * C standard library, so some things might look a little different from what
+ * you're used to.
+ *
+ * Check out src/core/bpf/meson.build to see how this gets built.
+ **/
+
+#include <linux/bpf.h>
+#include <linux/icmp.h>
+#include <linux/icmpv6.h>
+#include <linux/ip.h>
+#include <linux/ipv6.h>
+#include <linux/in.h>
+#include <linux/in6.h>
+#include <linux/pkt_cls.h>
+#include <linux/tcp.h>
+#include <linux/udp.h>
+#include <linux/if_ether.h>
+#include <stdbool.h>
+
+#include <bpf/bpf_endian.h>
+#include <bpf/bpf_helpers.h>
+
+#include "clat.h"
+
+char _license[] SEC("license") = "GPL";
+
+struct clat_config config;
+struct clat_stats  stats;
+
+#ifdef DEBUG
+/* Note: when enabling debugging, you also need to add CAP_PERFMON
+ * to the CapabilityBoundingSet of the NM systemd unit. The messages
+ * will be printed to /sys/kernel/debug/tracing/trace_pipe */
+#define DBG(fmt, ...)                                              \
+    ({                                                             \
+        char ____fmt[] = "clat: " fmt;                             \
+        bpf_trace_printk(____fmt, sizeof(____fmt), ##__VA_ARGS__); \
+    })
+#else
+#define DBG(fmt, ...)
+#endif
+
+/* Macros to read the sk_buff data* pointers, preventing the compiler
+ * from generating a 32-bit register spill. */
+#define SKB_ACCESS_MEMBER_32(_skb, member)                                  \
+    ({                                                                      \
+        void *ptr;                                                          \
+                                                                            \
+        asm volatile("%0 = *(u32 *)(%1 + %2)"                               \
+                     : "=r"(ptr)                                            \
+                     : "r"(_skb), "i"(offsetof(struct __sk_buff, member))); \
+                                                                            \
+        ptr;                                                                \
+    })
+
+#define SKB_DATA(_skb)     SKB_ACCESS_MEMBER_32(_skb, data)
+#define SKB_DATA_END(_skb) SKB_ACCESS_MEMBER_32(_skb, data_end)
+
+struct icmpv6_pseudo {
+    struct in6_addr saddr;
+    struct in6_addr daddr;
+    __u32           len;
+    __u8            padding[3];
+    __u8            nh;
+} __attribute__((packed));
+
+struct ip6_frag {
+    __u8  nexthdr;
+    __u8  reserved;
+    __u16 offset;
+    __u32 identification;
+} __attribute__((packed));
+
+#define L2_H_LEN(has_eth) (has_eth ? sizeof(struct ethhdr) : 0)
+#define IP_H_LEN          (sizeof(struct iphdr))
+#define IP6_H_LEN         (sizeof(struct ipv6hdr))
+#define IP6_FRAG_H_LEN    (sizeof(struct ip6_frag))
+#define ICMP_H_LEN        (sizeof(struct icmphdr))
+#define ICMP6_H_LEN       (sizeof(struct icmp6hdr))
+
+#define ensure_header(header, skb, data, data_end, offset) \
+    _ensure_header((void **) header, (skb), (data), (data_end), sizeof(**(header)), (offset))
+
+/*
+ * Verifies that the header at offset @offset and with size @size can
+ * be accessed, and assigns the pointer to @header. In case the data
+ * is not available, the function tries to pull it. Note that all packet
+ * pointers must be refreshed after calling this function.
+ */
+static __always_inline bool
+_ensure_header(void            **header,
+               struct __sk_buff *skb,
+               void            **data,
+               void            **data_end,
+               unsigned          size,
+               unsigned          offset)
+{
+    if (*data + offset + size > *data_end) {
+        bpf_skb_pull_data(skb, offset + size);
+        *data     = SKB_DATA(skb);
+        *data_end = SKB_DATA_END(skb);
+    }
+
+    if (*data + offset + size > *data_end)
+        return false;
+
+    *header = *data + offset;
+    return true;
+}
+
+/* This function must be declared as inline because the BPF calling
+ * convention only supports up to 5 function arguments. */
+static __always_inline void
+update_l4_checksum(struct __sk_buff *skb,
+                   struct ipv6hdr   *ip6h,
+                   struct iphdr     *iph,
+                   bool              has_eth,
+                   bool              v4to6,
+                   bool              is_inner,
+                   bool              is_v6_fragment,
+                   __u32            *csum_diff)
+{
+    int   flags = BPF_F_PSEUDO_HDR;
+    __u16 offset;
+    __u32 csum;
+    int   ip_type;
+
+    if (v4to6) {
+        void *from_ptr = &iph->saddr;
+        void *to_ptr   = &ip6h->saddr;
+
+        csum   = bpf_csum_diff(from_ptr, 2 * sizeof(__u32), to_ptr, 2 * sizeof(struct in6_addr), 0);
+        offset = L2_H_LEN(has_eth) + IP_H_LEN;
+        ip_type = ip6h->nexthdr;
+    } else {
+        void *from_ptr = &ip6h->saddr;
+        void *to_ptr   = &iph->saddr;
+
+        csum   = bpf_csum_diff(from_ptr, 2 * sizeof(struct in6_addr), to_ptr, 2 * sizeof(__u32), 0);
+        offset = L2_H_LEN(has_eth) + IP6_H_LEN;
+        ip_type = iph->protocol;
+
+        if (is_inner) {
+            offset = offset + ICMP6_H_LEN + IP6_H_LEN;
+        }
+    }
+
+    if (is_v6_fragment) {
+        offset += IP6_FRAG_H_LEN;
+    }
+
+    switch (ip_type) {
+    case IPPROTO_TCP:
+        offset += offsetof(struct tcphdr, check);
+        break;
+    case IPPROTO_UDP:
+        offset += offsetof(struct udphdr, check);
+        flags |= BPF_F_MARK_MANGLED_0;
+        break;
+    default:
+        return;
+    }
+
+    bpf_l4_csum_replace(skb, offset, 0, csum, flags);
+
+    if (csum_diff) {
+        *csum_diff = bpf_csum_diff((__be32 *) &csum, sizeof(csum), 0, 0, *csum_diff);
+    }
+}
+
+static __always_inline void
+update_icmp_checksum(struct __sk_buff     *skb,
+                     const struct ipv6hdr *ip6h,
+                     void                 *icmp_before,
+                     void                 *icmp_after,
+                     bool                  has_eth,
+                     bool                  v4to6,
+                     bool                  is_inner,
+                     __u32                 seed)
+{
+    struct icmpv6_pseudo ph = {.nh = IPPROTO_ICMPV6, .len = ip6h->payload_len};
+    __u16                h_before;
+    __u16                h_after;
+    __u16                offset;
+    __u32                csum;
+    __u32                u_before;
+    __u32                u_after;
+
+    __builtin_memcpy(&ph.saddr, &ip6h->saddr, sizeof(struct in6_addr));
+    __builtin_memcpy(&ph.daddr, &ip6h->daddr, sizeof(struct in6_addr));
+
+    /* Do checksum update in two passes: first compute the incremental
+     * checksum update of the ICMPv6 pseudo header, update the checksum
+     * using bpf_l4_csum_replace(), and then do a separate update for the
+     * ICMP type and code (which is two consecutive bytes, so cast them to
+     * u16). The bpf_csum_diff() helper can be used to compute the
+     * incremental update of the full block, whereas the
+     * bpf_l4_csum_replace() helper can do the two-byte diff and update by
+     * itself.
+     */
+    csum = bpf_csum_diff((__be32 *) &ph,
+                         v4to6 ? 0 : sizeof(ph),
+                         (__be32 *) &ph,
+                         v4to6 ? sizeof(ph) : 0,
+                         seed);
+
+    if (v4to6) {
+        offset = L2_H_LEN(has_eth) + IP_H_LEN + 2;
+    } else {
+        offset = L2_H_LEN(has_eth) + IP6_H_LEN + 2;
+        if (is_inner)
+            offset += ICMP6_H_LEN + IP6_H_LEN;
+    }
+
+    /* first two bytes of ICMP header, type and code */
+    h_before = *(__u16 *) icmp_before;
+    h_after  = *(__u16 *) icmp_after;
+
+    /* last four bytes of ICMP header, the data union */
+    u_before = *(__u32 *) (icmp_before + 4);
+    u_after  = *(__u32 *) (icmp_after + 4);
+
+    bpf_l4_csum_replace(skb, offset, 0, csum, BPF_F_PSEUDO_HDR);
+    bpf_l4_csum_replace(skb, offset, h_before, h_after, 2);
+
+    if (u_before != u_after)
+        bpf_l4_csum_replace(skb, offset, u_before, u_after, 4);
+}
+
+static __always_inline int
+rewrite_icmp(struct __sk_buff *skb, const struct ipv6hdr *ip6h, bool has_eth)
+{
+    void            *data_end = SKB_DATA_END(skb);
+    void            *data     = SKB_DATA(skb);
+    struct icmphdr   icmp_buf;  /* copy of the old ICMPv4 header */
+    struct icmp6hdr  icmp6_buf; /* buffer for the new ICMPv6 header */
+    struct icmphdr  *icmp;
+    struct icmp6hdr *icmp6;
+    __u32            mtu;
+
+    if (!ensure_header(&icmp, skb, &data, &data_end, L2_H_LEN(has_eth) + IP_H_LEN))
+        return -1;
+
+    icmp_buf  = *icmp;
+    icmp6     = (void *) icmp;
+    icmp6_buf = *icmp6;
+
+    /* These translations are defined in RFC6145 section 4.2 */
+    switch (icmp->type) {
+    case ICMP_ECHO:
+        icmp6_buf.icmp6_type = ICMPV6_ECHO_REQUEST;
+        break;
+    case ICMP_ECHOREPLY:
+        icmp6_buf.icmp6_type = ICMPV6_ECHO_REPLY;
+        break;
+    case ICMP_DEST_UNREACH:
+        icmp6_buf.icmp6_type = ICMPV6_DEST_UNREACH;
+        switch (icmp->code) {
+        case ICMP_NET_UNREACH:
+        case ICMP_HOST_UNREACH:
+        case ICMP_SR_FAILED:
+        case ICMP_NET_UNKNOWN:
+        case ICMP_HOST_UNKNOWN:
+        case ICMP_HOST_ISOLATED:
+        case ICMP_NET_UNR_TOS:
+        case ICMP_HOST_UNR_TOS:
+            icmp6_buf.icmp6_code = ICMPV6_NOROUTE;
+            break;
+        case ICMP_PROT_UNREACH:
+            icmp6_buf.icmp6_type    = ICMPV6_PARAMPROB;
+            icmp6_buf.icmp6_code    = ICMPV6_UNK_NEXTHDR;
+            icmp6_buf.icmp6_pointer = bpf_htonl(offsetof(struct ipv6hdr, nexthdr));
+            break;
+        case ICMP_PORT_UNREACH:
+            icmp6_buf.icmp6_code = ICMPV6_PORT_UNREACH;
+            break;
+        case ICMP_FRAG_NEEDED:
+            icmp6_buf.icmp6_type = ICMPV6_PKT_TOOBIG;
+            icmp6_buf.icmp6_code = 0;
+            mtu                  = bpf_ntohs(icmp->un.frag.mtu) + 20;
+            /* RFC6145 section 6, "second approach" - should not be
+             * necessary, but might as well do this
+             */
+            if (mtu < 1280)
+                mtu = 1280;
+            icmp6_buf.icmp6_mtu = bpf_htonl(mtu);
+            break;
+        case ICMP_NET_ANO:
+        case ICMP_HOST_ANO:
+        case ICMP_PKT_FILTERED:
+        case ICMP_PREC_CUTOFF:
+            icmp6_buf.icmp6_code = ICMPV6_ADM_PROHIBITED;
+            break;
+        default:
+            return -1;
+        }
+        break;
+    case ICMP_PARAMETERPROB:
+        if (icmp->code == 1)
+            return -1;
+        icmp6_buf.icmp6_type = ICMPV6_PARAMPROB;
+        icmp6_buf.icmp6_code = ICMPV6_HDR_FIELD;
+        /* The pointer field not defined in the Linux header. This
+         * translation is from Figure 3 of RFC6145.
+         */
+        switch (icmp->un.reserved[0]) {
+        case 0: /* version/IHL */
+            icmp6_buf.icmp6_pointer = 0;
+            break;
+        case 1: /* Type of Service */
+            icmp6_buf.icmp6_pointer = bpf_htonl(1);
+            break;
+        case 2: /* Total length */
+        case 3:
+            icmp6_buf.icmp6_pointer = bpf_htonl(4);
+            break;
+        case 8: /* Time to Live */
+            icmp6_buf.icmp6_pointer = bpf_htonl(7);
+            break;
+        case 9: /* Protocol */
+            icmp6_buf.icmp6_pointer = bpf_htonl(6);
+            break;
+        case 12: /* Source address */
+        case 13:
+        case 14:
+        case 15:
+            icmp6_buf.icmp6_pointer = bpf_htonl(8);
+            break;
+        case 16: /* Destination address */
+        case 17:
+        case 18:
+        case 19:
+            icmp6_buf.icmp6_pointer = bpf_htonl(24);
+            break;
+        default:
+            return -1;
+        }
+        break;
+    default:
+        return -1;
+    }
+
+    *icmp6 = icmp6_buf;
+    update_icmp_checksum(skb, ip6h, &icmp_buf, icmp6, has_eth, true, false, 0);
+
+    /* FIXME: also need to rewrite IP header embedded in ICMP error */
+
+    return 0;
+}
+
+/*
+  * Convert an IPv4 address to the corresponding "IPv4-Embedded IPv6 Address"
+  * according to RFC 6052 2.2.
+  *
+  *  +--+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+  *  |PL| 0-------------32--40--48--56--64--72--80--88--96--104---------|
+  *  +--+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+  *  |32|     prefix    |v4(32)         | u | suffix                    |
+  *  +--+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+  *  |40|     prefix        |v4(24)     | u |(8)| suffix                |
+  *  +--+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+  *  |48|     prefix            |v4(16) | u | (16)  | suffix            |
+  *  +--+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+  *  |56|     prefix                |(8)| u |  v4(24)   | suffix        |
+  *  +--+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+  *  |64|     prefix                    | u |   v4(32)      | suffix    |
+  *  +--+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+  *  |96|     prefix                                    |    v4(32)     |
+  *  +--+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+  *
+  */
+static __always_inline bool
+v4addr_to_v6(__be32 addr4, struct in6_addr *addr6, const struct in6_addr *pref64, int pref64_len)
+{
+    union {
+        __be32 a32;
+        __u8   a8[4];
+    } u;
+
+    u.a32 = addr4;
+
+    addr6->s6_addr32[0] = 0;
+    addr6->s6_addr32[1] = 0;
+    addr6->s6_addr32[2] = 0;
+    addr6->s6_addr32[3] = 0;
+
+    switch (pref64_len) {
+    case 96:
+        addr6->s6_addr32[0] = pref64->s6_addr32[0];
+        addr6->s6_addr32[1] = pref64->s6_addr32[1];
+        addr6->s6_addr32[2] = pref64->s6_addr32[2];
+        addr6->s6_addr32[3] = addr4;
+        break;
+    case 64:
+        addr6->s6_addr32[0] = pref64->s6_addr32[0];
+        addr6->s6_addr32[1] = pref64->s6_addr32[1];
+        addr6->s6_addr[9]   = u.a8[0];
+        addr6->s6_addr[10]  = u.a8[1];
+        addr6->s6_addr[11]  = u.a8[2];
+        addr6->s6_addr[12]  = u.a8[3];
+        break;
+    case 56:
+        addr6->s6_addr32[0] = pref64->s6_addr32[0];
+        addr6->s6_addr32[1] = pref64->s6_addr32[1];
+        addr6->s6_addr[7]   = u.a8[0];
+        addr6->s6_addr[9]   = u.a8[1];
+        addr6->s6_addr[10]  = u.a8[2];
+        addr6->s6_addr[11]  = u.a8[3];
+        break;
+    case 48:
+        addr6->s6_addr32[0] = pref64->s6_addr32[0];
+        addr6->s6_addr16[2] = pref64->s6_addr16[2];
+        addr6->s6_addr[6]   = u.a8[0];
+        addr6->s6_addr[7]   = u.a8[1];
+        addr6->s6_addr[9]   = u.a8[2];
+        addr6->s6_addr[10]  = u.a8[3];
+        break;
+    case 40:
+        addr6->s6_addr32[0] = pref64->s6_addr32[0];
+        addr6->s6_addr[4]   = pref64->s6_addr[4];
+        addr6->s6_addr[5]   = u.a8[0];
+        addr6->s6_addr[6]   = u.a8[1];
+        addr6->s6_addr[7]   = u.a8[2];
+        addr6->s6_addr[9]   = u.a8[3];
+        break;
+    case 32:
+        addr6->s6_addr32[0] = pref64->s6_addr32[0];
+        addr6->s6_addr32[1] = addr4;
+        break;
+    default:
+        return false;
+    }
+    return true;
+}
+
+/*
+  * Extract the IPv4 address @addr4 and the NAT64 prefix @pref64 from an IPv6 address,
+  * given the known prefix length @pref64_len. See the table above.
+  */
+static __always_inline bool
+v6addr_to_v4(const struct in6_addr *addr6, int pref64_len, __be32 *addr4, struct in6_addr *pref64)
+{
+    union {
+        __be32 a32;
+        __u8   a8[4];
+    } u;
+
+    pref64->s6_addr32[0] = 0;
+    pref64->s6_addr32[1] = 0;
+    pref64->s6_addr32[2] = 0;
+    pref64->s6_addr32[3] = 0;
+
+    switch (pref64_len) {
+    case 96:
+        u.a32 = addr6->s6_addr32[3];
+
+        pref64->s6_addr32[0] = addr6->s6_addr32[0];
+        pref64->s6_addr32[1] = addr6->s6_addr32[1];
+        pref64->s6_addr32[2] = addr6->s6_addr32[2];
+        break;
+    case 64:
+        u.a8[0] = addr6->s6_addr[9];
+        u.a8[1] = addr6->s6_addr[10];
+        u.a8[2] = addr6->s6_addr[11];
+        u.a8[3] = addr6->s6_addr[12];
+
+        pref64->s6_addr32[0] = addr6->s6_addr32[0];
+        pref64->s6_addr32[1] = addr6->s6_addr32[1];
+        break;
+    case 56:
+        u.a8[0] = addr6->s6_addr[7];
+        u.a8[1] = addr6->s6_addr[9];
+        u.a8[2] = addr6->s6_addr[10];
+        u.a8[3] = addr6->s6_addr[11];
+
+        pref64->s6_addr32[0] = addr6->s6_addr32[0];
+        pref64->s6_addr32[1] = addr6->s6_addr32[1];
+        pref64->s6_addr[7]   = 0;
+        break;
+    case 48:
+        u.a8[0] = addr6->s6_addr[6];
+        u.a8[1] = addr6->s6_addr[7];
+        u.a8[2] = addr6->s6_addr[9];
+        u.a8[3] = addr6->s6_addr[10];
+
+        pref64->s6_addr32[0] = addr6->s6_addr32[0];
+        pref64->s6_addr32[1] = addr6->s6_addr32[1];
+        pref64->s6_addr16[3] = 0;
+        break;
+    case 40:
+        u.a8[0] = addr6->s6_addr[5];
+        u.a8[1] = addr6->s6_addr[6];
+        u.a8[2] = addr6->s6_addr[7];
+        u.a8[3] = addr6->s6_addr[9];
+
+        pref64->s6_addr32[0] = addr6->s6_addr32[0];
+        pref64->s6_addr32[1] = addr6->s6_addr32[1];
+        pref64->s6_addr16[3] = 0;
+        pref64->s6_addr[5]   = 0;
+
+        break;
+    case 32:
+        u.a32 = addr6->s6_addr32[1];
+
+        pref64->s6_addr32[0] = addr6->s6_addr32[0];
+        break;
+    default:
+        return false;
+    }
+
+    *addr4 = u.a32;
+    return true;
+}
+
+/* ipv4 traffic in from application on this device, needs to be translated to v6 and sent to PLAT */
+static __always_inline int
+clat_handle_v4(struct __sk_buff *skb, bool has_eth)
+{
+    int             ret      = TC_ACT_OK;
+    void           *data_end = SKB_DATA_END(skb);
+    void           *data     = SKB_DATA(skb);
+    struct ipv6hdr *ip6h;
+    struct ipv6hdr  dst_hdr = {
+         .version = 6,
+    };
+    struct iphdr  *iph;
+    struct ethhdr *eth;
+
+    if (!ensure_header(&iph, skb, &data, &data_end, L2_H_LEN(has_eth)))
+        goto out;
+
+    if (has_eth) {
+        eth = data;
+        if (eth->h_proto != bpf_htons(ETH_P_IP))
+            goto out;
+    }
+
+    if (iph->version != 4)
+        goto out;
+
+    if (iph->saddr != config.local_v4.s_addr)
+        goto out;
+
+    /* At this point we know the packet needs translation. If we can't
+     * rewrite it, it should be dropped.
+     */
+    ret = TC_ACT_SHOT;
+
+    /* we don't bother dealing with IP options or fragmented packets. The
+     * latter are identified by the 'frag_off' field having a value (either
+     * the MF bit, or the fragment offset, or both). However, this field also
+     * contains the "don't fragment" (DF) bit, which we ignore, so mask that
+     * out. The DF is the second-most-significant bit (as bit 0 is
+     * reserved).
+     */
+
+    if (iph->ihl != 5 || (iph->frag_off & ~bpf_htons(1 << 14))) {
+        DBG("v4: pkt src/dst %pI4/%pI4 has IP options or is fragmented, dropping\n",
+            &iph->saddr,
+            &iph->daddr);
+        goto out;
+    }
+
+    if (!v4addr_to_v6(iph->daddr, &dst_hdr.daddr, &config.pref64, config.pref64_len))
+        goto out;
+
+    dst_hdr.saddr     = config.local_v6;
+    dst_hdr.nexthdr   = iph->protocol;
+    dst_hdr.hop_limit = iph->ttl;
+    /* weird definition in ipv6hdr */
+    dst_hdr.priority    = (iph->tos & 0x70) >> 4;
+    dst_hdr.flow_lbl[0] = iph->tos << 4;
+    dst_hdr.payload_len = bpf_htons(bpf_ntohs(iph->tot_len) - IP_H_LEN);
+
+    DBG("v4: outgoing pkt to dst %pI4 (%pI6c)\n", &iph->daddr, &dst_hdr.daddr);
+
+    switch (dst_hdr.nexthdr) {
+    case IPPROTO_ICMP:
+        if (rewrite_icmp(skb, &dst_hdr, has_eth))
+            goto out;
+        dst_hdr.nexthdr = IPPROTO_ICMPV6;
+        break;
+    case IPPROTO_TCP:
+    case IPPROTO_UDP:
+        update_l4_checksum(skb, &dst_hdr, iph, has_eth, true, false, false, NULL);
+        break;
+    default:
+        break;
+    }
+
+    if (bpf_skb_change_proto(skb, bpf_htons(ETH_P_IPV6), 0))
+        goto out;
+
+    data     = SKB_DATA(skb);
+    data_end = SKB_DATA_END(skb);
+
+    if (!ensure_header(&ip6h, skb, &data, &data_end, L2_H_LEN(has_eth)))
+        goto out;
+
+    if (has_eth) {
+        eth          = data;
+        eth->h_proto = bpf_htons(ETH_P_IPV6);
+    }
+
+    *ip6h = dst_hdr;
+
+    switch (dst_hdr.nexthdr) {
+    case IPPROTO_ICMPV6:
+        __sync_fetch_and_add(&stats.egress_icmp, 1);
+        break;
+    case IPPROTO_TCP:
+        __sync_fetch_and_add(&stats.egress_tcp, 1);
+        break;
+    case IPPROTO_UDP:
+        __sync_fetch_and_add(&stats.egress_udp, 1);
+        break;
+    default:
+        __sync_fetch_and_add(&stats.egress_other, 1);
+        break;
+    }
+
+    ret = bpf_redirect(skb->ifindex, 0);
+out:
+    if (ret == TC_ACT_SHOT)
+        __sync_fetch_and_add(&stats.egress_dropped, 1);
+    return ret;
+}
+
+static __always_inline __u16
+csum_fold_helper(__u32 csum)
+{
+    __u32 sum;
+    sum = (csum >> 16) + (csum & 0xffff);
+    sum += (sum >> 16);
+    return ~sum;
+}
+
+static __always_inline bool
+v6addr_equal(const struct in6_addr *a, const struct in6_addr *b)
+{
+    int i;
+
+    for (i = 0; i < 4; i++) {
+        if (a->s6_addr32[i] != b->s6_addr32[i])
+            return false;
+    }
+    return true;
+}
+
+static __always_inline void
+translate_ipv6_header(const struct ipv6hdr *ip6, struct iphdr *ip, __be32 saddr, __be32 daddr)
+{
+    *ip = (struct iphdr) {
+        .version  = 4,
+        .ihl      = 5,
+        .tos      = ip6->priority << 4 | (ip6->flow_lbl[0] >> 4),
+        .frag_off = bpf_htons(1 << 14),
+        .ttl      = ip6->hop_limit,
+        .protocol = ip6->nexthdr == IPPROTO_ICMPV6 ? IPPROTO_ICMP : ip6->nexthdr,
+        .saddr    = saddr,
+        .daddr    = daddr,
+        .tot_len  = bpf_htons(bpf_ntohs(ip6->payload_len) + IP_H_LEN),
+    };
+
+    ip->check = csum_fold_helper(bpf_csum_diff((__be32 *) ip, 0, (__be32 *) ip, IP_H_LEN, 0));
+}
+
+static __always_inline int
+translate_icmpv6_header(const struct icmp6hdr *icmp6, struct icmphdr *icmp)
+{
+    /* These translations are defined in RFC6145 section 5.2 */
+    switch (icmp6->icmp6_type) {
+    case ICMPV6_ECHO_REQUEST:
+        icmp->type = ICMP_ECHO;
+        break;
+    case ICMPV6_ECHO_REPLY:
+        icmp->type = ICMP_ECHOREPLY;
+        break;
+    case ICMPV6_DEST_UNREACH:
+        icmp->type = ICMP_DEST_UNREACH;
+        switch (icmp6->icmp6_code) {
+        case ICMPV6_NOROUTE:
+        case ICMPV6_NOT_NEIGHBOUR:
+        case ICMPV6_ADDR_UNREACH:
+            icmp->code = ICMP_HOST_UNREACH;
+            break;
+        case ICMPV6_ADM_PROHIBITED:
+            icmp->code = ICMP_HOST_ANO;
+            break;
+        case ICMPV6_PORT_UNREACH:
+            icmp->code = ICMP_PORT_UNREACH;
+            break;
+        default:
+            return -1;
+        }
+        break;
+    case ICMPV6_PKT_TOOBIG:
+    {
+        __u32 mtu;
+
+        icmp->type = ICMP_DEST_UNREACH;
+        icmp->code = ICMP_FRAG_NEEDED;
+
+        mtu = bpf_ntohl(icmp6->icmp6_mtu) - 20;
+        if (mtu > 0xffff)
+            return -1;
+        icmp->un.frag.mtu = bpf_htons(mtu);
+        break;
+    }
+    case ICMPV6_TIME_EXCEED:
+        icmp->type = ICMP_TIME_EXCEEDED;
+        break;
+    case ICMPV6_PARAMPROB:
+        switch (icmp6->icmp6_code) {
+        case 0:
+        {
+            __u32 ptr;
+
+            icmp->type = ICMP_PARAMETERPROB;
+            icmp->code = 0;
+
+            ptr = bpf_ntohl(icmp6->icmp6_pointer);
+            /* Figure 6 in RFC6145 - using if statements b/c of
+             * range at the bottom
+             */
+            if (ptr == 0 || ptr == 1)
+                icmp->un.reserved[0] = ptr;
+            else if (ptr == 4 || ptr == 5)
+                icmp->un.reserved[0] = 2;
+            else if (ptr == 6)
+                icmp->un.reserved[0] = 9;
+            else if (ptr == 7)
+                icmp->un.reserved[0] = 8;
+            else if (ptr >= 8 && ptr <= 23)
+                icmp->un.reserved[0] = 12;
+            else if (ptr >= 24 && ptr <= 39)
+                icmp->un.reserved[0] = 16;
+            else
+                return -1;
+            break;
+        }
+        case 1:
+            icmp->type = ICMP_DEST_UNREACH;
+            icmp->code = ICMP_PROT_UNREACH;
+            break;
+        default:
+            return -1;
+        }
+        break;
+    default:
+        return -1;
+    }
+
+    return 0;
+}
+
+static __always_inline int
+rewrite_icmpv6_inner(struct __sk_buff *skb, __u32 *csum_diff, bool has_eth)
+{
+    void            *data_end = SKB_DATA_END(skb);
+    void            *data     = SKB_DATA(skb);
+    struct icmphdr  *icmp;
+    struct icmp6hdr *icmp6;
+    struct icmphdr   icmp_buf;  /* buffer for the new ICMPv4 header */
+    struct icmp6hdr  icmp6_buf; /* copy of the old ICMPv6 header */
+
+    /*
+     * icmp6:                                                    v
+     * -------------------------------------------------------------------------
+     * | Ethernet | IPv6             | ICMPv6 | IPv6             | ICMPv6 | ...
+     * -------------------------------------------------------------------------
+     */
+
+    if (!ensure_header(&icmp6,
+                       skb,
+                       &data,
+                       &data_end,
+                       L2_H_LEN(has_eth) + 2 * IP6_H_LEN + ICMP6_H_LEN))
+        return -1;
+
+    icmp6_buf = *icmp6;
+    icmp      = (void *) icmp6;
+    icmp_buf  = *icmp;
+
+    if (translate_icmpv6_header(icmp6, &icmp_buf))
+        return -1;
+
+    *icmp = icmp_buf;
+    update_icmp_checksum(skb,
+                         (struct ipv6hdr *) (data + L2_H_LEN(has_eth)),
+                         &icmp6_buf,
+                         icmp,
+                         has_eth,
+                         false,
+                         true,
+                         0);
+
+    if (csum_diff) {
+        data_end = SKB_DATA_END(skb);
+        data     = SKB_DATA(skb);
+
+        if (!ensure_header(&icmp,
+                           skb,
+                           &data,
+                           &data_end,
+                           L2_H_LEN(has_eth) + 2 * IP6_H_LEN + ICMP6_H_LEN))
+            return -1;
+
+        /* Compute the checksum difference between the old ICMPv6 header and the new ICMPv4 one */
+        *csum_diff =
+            bpf_csum_diff((__be32 *) &icmp6_buf, ICMP6_H_LEN, (__be32 *) &icmp6_buf, 0, *csum_diff);
+        *csum_diff = bpf_csum_diff((__be32 *) icmp, 0, (__be32 *) icmp, ICMP_H_LEN, *csum_diff);
+    }
+    return 0;
+}
+
+static __always_inline int
+rewrite_ipv6_inner(struct __sk_buff *skb, struct iphdr *dst_hdr, __u32 *csum_diff, bool has_eth)
+{
+    void           *data_end = SKB_DATA_END(skb);
+    void           *data     = SKB_DATA(skb);
+    struct ipv6hdr *ip6h;
+    __be32          addr4;
+    struct in6_addr subnet_v6;
+
+    /*
+     * ip6h:                                  v
+     * ----------------------------------------------------------------
+     * | Ethernet | IPv6             | ICMPv6 | IPv6             | ...
+     * ----------------------------------------------------------------
+     */
+
+    if (!ensure_header(&ip6h, skb, &data, &data_end, L2_H_LEN(has_eth) + IP6_H_LEN + ICMP6_H_LEN))
+        return -1;
+
+    if (!v6addr_equal(&ip6h->saddr, &config.local_v6))
+        return -1;
+    if (!v6addr_to_v4(&ip6h->daddr, config.pref64_len, &addr4, &subnet_v6))
+        return -1;
+    if (!v6addr_equal(&subnet_v6, &config.pref64))
+        return -1;
+
+    translate_ipv6_header(ip6h, dst_hdr, config.local_v4.s_addr, addr4);
+
+    if (csum_diff) {
+        /* Checksum difference between the old IPv6 header and the new IPv4 one */
+        *csum_diff = bpf_csum_diff((__be32 *) ip6h, IP6_H_LEN, (__be32 *) ip6h, 0, *csum_diff);
+
+        *csum_diff = bpf_csum_diff((__be32 *) dst_hdr, 0, (__be32 *) dst_hdr, IP_H_LEN, *csum_diff);
+    }
+
+    switch (dst_hdr->protocol) {
+    case IPPROTO_ICMP:
+        if (rewrite_icmpv6_inner(skb, csum_diff, has_eth))
+            return -1;
+        break;
+    case IPPROTO_TCP:
+    case IPPROTO_UDP:
+        update_l4_checksum(skb, ip6h, dst_hdr, has_eth, false, true, false, csum_diff);
+        break;
+    default:
+        break;
+    }
+
+    return 0;
+}
+
+static __always_inline int
+rewrite_icmpv6(struct __sk_buff *skb, int *out_length_diff, bool has_eth)
+{
+    void            *data_end = SKB_DATA_END(skb);
+    void            *data     = SKB_DATA(skb);
+    struct iphdr    *ip;
+    struct icmp6hdr *icmp6;
+    struct icmphdr  *icmp;
+    struct icmphdr   icmp_buf;  /* buffer for the new ICMPv4 header */
+    struct icmp6hdr  icmp6_buf; /* copy of the old ICMPv6 header */
+    struct iphdr     ip_in_buf; /* buffer for the new inner IPv4 header */
+    __u32            csum_diff = 0;
+
+    /*
+     * icmp6:                        v
+     * ---------------------------------------------
+     * | Ethernet | IPv6             | ICMPv6 | ...
+     * ---------------------------------------------
+     */
+
+    if (!ensure_header(&icmp6, skb, &data, &data_end, L2_H_LEN(has_eth) + IP6_H_LEN))
+        return -1;
+
+    icmp6_buf = *icmp6;
+    icmp      = (void *) icmp6;
+    icmp_buf  = *icmp;
+
+    if (translate_icmpv6_header(icmp6, &icmp_buf))
+        return -1;
+
+    if (icmp6->icmp6_type >= 128) {
+        /* ICMPv6 non-error message: only translate the header */
+        *icmp = icmp_buf;
+        update_icmp_checksum(skb,
+                             (struct ipv6hdr *) (data + L2_H_LEN(has_eth)),
+                             &icmp6_buf,
+                             icmp,
+                             has_eth,
+                             false,
+                             false,
+                             0);
+        return 0;
+    }
+
+    /* ICMPv6 error messages: we need to rewrite the headers in the inner packet.
+     * Track in csum_diff the incremental changes to the checksum for the ICMPv4
+     * header. */
+
+    if (rewrite_ipv6_inner(skb, &ip_in_buf, &csum_diff, has_eth))
+        return -1;
+
+    /* The inner IP header shrinks from 40 (IPv6) to 20 (IPv4) bytes; we need to move
+     * the L4 header and payload. BPF programs don't have an easy way to move a variable
+     * amount of packet data; use bpf_skb_adjust_room() which can add or remove data
+     * inside a packet. It doesn't support arbitrary offsets, but we can use BPF_ADJ_ROOM_NET
+     * to remove the bytes just after the L3 header, and rewrite the ICMP and the inner
+     * IP headers.
+     */
+    if (bpf_skb_adjust_room(skb, (int) IP_H_LEN - (int) IP6_H_LEN, BPF_ADJ_ROOM_NET, 0))
+        return -1;
+
+    *out_length_diff = (int) IP_H_LEN - (int) IP6_H_LEN;
+
+    data_end = SKB_DATA_END(skb);
+    data     = SKB_DATA(skb);
+
+    if (!ensure_header(&ip, skb, &data, &data_end, L2_H_LEN(has_eth) + IP6_H_LEN + ICMP_H_LEN))
+        return -1;
+
+    icmp = data + L2_H_LEN(has_eth) + IP6_H_LEN;
+
+    /* Rewrite the ICMPv6 header with the translated ICMPv4 one */
+    *icmp = icmp_buf;
+    /* Rewrite the inner IPv6 header with the translated IPv4 one */
+    *ip = ip_in_buf;
+
+    /* Update the ICMPv4 checksum according to all the changes in headers */
+    update_icmp_checksum(skb,
+                         (struct ipv6hdr *) (data + L2_H_LEN(has_eth)),
+                         &icmp6_buf,
+                         icmp,
+                         has_eth,
+                         false,
+                         false,
+                         csum_diff);
+
+    return 0;
+}
+
+/* ipv6 traffic from the PLAT, to be translated into ipv4 and sent to an application */
+static __always_inline int
+clat_handle_v6(struct __sk_buff *skb, bool has_eth)
+{
+    int             ret      = TC_ACT_OK;
+    void           *data_end = SKB_DATA_END(skb);
+    void           *data     = SKB_DATA(skb);
+    struct ethhdr  *eth;
+    struct ipv6hdr *ip6h;
+    struct iphdr   *iph;
+    struct iphdr    dst_hdr;
+    struct in6_addr subnet_v6;
+    __be32          addr4;
+    int             length_diff = 0;
+    bool            fragmented  = false;
+
+    if (!ensure_header(&ip6h, skb, &data, &data_end, L2_H_LEN(has_eth)))
+        goto out;
+
+    if (has_eth) {
+        eth = data;
+        if (eth->h_proto != bpf_htons(ETH_P_IPV6))
+            goto out;
+    }
+
+    if (ip6h->version != 6)
+        goto out;
+
+    if (!v6addr_equal(&ip6h->daddr, &config.local_v6))
+        goto out;
+    if (!v6addr_to_v4(&ip6h->saddr, config.pref64_len, &addr4, &subnet_v6))
+        goto out;
+    if (!v6addr_equal(&subnet_v6, &config.pref64)) {
+        struct icmp6hdr *icmp6;
+
+        /* Follow draft-ietf-v6ops-icmpext-xlat-v6only-source-01:
+         *
+         * "Whenever a translator translates an ICMPv6 Destination Unreachable,
+         *  ICMPv6 Time Exceeded or ICMPv6 Packet Too Big ([RFC4443]) to the
+         *  corresponding ICMPv4 ([RFC0792]) message, and the IPv6 source
+         *  address in the outermost IPv6 header is untranslatable, the
+         *  translator SHOULD use the dummy IPv4 address (192.0.0.8) as the IPv4
+         *  source address for the translated packet."
+         */
+        if (ip6h->nexthdr != IPPROTO_ICMPV6)
+            goto out;
+
+        if (!ensure_header(&icmp6, skb, &data, &data_end, L2_H_LEN(has_eth) + IP6_H_LEN))
+            goto out;
+
+        ip6h = data + L2_H_LEN(has_eth);
+
+        if (icmp6->icmp6_type != ICMPV6_DEST_UNREACH && icmp6->icmp6_type != ICMPV6_TIME_EXCEED
+            && icmp6->icmp6_type != ICMPV6_PKT_TOOBIG)
+            goto out;
+
+        DBG("v6: icmpv6 type %u from native address %pI6c, translating src to dummy ipv4\n",
+            icmp6->icmp6_type,
+            &ip6h->saddr);
+
+        addr4 = __cpu_to_be32(INADDR_DUMMY);
+    }
+
+    /* At this point we know the packet needs translation. If we can't
+     * rewrite it, it should be dropped.
+     */
+    ret = TC_ACT_SHOT;
+
+    if (ip6h->nexthdr == IPPROTO_TCP || ip6h->nexthdr == IPPROTO_UDP
+        || ip6h->nexthdr == IPPROTO_ICMPV6) {
+        translate_ipv6_header(ip6h, &dst_hdr, addr4, config.local_v4.s_addr);
+        DBG("v6: incoming pkt from src %pI6c (%pI4)\n", &ip6h->saddr, &addr4);
+    } else if (ip6h->nexthdr == IPPROTO_FRAGMENT) {
+        struct ip6_frag *frag;
+        int              tot_len;
+        __u16            offset;
+
+        if (!ensure_header(&frag, skb, &data, &data_end, L2_H_LEN(has_eth) + IP6_H_LEN))
+            goto out;
+
+        ip6h = data + L2_H_LEN(has_eth);
+
+        /* Translate into an IPv4 fragmented packet, RFC 6145 5.1.1 */
+
+        tot_len = bpf_ntohs(ip6h->payload_len) + IP_H_LEN - IP6_FRAG_H_LEN;
+
+        offset = bpf_ntohs(frag->offset);
+        offset = ((offset & 1) << 13) | /* More Fragments flag */
+                 (offset >> 3);         /* Offset in 8-octet units */
+
+        dst_hdr = (struct iphdr) {
+            .version  = 4,
+            .ihl      = 5,
+            .id       = bpf_htons(bpf_ntohl(frag->identification) & 0xffff),
+            .tos      = ip6h->priority << 4 | (ip6h->flow_lbl[0] >> 4),
+            .frag_off = bpf_htons(offset),
+            .ttl      = ip6h->hop_limit,
+            .protocol = frag->nexthdr == IPPROTO_ICMPV6 ? IPPROTO_ICMP : frag->nexthdr,
+            .saddr    = addr4,
+            .daddr    = config.local_v4.s_addr,
+            .tot_len  = bpf_htons(tot_len),
+        };
+
+        dst_hdr.check = csum_fold_helper(
+            bpf_csum_diff((__be32 *) &dst_hdr, 0, (__be32 *) &dst_hdr, IP_H_LEN, 0));
+
+        fragmented = true;
+
+        DBG("v6: incoming fragmented pkt from src %pI6c (%pI4), id 0x%x\n",
+            &ip6h->saddr,
+            &addr4,
+            bpf_ntohs(dst_hdr.id));
+    } else {
+        DBG("v6: pkt src/dst %pI6c/%pI6c has nexthdr %u, dropping\n", &ip6h->saddr, &ip6h->daddr);
+        goto out;
+    }
+
+    switch (dst_hdr.protocol) {
+    case IPPROTO_ICMP:
+        /* We can't update the checksum of ICMP fragmented packets: ICMPv4 doesn't use
+         * a pseudo header, while the ICMPv6 pseudo-header includes the total payload
+         * length, which is not known when parsing the first fragment. This makes it
+         * impossible for a stateless translator to compute the checksum delta. TCP and
+         * UDP don't have this problem because both the v4 and v6 pseudo-headers include
+         * the total length. */
+        if (fragmented)
+            goto out;
+
+        if (rewrite_icmpv6(skb, &length_diff, has_eth))
+            goto out;
+        break;
+    case IPPROTO_TCP:
+    case IPPROTO_UDP:
+        /* Update the L4 headers only for non-fragmented packets or for the first
+         * fragment, which contains the L4 header. */
+        if (!fragmented || (bpf_ntohs(dst_hdr.frag_off) & 0x1FFF) == 0) {
+            update_l4_checksum(skb, ip6h, &dst_hdr, has_eth, false, false, fragmented, NULL);
+        }
+        break;
+    default:
+        break;
+    }
+
+    /* rewrite_icmpv6() can change the payload length when it rewrites the content of
+     * an ICMPv6 error packet. Update the length and the checksum. */
+    if (length_diff != 0) {
+        data     = SKB_DATA(skb);
+        data_end = SKB_DATA_END(skb);
+
+        if (!ensure_header(&ip6h, skb, &data, &data_end, L2_H_LEN(has_eth)))
+            goto out;
+
+        dst_hdr.tot_len = bpf_htons(bpf_ntohs(ip6h->payload_len) + length_diff + IP_H_LEN);
+
+        dst_hdr.check = 0;
+        dst_hdr.check = csum_fold_helper(
+            bpf_csum_diff((__be32 *) &dst_hdr, 0, (__be32 *) &dst_hdr, IP_H_LEN, 0));
+    }
+
+    if (bpf_skb_change_proto(skb, bpf_htons(ETH_P_IP), 0))
+        goto out;
+
+    if (fragmented) {
+        /* Remove the IPv6 fragment header */
+        if (bpf_skb_adjust_room(skb, -(__s32) IP6_FRAG_H_LEN, BPF_ADJ_ROOM_NET, 0))
+            goto out;
+    }
+
+    data     = SKB_DATA(skb);
+    data_end = SKB_DATA_END(skb);
+
+    if (!ensure_header(&iph, skb, &data, &data_end, L2_H_LEN(has_eth)))
+        goto out;
+
+    if (has_eth) {
+        eth          = data;
+        eth->h_proto = bpf_htons(ETH_P_IP);
+    }
+
+    *iph = dst_hdr;
+
+    if (fragmented)
+        __sync_fetch_and_add(&stats.ingress_fragment, 1);
+    switch (dst_hdr.protocol) {
+    case IPPROTO_ICMP:
+        __sync_fetch_and_add(&stats.ingress_icmp, 1);
+        break;
+    case IPPROTO_TCP:
+        __sync_fetch_and_add(&stats.ingress_tcp, 1);
+        break;
+    case IPPROTO_UDP:
+        __sync_fetch_and_add(&stats.ingress_udp, 1);
+        break;
+    default:
+        __sync_fetch_and_add(&stats.ingress_other, 1);
+        break;
+    }
+
+    ret = bpf_redirect(skb->ifindex, BPF_F_INGRESS);
+out:
+    if (ret == TC_ACT_SHOT)
+        __sync_fetch_and_add(&stats.ingress_dropped, 1);
+    return ret;
+}
+
+/* Use separate entry points for interfaces with and without an
+ * Ethernet header. Since all functions are now marked as inline,
+ * the compiler is able to replace the value of the parametric
+ * L2_H_LEN() macros with an immediate constant. This avoids
+ * pointer arithmetic which is forbidden because we don't run with
+ * CAP_PERFMON. The loader attaches the right program pair based
+ * on the interface type. */
+SEC("tcx/egress")
+int
+nm_clat_egress_eth(struct __sk_buff *skb)
+{
+    return clat_handle_v4(skb, true);
+}
+
+SEC("tcx/egress")
+int
+nm_clat_egress_rawip(struct __sk_buff *skb)
+{
+    return clat_handle_v4(skb, false);
+}
+
+SEC("tcx/ingress")
+int
+nm_clat_ingress_eth(struct __sk_buff *skb)
+{
+    return clat_handle_v6(skb, true);
+}
+
+SEC("tcx/ingress")
+int
+nm_clat_ingress_rawip(struct __sk_buff *skb)
+{
+    return clat_handle_v6(skb, false);
+}
diff --git a/src/core/bpf/clat.h b/src/core/bpf/clat.h
new file mode 100644
index 00000000..4a8adba5
--- /dev/null
+++ b/src/core/bpf/clat.h
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __NAT64_H__
+#define __NAT64_H__
+
+#include <linux/in6.h>
+
+struct clat_config {
+    struct in6_addr local_v6;
+    struct in6_addr pref64;
+    struct in_addr  local_v4;
+    unsigned        pref64_len;
+};
+
+struct clat_stats {
+    /* egress: v4 to v6 */
+    __u64 egress_tcp;
+    __u64 egress_udp;
+    __u64 egress_icmp;
+    __u64 egress_other;
+    __u64 egress_dropped;
+    /* ingress: v6 to v4 */
+    __u64 ingress_tcp;
+    __u64 ingress_udp;
+    __u64 ingress_icmp;
+    __u64 ingress_other;
+    __u64 ingress_fragment;
+    __u64 ingress_dropped;
+};
+
+#endif
diff --git a/src/core/bpf/meson.build b/src/core/bpf/meson.build
new file mode 100644
index 00000000..39b978dd
--- /dev/null
+++ b/src/core/bpf/meson.build
@@ -0,0 +1,239 @@
+# SPDX-License-Identifier: LGPL-2.1+
+
+# Ripped from systemd: https://github.com/systemd/systemd/pull/20429
+
+if not enable_clat
+  subdir_done()
+endif
+
+bpf_compiler = get_option('bpf-compiler')
+clang_found = false
+clang_supports_bpf = false
+bpf_gcc_found = false
+bpftool_strip = false
+
+if bpf_compiler == 'clang' or bpf_compiler == 'auto'
+  # Support 'versioned' clang/llvm-strip binaries, as seen on Debian/Ubuntu
+  # (like clang-10/llvm-strip-10)
+  if meson.is_cross_build() or cc.get_id() != 'clang' or cc.cmd_array()[0].contains('afl-clang') or cc.cmd_array()[0].contains('hfuzz-clang')
+    r = find_program('clang',
+                     version : '>= 10.0.0')
+    clang_found = r.found()
+    if clang_found
+      if meson.version().version_compare('>= 0.55')
+        clang = r.full_path()
+      else
+        clang = r.path()
+      endif
+    endif
+  else
+    clang_found = true
+    clang = cc.cmd_array()
+  endif
+
+  if clang_found
+    # Check if 'clang -target bpf' is supported.
+    clang_supports_bpf = run_command(clang, '-target', 'bpf', '--print-supported-cpus', check : false).returncode() == 0
+  endif
+elif bpf_compiler == 'gcc' or bpf_compiler == 'auto'
+  bpf_gcc = find_program('bpf-gcc',
+                         'bpf-none-gcc',
+                         'bpf-unknown-none-gcc',
+                         version : '>= 13.1.0')
+  bpf_gcc_found = bpf_gcc.found()
+endif
+
+if bpf_compiler == 'auto'
+  if clang_supports_bpf and bpf_gcc_found
+    # Both supported, prefer the one matching our compiler:
+    if cc.get_id() == 'gcc'
+      bpf_compiler = 'gcc'
+    else
+      # Default to clang if we don't know this compiler
+      bpf_compiler = 'clang'
+    endif
+  elif clang_supports_bpf
+    bpf_compiler = 'clang'
+  elif bpf_gcc_found
+    bpf_compiler = 'clang'
+  endif
+endif
+
+if clang_supports_bpf or bpf_gcc_found
+  # Debian installs this in /usr/sbin/ which is not in $PATH.
+  # We check for 'bpftool' first, honouring $PATH, and in /usr/sbin/ for Debian.
+  # We use 'bpftool gen object' subcommand for bpftool strip, it was added by d80b2fcbe0a023619e0fc73112f2a02c2662f6ab (v5.13).
+  bpftool = find_program('bpftool',
+                         '/usr/sbin/bpftool',
+                         required : bpf_compiler == 'gcc',
+                         version : bpf_compiler == 'gcc' ? '>= 7.0.0' : '>= 5.13.0')
+
+  if bpftool.found()
+    bpftool_strip = true
+  elif bpf_compiler == 'clang'
+    # We require the 'bpftool gen skeleton' subcommand, it was added by 985ead416df39d6fe8e89580cc1db6aa273e0175 (v5.6).
+    bpftool = find_program('bpftool',
+                           '/usr/sbin/bpftool',
+                           required : true,
+                           version : '>= 5.6.0')
+  endif
+
+  # We use `llvm-strip` as a fallback if `bpftool gen object` strip support is not available.
+  if not bpftool_strip and bpftool.found() and clang_supports_bpf
+    if not meson.is_cross_build()
+      llvm_strip_bin = run_command(clang, '--print-prog-name', 'llvm-strip',
+                                   check : true).stdout().strip()
+    else
+      llvm_strip_bin = 'llvm-strip'
+    endif
+    llvm_strip = find_program(llvm_strip_bin,
+                              required : true,
+                              version : '>= 10.0.0')
+  endif
+else
+  error('clat support was enabled but couldn\'t find a suitable BPF compiler!')
+endif
+
+bpf_clang_flags = [
+  '-std=gnu17',
+  '-Wunused',
+  '-Wimplicit-fallthrough',
+  '-Wno-compare-distinct-pointer-types',
+  '-fno-stack-protector',
+  '-O2',
+  '-target',
+  'bpf',
+  '-g',
+  '-c',
+]
+
+bpf_gcc_flags = [
+  '-std=gnu17',
+  '-Wunused',
+  '-Wimplicit-fallthrough',
+  '-fno-stack-protector',
+  '-fno-ssa-phiopt',
+  '-O2',
+  '-mcpu=v3',
+  '-mco-re',
+  '-gbtf',
+  '-c',
+]
+
+clang_arch_flag = '-D__@0@__'.format(host_machine.cpu_family())
+
+libbpf_include_dir = dependency('libbpf').get_variable(pkgconfig : 'includedir')
+
+# Generate defines that are appropriate to tell the compiler what architecture
+# we're compiling for. By default we just map meson's cpu_family to __<cpu_family>__.
+# This dictionary contains the exceptions where this doesn't work.
+#
+# C.f. https://mesonbuild.com/Reference-tables.html#cpu-families
+# and src/basic/missing_syscall_def.h.
+cpu_arch_defines = {
+  'ppc'         : ['-D__powerpc__', '-D__TARGET_ARCH_powerpc'],
+  'ppc64'       : ['-D__powerpc64__', '-D__TARGET_ARCH_powerpc', '-D_CALL_ELF=2'],
+  'riscv32'     : ['-D__riscv', '-D__riscv_xlen=32', '-D__TARGET_ARCH_riscv'],
+  'riscv64'     : ['-D__riscv', '-D__riscv_xlen=64', '-D__TARGET_ARCH_riscv'],
+  'x86'         : ['-D__i386__', '-D__TARGET_ARCH_x86'],
+  's390x'       : ['-D__s390__', '-D__s390x__', '-D__TARGET_ARCH_s390'],
+
+  # For arm, assume hardware fp is available.
+  'arm'         : ['-D__arm__', '-D__ARM_PCS_VFP', '-D__TARGET_ARCH_arm'],
+  'loongarch64' : ['-D__loongarch__', '-D__loongarch_grlen=64', '-D__TARGET_ARCH_loongarch']
+}
+
+bpf_arch_flags = cpu_arch_defines.get(host_machine.cpu_family(),
+                                      ['-D__@0@__'.format(host_machine.cpu_family())])
+if bpf_compiler == 'gcc'
+  bpf_arch_flags += ['-m' + host_machine.endian() + '-endian']
+endif
+
+bpf_o_unstripped_cmd = []
+if bpf_compiler == 'clang'
+  bpf_o_unstripped_cmd += [
+    clang,
+    bpf_clang_flags,
+    bpf_arch_flags,
+  ]
+elif bpf_compiler == 'gcc'
+  bpf_o_unstripped_cmd += [
+    bpf_gcc,
+    bpf_gcc_flags,
+    bpf_arch_flags,
+  ]
+endif
+
+bpf_o_unstripped_cmd += ['-I.']
+
+if cc.get_id() == 'gcc' or meson.is_cross_build()
+  if cc.get_id() != 'gcc'
+    warning('Cross compiler is not gcc. Guessing the target triplet for bpf likely fails.')
+  endif
+  target_triplet_cmd = run_command(cc.cmd_array(), '-print-multiarch', check: false)
+else
+  # clang does not support -print-multiarch (D133170) and its -dump-machine
+  # does not match multiarch. Query gcc instead.
+  target_triplet_cmd = run_command('gcc', '-print-multiarch', check: false)
+endif
+
+if target_triplet_cmd.returncode() == 0
+  target_triplet = target_triplet_cmd.stdout().strip()
+  bpf_o_unstripped_cmd += [
+    '-isystem',
+    '/usr/include/@0@'.format(target_triplet)
+  ]
+endif
+
+bpf_o_unstripped_cmd += [
+  '-idirafter',
+  libbpf_include_dir,
+  '@INPUT@',
+  '-o',
+  '@OUTPUT@'
+]
+
+if bpftool_strip
+  bpf_o_cmd = [
+    bpftool,
+    'gen',
+    'object',
+    '@OUTPUT@',
+    '@INPUT@'
+  ]
+elif bpf_compiler == 'clang'
+  bpf_o_cmd = [
+    llvm_strip,
+    '-g',
+    '@INPUT@',
+    '-o',
+    '@OUTPUT@'
+  ]
+endif
+
+skel_h_cmd = [
+  bpftool,
+  'g',
+  's',
+  '@INPUT@'
+]
+
+clat_bpf_o_unstripped = custom_target(
+  'clat.bpf.unstripped.o',
+  input : 'clat.bpf.c',
+  output : 'clat.bpf.unstripped.o',
+  command : bpf_o_unstripped_cmd)
+
+clat_bpf_o = custom_target(
+  'clat.bpf.o',
+  input : clat_bpf_o_unstripped,
+  output : 'clat.bpf.o',
+  command : bpf_o_cmd)
+
+clat_skel_h = custom_target(
+  'clat.skel.h',
+  input : clat_bpf_o,
+  output : 'clat.skel.h',
+  command : skel_h_cmd,
+  capture : true)
+
diff --git a/src/core/devices/nm-device-bond.c b/src/core/devices/nm-device-bond.c
index 39e68e96..06d41a19 100644
--- a/src/core/devices/nm-device-bond.c
+++ b/src/core/devices/nm-device-bond.c
@@ -52,11 +52,12 @@
         NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE, NM_SETTING_BOND_OPTION_PRIMARY_RESELECT, \
         NM_SETTING_BOND_OPTION_RESEND_IGMP, NM_SETTING_BOND_OPTION_USE_CARRIER,            \
         NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY, NM_SETTING_BOND_OPTION_NUM_GRAT_ARP,      \
-        NM_SETTING_BOND_OPTION_PEER_NOTIF_DELAY, NM_SETTING_BOND_OPTION_ARP_MISSED_MAX
+        NM_SETTING_BOND_OPTION_PEER_NOTIF_DELAY
 
-#define OPTIONS_REAPPLY_FULL                                     \
-    OPTIONS_REAPPLY_SUBSET, NM_SETTING_BOND_OPTION_ACTIVE_SLAVE, \
-        NM_SETTING_BOND_OPTION_ARP_IP_TARGET, NM_SETTING_BOND_OPTION_NS_IP6_TARGET
+#define OPTIONS_REAPPLY_FULL                                                        \
+    OPTIONS_REAPPLY_SUBSET, NM_SETTING_BOND_OPTION_ACTIVE_SLAVE,                    \
+        NM_SETTING_BOND_OPTION_ARP_IP_TARGET, NM_SETTING_BOND_OPTION_NS_IP6_TARGET, \
+        NM_SETTING_BOND_OPTION_ARP_MISSED_MAX
 
 /*****************************************************************************/
 
@@ -501,6 +502,8 @@ _platform_lnk_bond_init_from_setting(NMSettingBond *s_bond, NMPlatformLnkBond *p
     props->lp_interval_has      = props->lp_interval != 1;
     props->tlb_dynamic_lb_has   = NM_IN_SET(props->mode, NM_BOND_MODE_TLB, NM_BOND_MODE_ALB);
     props->lacp_active_has      = NM_IN_SET(props->mode, NM_BOND_MODE_8023AD);
+    props->arp_missed_max_has =
+        !NM_IN_SET(props->mode, NM_BOND_MODE_TLB, NM_BOND_MODE_ALB, NM_BOND_MODE_8023AD);
 }
 
 static void
@@ -907,6 +910,8 @@ reapply_connection(NMDevice *device, NMConnection *con_old, NMConnection *con_ne
     set_bond_arp_ip_targets(device, s_bond);
 
     set_bond_attrs_or_default(device, s_bond, NM_MAKE_STRV(OPTIONS_REAPPLY_SUBSET));
+    if (!NM_IN_SET(mode, NM_BOND_MODE_TLB, NM_BOND_MODE_ALB, NM_BOND_MODE_8023AD))
+        set_bond_attr_or_default(device, s_bond, NM_SETTING_BOND_OPTION_ARP_MISSED_MAX);
 
     _balance_slb_setup(self, con_new);
 }
diff --git a/src/core/devices/nm-device-ethernet.c b/src/core/devices/nm-device-ethernet.c
index 11f691de..b550b10a 100644
--- a/src/core/devices/nm-device-ethernet.c
+++ b/src/core/devices/nm-device-ethernet.c
@@ -1684,11 +1684,13 @@ complete_connection(NMDevice            *device,
 
         con_peer_name = nm_setting_veth_get_peer(s_veth);
         if (con_peer_name) {
-            nm_utils_error_set(error,
-                               NM_UTILS_ERROR_UNKNOWN,
-                               "mismatching veth peer \"%s\"",
-                               con_peer_name);
-            return FALSE;
+            if (!nm_streq(con_peer_name, peer_name)) {
+                nm_utils_error_set(error,
+                                   NM_UTILS_ERROR_UNKNOWN,
+                                   "mismatching veth peer \"%s\"",
+                                   con_peer_name);
+                return FALSE;
+            }
         } else
             g_object_set(s_veth, NM_SETTING_VETH_PEER, peer_name, NULL);
 
diff --git a/src/core/devices/nm-device-macvlan.c b/src/core/devices/nm-device-macvlan.c
index c5bcc91a..d3cbb663 100644
--- a/src/core/devices/nm-device-macvlan.c
+++ b/src/core/devices/nm-device-macvlan.c
@@ -468,7 +468,12 @@ static const NMDBusInterfaceInfoExtended interface_info_device_macvlan = {
             NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("NoPromisc",
                                                            "b",
                                                            NM_DEVICE_MACVLAN_NO_PROMISC),
-            NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Tab", "b", NM_DEVICE_MACVLAN_TAP), ), ),
+            NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Tap", "b", NM_DEVICE_MACVLAN_TAP),
+            NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
+                "Tab",
+                "b",
+                NM_DEVICE_MACVLAN_TAP,
+                .annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ), ), ),
 };
 
 static void
diff --git a/src/core/devices/nm-device-veth.c b/src/core/devices/nm-device-veth.c
index c4b9e234..8be29fe9 100644
--- a/src/core/devices/nm-device-veth.c
+++ b/src/core/devices/nm-device-veth.c
@@ -53,7 +53,7 @@ update_properties(NMDevice *device)
     nm_device_parent_set_ifindex(device, peer_ifindex);
 
     peer = nm_device_parent_get_device(device);
-    if (peer && NM_IS_DEVICE_VETH(peer) && nm_device_parent_get_ifindex(peer) <= 0)
+    if (peer && NM_IS_DEVICE_VETH(peer) && !nm_device_parent_get_device(peer))
         update_properties(peer);
 }
 
diff --git a/src/core/devices/nm-device-vxlan.c b/src/core/devices/nm-device-vxlan.c
index 4058287c..87844e6f 100644
--- a/src/core/devices/nm-device-vxlan.c
+++ b/src/core/devices/nm-device-vxlan.c
@@ -176,14 +176,14 @@ create_and_realize(NMDevice              *device,
     if (str) {
         if (!nm_inet_parse_bin(AF_INET, str, NULL, &props.local)
             && !nm_inet_parse_bin(AF_INET6, str, NULL, &props.local6))
-            return FALSE;
+            return nm_assert_unreachable_val(FALSE);
     }
 
     str = nm_setting_vxlan_get_remote(s_vxlan);
     if (str) {
         if (!nm_inet_parse_bin(AF_INET, str, NULL, &props.group)
             && !nm_inet_parse_bin(AF_INET6, str, NULL, &props.group6))
-            return FALSE;
+            return nm_assert_unreachable_val(FALSE);
     }
 
     props.tos          = nm_setting_vxlan_get_tos(s_vxlan);
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index a0cf1ee6..e3457e34 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -805,7 +805,7 @@ typedef struct _NMDevicePrivate {
 
     GVariant *ports_variant; /* Array of port devices D-Bus path */
     char     *prop_ip_iface; /* IP interface D-Bus property */
-    GList    *ping_operations;
+    CList     ping_ops_lst_head;
     GSource  *ping_timeout;
 } NMDevicePrivate;
 
@@ -850,7 +850,6 @@ static const char *_activation_func_to_string(ActivationHandleFunc func);
 static void
 _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason, gboolean quitting);
 static void queued_state_clear(NMDevice *device);
-static void ip_check_ping_watch_cb(GPid pid, int status, gpointer user_data);
 static void nm_device_start_ip_check(NMDevice *self);
 static void realize_start_setup(NMDevice             *self,
                                 const NMPlatformLink *plink,
@@ -907,10 +906,11 @@ static void concheck_update_state(NMDevice           *self,
 static void sriov_op_cb(GError *error, gpointer user_data);
 
 static void device_ifindex_changed_cb(NMManager *manager, NMDevice *device_changed, NMDevice *self);
-static gboolean device_link_changed(gpointer user_data);
-static gboolean _get_maybe_ipv6_disabled(NMDevice *self);
-static void     deactivate_ready(NMDevice *self, NMDeviceStateReason reason);
-static void     carrier_disconnected_action_cancel(NMDevice *self);
+static gboolean    device_link_changed(gpointer user_data);
+static gboolean    _get_maybe_ipv6_disabled(NMDevice *self);
+static void        deactivate_ready(NMDevice *self, NMDeviceStateReason reason);
+static void        carrier_disconnected_action_cancel(NMDevice *self);
+static const char *nm_device_get_effective_ip_config_method(NMDevice *self, int addr_family);
 
 /*****************************************************************************/
 
@@ -1294,7 +1294,7 @@ _prop_get_ipv6_dhcp_duid(NMDevice     *self,
             gint64  time;
             guint32 timestamp;
 
-#define EPOCH_DATETIME_THREE_YEARS (356 * 24 * 3600 * 3)
+#define EPOCH_DATETIME_THREE_YEARS (365 * 24 * 3600 * 3)
 
             /* We want a variable time between the host_id timestamp and three years
              * before. Let's compute the time (in seconds) from 0 to 3 years; then we'll
@@ -1524,6 +1524,50 @@ _prop_get_connection_dnssec(NMDevice *self, NMConnection *connection)
                                                        NM_SETTING_CONNECTION_DNSSEC_DEFAULT);
 }
 
+static NMSettingIp4ConfigClat
+_prop_get_ipv4_clat(NMDevice *self, gboolean do_log)
+{
+    NMSettingIP4Config    *s_ip4 = NULL;
+    NMSettingIp4ConfigClat clat;
+    const char            *method;
+
+    s_ip4 = nm_device_get_applied_setting(self, NM_TYPE_SETTING_IP4_CONFIG);
+    if (!s_ip4)
+        return NM_SETTING_IP4_CONFIG_CLAT_NO;
+
+    method = nm_device_get_effective_ip_config_method(self, AF_INET);
+    if (nm_streq(method, NM_SETTING_IP4_CONFIG_METHOD_DISABLED))
+        return NM_SETTING_IP4_CONFIG_CLAT_NO;
+
+    clat = nm_setting_ip4_config_get_clat(s_ip4);
+    if (clat == NM_SETTING_IP4_CONFIG_CLAT_DEFAULT) {
+        clat = nm_config_data_get_connection_default_int64(NM_CONFIG_GET_DATA,
+                                                           NM_CON_DEFAULT("ipv4.clat"),
+                                                           self,
+                                                           NM_SETTING_IP4_CONFIG_CLAT_NO,
+                                                           NM_SETTING_IP4_CONFIG_CLAT_FORCE,
+                                                           NM_SETTING_IP4_CONFIG_CLAT_NO);
+    }
+
+    if (clat == NM_SETTING_IP4_CONFIG_CLAT_AUTO
+        && !nm_streq(method, NM_SETTING_IP4_CONFIG_METHOD_AUTO)) {
+        /* clat=auto enables CLAT only with method=auto */
+        clat = NM_SETTING_IP4_CONFIG_CLAT_NO;
+    }
+
+    if (!HAVE_CLAT
+        && NM_IN_SET(clat, NM_SETTING_IP4_CONFIG_CLAT_AUTO, NM_SETTING_IP4_CONFIG_CLAT_FORCE)) {
+        if (do_log) {
+            _NMLOG(clat == NM_SETTING_IP4_CONFIG_CLAT_FORCE ? LOGL_WARN : LOGL_TRACE,
+                   LOGD_DEVICE,
+                   "CLAT will not work because it is disabled at build time");
+        }
+        clat = NM_SETTING_IP4_CONFIG_CLAT_NO;
+    }
+
+    return clat;
+}
+
 static NMMptcpFlags
 _prop_get_connection_mptcp_flags(NMDevice *self, NMConnection *connection)
 {
@@ -1922,26 +1966,43 @@ _prop_get_ipvx_may_fail_cached(NMDevice *self, int addr_family, NMTernary *cache
 }
 
 static gboolean
-_prop_get_ipv4_dhcp_ipv6_only_preferred(NMDevice *self)
+_prop_get_ipv4_dhcp_ipv6_only_preferred(NMDevice *self, gboolean *out_is_auto)
 {
     NMSettingIP4Config               *s_ip4;
     NMSettingIP4DhcpIpv6OnlyPreferred ipv6_only;
 
+    NM_SET_OUT(out_is_auto, FALSE);
+
     s_ip4 = nm_device_get_applied_setting(self, NM_TYPE_SETTING_IP4_CONFIG);
     if (!s_ip4)
         return FALSE;
 
     ipv6_only = nm_setting_ip4_config_get_dhcp_ipv6_only_preferred(s_ip4);
-    if (ipv6_only != NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_DEFAULT)
-        return ipv6_only;
+    if (ipv6_only == NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_DEFAULT) {
+        ipv6_only = nm_config_data_get_connection_default_int64(
+            NM_CONFIG_GET_DATA,
+            NM_CON_DEFAULT("ipv4.dhcp-ipv6-only-preferred"),
+            self,
+            NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_NO,
+            NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_AUTO,
+            NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_AUTO);
+    }
 
-    return nm_config_data_get_connection_default_int64(
-        NM_CONFIG_GET_DATA,
-        NM_CON_DEFAULT("ipv4.dhcp-ipv6-only-preferred"),
-        self,
-        NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_NO,
-        NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_YES,
-        NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_NO);
+    if (NM_IN_SET(ipv6_only,
+                  NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_YES,
+                  NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_NO))
+        return ipv6_only == NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_YES;
+
+    /* auto */
+    NM_SET_OUT(out_is_auto, TRUE);
+
+    if (nm_streq0(nm_device_get_effective_ip_config_method(self, AF_INET6),
+                  NM_SETTING_IP6_CONFIG_METHOD_AUTO)
+        && _prop_get_ipv4_clat(self, FALSE) != NM_SETTING_IP4_CONFIG_CLAT_NO) {
+        return TRUE;
+    }
+
+    return FALSE;
 }
 
 /**
@@ -3623,6 +3684,7 @@ nm_device_create_l3_config_data_from_connection(NMDevice *self, NMConnection *co
 {
     NML3ConfigData *l3cd;
     int             ifindex;
+    gs_free char   *gw_warning = NULL;
 
     nm_assert(NM_IS_DEVICE(self));
     nm_assert(!connection || NM_IS_CONNECTION(connection));
@@ -3642,6 +3704,11 @@ nm_device_create_l3_config_data_from_connection(NMDevice *self, NMConnection *co
     nm_l3_config_data_set_dnssec(l3cd, _prop_get_connection_dnssec(self, connection));
     nm_l3_config_data_set_ip6_privacy(l3cd, _prop_get_ipv6_ip6_privacy(self, connection));
     nm_l3_config_data_set_mptcp_flags(l3cd, _prop_get_connection_mptcp_flags(self, connection));
+
+    gw_warning = nm_connection_get_unreachable_gateways_warning(connection, FALSE);
+    if (gw_warning)
+        _LOGW(LOGD_IP, "%s", gw_warning);
+
     return l3cd;
 }
 
@@ -4924,7 +4991,7 @@ _dev_l3_cfg_notify_cb(NML3Cfg *l3cfg, const NML3ConfigNotifyData *notify_data, N
         if (state >= NM_DEVICE_STATE_IP_CONFIG && state < NM_DEVICE_STATE_DEACTIVATING) {
             /* FIXME(l3cfg): MTU handling should be moved to l3cfg. */
             if (l3cd)
-                priv->ip6_mtu = nm_l3_config_data_get_ip6_mtu(l3cd);
+                priv->ip6_mtu = nm_l3_config_data_get_ip6_mtu_ra(l3cd);
             _commit_mtu(self);
         }
         _dev_ipll4_check_fallback(self, l3cd);
@@ -6345,6 +6412,14 @@ concheck_is_possible(NMDevice *self)
     if (priv->state == NM_DEVICE_STATE_UNKNOWN)
         return FALSE;
 
+    if (!nm_config_data_get_device_config_boolean_by_device(
+            NM_CONFIG_GET_DATA,
+            NM_CONFIG_KEYFILE_KEY_DEVICE_CHECK_CONNECTIVITY,
+            self,
+            TRUE,
+            TRUE))
+        return FALSE;
+
     return TRUE;
 }
 
@@ -6365,8 +6440,10 @@ concheck_periodic_schedule_do(NMDevice *self, int addr_family, gint64 now_ns)
         goto out;
     }
 
-    if (!concheck_is_possible(self))
+    if (!concheck_is_possible(self)) {
+        concheck_update_state(self, addr_family, NM_CONNECTIVITY_UNKNOWN, FALSE);
         goto out;
+    }
 
     nm_assert(now_ns > 0);
     nm_assert(priv->concheck_x[IS_IPv4].p_cur_interval > 0);
@@ -6589,7 +6666,11 @@ concheck_update_interval(NMDevice *self, int addr_family, gboolean check_now)
         concheck_periodic_schedule_do(self, addr_family, 0);
 
         /* also update the fake connectivity state. */
-        concheck_update_state(self, addr_family, NM_CONNECTIVITY_FAKE, TRUE);
+        if (concheck_is_possible(self))
+            concheck_update_state(self, addr_family, NM_CONNECTIVITY_FAKE, TRUE);
+        else
+            concheck_update_state(self, addr_family, NM_CONNECTIVITY_UNKNOWN, FALSE);
+
         return;
     }
 
@@ -6618,6 +6699,7 @@ concheck_update_state(NMDevice           *self,
     /* @state is a result of the connectivity check. We only expect a precise
      * number of possible values. */
     nm_assert(NM_IN_SET(state,
+                        NM_CONNECTIVITY_UNKNOWN,
                         NM_CONNECTIVITY_LIMITED,
                         NM_CONNECTIVITY_PORTAL,
                         NM_CONNECTIVITY_FULL,
@@ -6941,8 +7023,11 @@ nm_device_check_connectivity(NMDevice                    *self,
                              NMDeviceConnectivityCallback callback,
                              gpointer                     user_data)
 {
-    if (!concheck_is_possible(self))
+    if (!concheck_is_possible(self)) {
+        concheck_update_state(self, AF_INET, NM_CONNECTIVITY_UNKNOWN, FALSE);
+        concheck_update_state(self, AF_INET6, NM_CONNECTIVITY_UNKNOWN, FALSE);
         return NULL;
+    }
 
     concheck_periodic_schedule_set(self, addr_family, CONCHECK_SCHEDULE_CHECK_EXTERNAL);
     return concheck_start(self, addr_family, callback, user_data, FALSE);
@@ -7149,7 +7234,9 @@ nm_device_controller_release_port(NMDevice           *self,
 
     info = find_port_info(self, port);
 
-    if (info->port_state == PORT_STATE_ATTACHED)
+    if (!info)
+        port_state_str = "(not registered)";
+    else if (info->port_state == PORT_STATE_ATTACHED)
         port_state_str = "(attached)";
     else if (info->port_state == PORT_STATE_NOT_ATTACHED)
         port_state_str = "(not attached)";
@@ -7162,7 +7249,7 @@ nm_device_controller_release_port(NMDevice           *self,
           "controller: release one port " NM_HASH_OBFUSCATE_PTR_FMT "/%s %s%s",
           NM_HASH_OBFUSCATE_PTR(port),
           nm_device_get_iface(port),
-          !info ? "(not registered)" : port_state_str,
+          port_state_str,
           release_type == RELEASE_PORT_TYPE_CONFIG_FORCE
               ? " (force-configure)"
               : (release_type == RELEASE_PORT_TYPE_CONFIG ? " (configure)" : "(no-config)"));
@@ -7191,6 +7278,8 @@ nm_device_controller_release_port(NMDevice           *self,
         if (ret == NM_TERNARY_DEFAULT) {
             port_priv->port_detach_count++;
             port_priv->port_detach_reason = reason;
+        } else {
+            g_object_unref(port);
         }
     }
 
@@ -7798,6 +7887,12 @@ device_link_changed(gpointer user_data)
                                                NM_UNMANAGED_PLATFORM_INIT,
                                                NM_UNMAN_FLAG_OP_SET_MANAGED,
                                                nm_device_get_manage_reason_external(self));
+
+        /* Now that we got UDEV's announcement we need to check ignore-carrier again.
+         * This is because the permanent MAC might have been set or changed. If we don't
+         * recheck we would ignore rules matching by MAC address. */
+        priv->ignore_carrier =
+            nm_config_data_get_ignore_carrier_by_device(nm_config_get_data(nm_config_get()), self);
     }
 
     _dev_unmanaged_check_external_down(self, FALSE, FALSE);
@@ -8330,6 +8425,17 @@ config_changed(NMConfig           *config,
             && !nm_device_get_applied_setting(self, NM_TYPE_SETTING_SRIOV))
             device_init_static_sriov_num_vfs(self);
     }
+
+    if (NM_FLAGS_HAS(changes, NM_CONFIG_CHANGE_VALUES) && concheck_is_possible(self)) {
+        /* restart (periodic) connectivity checks if they were previously disabled */
+        if (!nm_config_data_get_device_config_boolean_by_device(
+                old_data,
+                NM_CONFIG_KEYFILE_KEY_DEVICE_CHECK_CONNECTIVITY,
+                self,
+                TRUE,
+                TRUE))
+            nm_device_check_connectivity_update_interval(self);
+    }
 }
 
 static void
@@ -8463,10 +8569,13 @@ realize_start_setup(NMDevice             *self,
     nm_device_update_initial_hw_address(self);
     nm_device_update_permanent_hw_address(self, FALSE);
 
-    /* Note: initial hardware address must be read before calling get_ignore_carrier() */
+    /* Note: initial hardware address must be read before calling get_ignore_carrier(). We'll
+     * need to recheck ignore_carrier again after UDEV's announcement, as the permanent MAC
+     * address may be set by UDEV. */
     config = nm_config_get();
     priv->ignore_carrier =
         nm_config_data_get_ignore_carrier_by_device(nm_config_get_data(config), self);
+
     if (!priv->config_changed_id) {
         priv->config_changed_id = g_signal_connect(config,
                                                    NM_CONFIG_SIGNAL_CONFIG_CHANGED,
@@ -11440,6 +11549,8 @@ _dev_ipmanual_start(NMDevice *self)
         if (_prop_get_ipvx_routed_dns(self, AF_INET6) == NM_SETTING_IP_CONFIG_ROUTED_DNS_YES) {
             nm_l3_config_data_set_routed_dns(l3cd, AF_INET6, TRUE);
         }
+
+        nm_l3_config_data_set_clat_config(l3cd, _prop_get_ipv4_clat(self, TRUE));
     }
 
     if (!l3cd) {
@@ -11748,8 +11859,9 @@ _dev_ipdhcpx_start(NMDevice *self, int addr_family)
         gboolean               hostname_is_fqdn;
         gboolean               send_client_id;
         guint8                 dscp;
-        gboolean               dscp_explicit  = FALSE;
-        gboolean               ipv6_only_pref = FALSE;
+        gboolean               dscp_explicit       = FALSE;
+        gboolean               ipv6_only_pref      = FALSE;
+        gboolean               ipv6_only_pref_auto = FALSE;
 
         client_id = _prop_get_ipv4_dhcp_client_id(self, connection, hwaddr, &send_client_id);
         dscp      = _prop_get_ipv4_dhcp_dscp(self, &dscp_explicit);
@@ -11768,13 +11880,15 @@ _dev_ipdhcpx_start(NMDevice *self, int addr_family)
             hostname         = nm_setting_ip_config_get_dhcp_hostname(s_ip);
         }
 
-        if (_prop_get_ipv4_dhcp_ipv6_only_preferred(self)) {
+        if (_prop_get_ipv4_dhcp_ipv6_only_preferred(self, &ipv6_only_pref_auto)) {
             if (nm_streq0(priv->ipv6_method, NM_SETTING_IP6_CONFIG_METHOD_DISABLED)) {
                 _LOGI_ipdhcp(
                     addr_family,
                     "not requesting the \"IPv6-only preferred\" option because IPv6 is disabled");
             } else {
-                _LOGD_ipdhcp(addr_family, "requesting the \"IPv6-only preferred\" option");
+                _LOGD_ipdhcp(addr_family,
+                             "requesting the \"IPv6-only preferred\" option (%s enabled)",
+                             ipv6_only_pref_auto ? "automatically" : "explicitly");
                 ipv6_only_pref = TRUE;
             }
         }
@@ -13585,13 +13699,21 @@ activate_stage3_ip_config(NMDevice *self)
                   nm_device_get_ip_iface(self));
     }
 
-    /* We currently will attach ports in the state change NM_DEVICE_STATE_IP_CONFIG above.
-     * Note that kernel changes the MTU of bond ports, so we want to commit the MTU
-     * afterwards!
+    /*
+     * Let's make sure MTU matches what is configured. The reason it's done at this
+     * precise location is twofold:
+     *
+     * (1) Attaching ports above might affect the MTU.
+     *
+     * We currently will attach ports in the state change NM_DEVICE_STATE_IP_CONFIG
+     * above. This might reset the MTU to something different from the bond controller
+     * and it might not be a working configuration. But it's what the user asked for.
+     *
+     * (2) When MTU is under 1280 IPv6 can not work.
      *
-     * This might reset the MTU to something different from the bond controller and
-     * it might not be a working configuration. But it's what the user asked for, so
-     * let's do it! */
+     * Kernel will not expose sysctls, create or accept addresses that are needed for IPv6
+     * configuration when the MTU is too small (under 1280).
+     */
     _commit_mtu(self);
 
     if (!nm_device_managed_type_is_external(self)
@@ -13600,12 +13722,6 @@ activate_stage3_ip_config(NMDevice *self)
             && !NM_IN_STRSET(priv->ipv6_method,
                              NM_SETTING_IP6_CONFIG_METHOD_DISABLED,
                              NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) {
-            /* Ensure the MTU makes sense. If it was below 1280 the kernel would not
-             * expose any ipv6 sysctls or allow presence of any addresses on the interface,
-             * including LL, which * would make it impossible to autoconfigure MTU to a
-             * correct value. */
-            _commit_mtu(self);
-
             /* Any method past this point requires an IPv6LL address. Use NM-controlled
              * IPv6LL if this is not an assumed connection, since assumed connections
              * will already have IPv6 set up.
@@ -14583,6 +14699,12 @@ check_and_reapply_connection(NMDevice            *self,
 
         reactivate_proxy_config(self);
 
+        /* Reapply may have changed the per-device L3 merge flags (ignore-auto-dns,
+         * ignore-auto-routes, never-default). Re-register the active l3cds so the
+         * refreshed flags reach l3cfg even for sources that are not restarted on
+         * reapply (e.g. DHCPv6 when the NDisc DHCP level is unchanged). */
+        _dev_l3_register_l3cds(self, priv->l3cfg, TRUE, FALSE);
+
         nm_device_l3cfg_commit(
             self,
             NM_FLAGS_HAS(reapply_flags, NM_DEVICE_REAPPLY_FLAGS_PRESERVE_EXTERNAL_IP)
@@ -15588,35 +15710,15 @@ _dispatcher_complete_proceed_state(NMDispatcherCallId *call_id, gpointer user_da
 /*****************************************************************************/
 
 typedef struct {
-    NMLogDomain log_domain;
-    NMDevice   *device;
-    gboolean    ping_addresses_require_all;
-    GSource    *watch;
-    GPid        pid;
-    char       *binary;
-    char       *address;
-    guint       deadline;
-} PingOperation;
-
-static PingOperation *
-ping_operation_new(NMDevice   *self,
-                   NMLogDomain log_domain,
-                   const char *address,
-                   const char *ping_binary,
-                   guint       ping_timeout,
-                   gboolean    ip_ping_addresses_require_all)
-{
-    PingOperation *ping_op = g_new0(PingOperation, 1);
-
-    ping_op->device                     = self;
-    ping_op->log_domain                 = log_domain;
-    ping_op->address                    = g_strdup(address);
-    ping_op->binary                     = g_strdup(ping_binary);
-    ping_op->deadline                   = ping_timeout + 10;
-    ping_op->ping_addresses_require_all = ip_ping_addresses_require_all;
+    char         *addr_str;
+    NMIPAddrTyped addr_bin;
 
-    return ping_op;
-}
+    NMLogDomain   log_domain;
+    NMDevice     *device;
+    GCancellable *cancellable;
+    gboolean      require_all;
+    CList         ping_ops_lst;
+} PingOperation;
 
 static void
 ip_check_pre_up(NMDevice *self)
@@ -15640,188 +15742,154 @@ ip_check_pre_up(NMDevice *self)
 }
 
 static void
-cleanup_ping_operation(PingOperation *ping_op)
+ping_op_cleanup(PingOperation *ping_op)
 {
-    if (ping_op->watch) {
-        nm_clear_g_source_inst(&ping_op->watch);
-    }
-
-    if (ping_op->pid) {
-        nm_utils_kill_child_async(ping_op->pid,
-                                  SIGTERM,
-                                  ping_op->log_domain,
-                                  "ping",
-                                  1000,
-                                  NULL,
-                                  NULL);
-        ping_op->pid = 0;
-    }
-
-    nm_clear_g_free(&ping_op->binary);
-    nm_clear_g_free(&ping_op->address);
+    nm_clear_g_cancellable(&ping_op->cancellable);
+    nm_clear_g_free(&ping_op->addr_str);
+    c_list_unlink_stale(&ping_op->ping_ops_lst);
 
     g_free(ping_op);
 }
 
-static gboolean
-spawn_ping_for_operation(NMDevice *self, PingOperation *ping_op)
-{
-    gs_free char         *str_timeout = NULL;
-    gs_free char         *tmp_str     = NULL;
-    const char           *args[]      = {ping_op->binary,
-                                         "-I",
-                                         nm_device_get_ip_iface(self),
-                                         "-c",
-                                         "1",
-                                         "-w",
-                                         NULL,
-                                         ping_op->address,
-                                         NULL};
-    gs_free_error GError *error       = NULL;
-    gboolean              ret;
-
-    args[6] = str_timeout = g_strdup_printf("%u", ping_op->deadline);
-
-    tmp_str = g_strjoinv(" ", (char **) args);
-    _LOGD(ping_op->log_domain, "ping: running '%s'", tmp_str);
-
-    ret = g_spawn_async("/",
-                        (char **) args,
-                        NULL,
-                        G_SPAWN_DO_NOT_REAP_CHILD,
-                        NULL,
-                        NULL,
-                        &ping_op->pid,
-                        &error);
+static void
+ping_cleanup(NMDevice *self)
+{
+    NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self);
+    PingOperation   *ping_op;
 
-    if (ret) {
-        ping_op->watch = nm_g_child_watch_add_source(ping_op->pid, ip_check_ping_watch_cb, ping_op);
-    } else {
-        _LOGD(ping_op->log_domain, "ping: could not spawn %s: %s", ping_op->binary, error->message);
+    while ((ping_op = c_list_first_entry(&priv->ping_ops_lst_head, PingOperation, ping_ops_lst))) {
+        ping_op_cleanup(ping_op);
     }
 
-    return ret;
+    nm_clear_g_source_inst(&priv->ping_timeout);
 }
 
-static gboolean
-respawn_ping_cb(gpointer user_data)
+static void
+ping_host_cb(GObject *source, GAsyncResult *result, gpointer user_data)
 {
-    PingOperation   *ping_op = (PingOperation *) user_data;
-    NMDevice        *self    = ping_op->device;
-    NMDevicePrivate *priv    = NM_DEVICE_GET_PRIVATE(self);
+    NMDevice             *self;
+    NMDevicePrivate      *priv;
+    PingOperation        *ping_op = user_data;
+    gs_free_error GError *error   = NULL;
+    gboolean              success;
+    NMLogDomain           log_domain;
+    gs_free char         *addr_str = NULL;
+
+    success = nm_utils_ping_host_finish(result, &error);
+    if (nm_utils_error_is_cancelled(error))
+        return;
 
-    nm_clear_g_source_inst(&ping_op->watch);
+    self       = NM_DEVICE(ping_op->device);
+    priv       = NM_DEVICE_GET_PRIVATE(self);
+    log_domain = ping_op->log_domain;
+    addr_str   = g_steal_pointer(&ping_op->addr_str);
 
-    if (!spawn_ping_for_operation(self, ping_op)) {
-        priv->ping_operations = g_list_remove(priv->ping_operations, ping_op);
-        cleanup_ping_operation(ping_op);
+    if (!success) {
+        /* it should never fail because we set an infinite timeout */
+        nm_assert_not_reached();
+        return;
+    }
 
-        if (g_list_length(priv->ping_operations) == 0) {
-            ip_check_pre_up(self);
+    if (ping_op->require_all) {
+        ping_op_cleanup(ping_op);
+        if (!c_list_is_empty(&priv->ping_ops_lst_head)) {
+            _LOGD(log_domain,
+                  "ping: check on address %s succeeded, waiting for other addresses",
+                  addr_str);
+            return;
         }
     }
 
-    return FALSE;
+    _LOGD(log_domain, "ping: check on address %s succeeded, continuing the activation", addr_str);
+
+    ping_cleanup(self);
+    ip_check_pre_up(self);
 }
 
 static void
-ip_check_ping_watch_cb(GPid pid, int status, gpointer user_data)
+ping_operation_start(NMDevice      *self,
+                     const char    *addr_str,
+                     NMIPAddrTyped *addr_bin,
+                     gboolean       require_all)
 {
-    PingOperation   *ping_op = (PingOperation *) user_data;
-    NMDevice        *self    = ping_op->device;
-    NMDevicePrivate *priv    = NM_DEVICE_GET_PRIVATE(self);
-    gboolean         success = FALSE;
-
-    if (!ping_op->watch)
-        return;
-
-    nm_clear_g_source_inst(&ping_op->watch);
-    ping_op->pid = 0;
-
-    if (WIFEXITED(status)) {
-        if (WEXITSTATUS(status) == 0) {
-            _LOGD(ping_op->log_domain, "ping: ping succeeded on %s", ping_op->address);
-            success = TRUE;
-        } else {
-            _LOGD(ping_op->log_domain,
-                  "ping: ping failed with error code %d on %s",
-                  WEXITSTATUS(status),
-                  ping_op->address);
-        }
+    PingOperation   *ping_op;
+    NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self);
+    NMIPAddrTyped    addr_bin_local;
+    char             buf[NM_INET_ADDRSTRLEN];
+    int              addr_family;
+    int              ret;
+
+    /* Exactly one of the two must be set */
+    nm_assert(!!addr_str ^ !!addr_bin);
+
+    /* Derive the string address from the binary and vice versa */
+    if (addr_str) {
+        ret = nm_inet_parse_bin_full(AF_UNSPEC,
+                                     FALSE,
+                                     addr_str,
+                                     &addr_family,
+                                     &addr_bin_local.addr.addr_ptr);
+        nm_assert(ret);
+        addr_bin_local.addr_family = addr_family;
+        addr_bin                   = &addr_bin_local;
     } else {
-        _LOGD(ping_op->log_domain,
-              "ping: stopped unexpectedly with status %d on %s",
-              status,
-              ping_op->address);
-    }
-
-    if (success) {
-        if (ping_op->ping_addresses_require_all) {
-            priv->ping_operations = g_list_remove(priv->ping_operations, ping_op);
-            if (g_list_length(priv->ping_operations) == 0) {
-                _LOGD(ping_op->log_domain,
-                      "ping: ip-ping-addresses requires all, all ping checks on ip-ping-addresses "
-                      "succeeded");
-                if (priv->ping_timeout)
-                    nm_clear_g_source_inst(&priv->ping_timeout);
-                ip_check_pre_up(self);
-            }
-            cleanup_ping_operation(ping_op);
-        } else {
-            nm_assert(priv->ping_operations);
-
-            g_list_free_full(priv->ping_operations, (GDestroyNotify) cleanup_ping_operation);
-            priv->ping_operations = NULL;
+        nm_inet_ntop(addr_bin->addr_family, addr_bin->addr.addr_ptr, buf);
+        addr_str = buf;
+    }
+
+    /* When pinging the gateway, the caller must ensure that the IP configuration is ready.
+     * For the ip-ping-addresses property, a valid connection always has may-fail=no for
+     * the families of all the target addresses. Thus, at this point the IP configuration
+     * must also be ready. */
+    nm_assert(priv->ip_data_x[NM_IS_IPv4(addr_bin->addr_family)].state == NM_DEVICE_IP_STATE_READY);
+
+    ping_op  = g_new(PingOperation, 1);
+    *ping_op = (PingOperation) {
+        .device      = self,
+        .cancellable = g_cancellable_new(),
+        .require_all = require_all,
+        .addr_bin    = *addr_bin,
+        .addr_str    = g_strdup(addr_str),
+        .log_domain  = (addr_bin->addr_family == AF_INET) ? LOGD_IP4 : LOGD_IP6,
+    };
 
-            if (priv->ping_timeout)
-                nm_clear_g_source_inst(&priv->ping_timeout);
+    /* Start the asynchronous ping operation */
+    nm_utils_ping_host(ping_op->addr_bin,
+                       nm_device_get_ip_ifindex(self),
+                       0, /* try forever */
+                       ping_op->cancellable,
+                       ping_host_cb,
+                       ping_op);
 
-            _LOGD(ping_op->log_domain,
-                  "ping: ip-ping-addresses requires any, one ping check on ip-ping-addresses "
-                  "succeeded");
-            ip_check_pre_up(self);
-        }
-    } else {
-        /* If ping exited with an error it may have returned early,
-         * wait 1 second and restart it */
-        ping_op->watch = nm_g_timeout_add_seconds_source(1, respawn_ping_cb, ping_op);
-    }
+    c_list_link_tail(&priv->ping_ops_lst_head, &ping_op->ping_ops_lst);
 }
 
 static gboolean
 ip_check_ping_timeout_cb(gpointer user_data)
 {
-    NMDevice        *self = NM_DEVICE(user_data);
-    NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self);
-
-    _LOGW(LOGD_DEVICE, "ping timeout: unreachable gateway or ip-ping-addresses");
-
-    if (priv->ping_operations) {
-        g_list_free_full(priv->ping_operations, (GDestroyNotify) cleanup_ping_operation);
-        priv->ping_operations = NULL;
+    NMDevice                     *self = NM_DEVICE(user_data);
+    NMDevicePrivate              *priv = NM_DEVICE_GET_PRIVATE(self);
+    PingOperation                *ping_op;
+    nm_auto_free_gstring GString *str = NULL;
+
+    if (_LOGW_ENABLED(LOGD_DEVICE)) {
+        str = g_string_new("");
+        c_list_for_each_entry (ping_op, &priv->ping_ops_lst_head, ping_ops_lst) {
+            if (str->len != 0)
+                g_string_append(str, ", ");
+            g_string_append(str, ping_op->addr_str);
+        }
+        _LOGW(LOGD_DEVICE,
+              "ping: the following addresses were not reachable within the timeout: %s",
+              str->str);
     }
 
-    if (priv->ping_timeout)
-        nm_clear_g_source_inst(&priv->ping_timeout);
+    ping_cleanup(self);
     ip_check_pre_up(self);
 
     return FALSE;
 }
 
-static gboolean
-start_ping(NMDevice *self, PingOperation *ping_op)
-{
-    NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self);
-
-    if (spawn_ping_for_operation(self, ping_op)) {
-        priv->ping_operations = g_list_append(priv->ping_operations, ping_op);
-        return TRUE;
-    }
-
-    cleanup_ping_operation(ping_op);
-    return FALSE;
-}
-
 static void
 nm_device_start_ip_check(NMDevice *self)
 {
@@ -15830,17 +15898,13 @@ nm_device_start_ip_check(NMDevice *self)
     NMSettingConnection *s_con;
     guint                gw_ping_timeout = 0;
     guint                ip_ping_timeout = 0;
-    const char          *ping_binary     = NULL;
-    char                 buf[NM_INET_ADDRSTRLEN];
-    NMLogDomain          log_domain = LOGD_IP4;
-    gboolean             ip_ping_addresses_require_all;
-    gboolean             ping_started = FALSE;
+    gboolean             require_all;
+    NMIPAddrTyped        addr_bin = {};
 
     /* Shouldn't be any active ping here, since IP_CHECK happens after the
      * first IP method completes.  Any subsequently completing IP method doesn't
-     * get checked.
-     */
-    g_return_if_fail(priv->ping_operations == NULL);
+     * get checked. */
+    g_return_if_fail(c_list_is_empty(&priv->ping_ops_lst_head));
     g_return_if_fail(priv->ip_data_4.state == NM_DEVICE_IP_STATE_READY
                      || priv->ip_data_6.state == NM_DEVICE_IP_STATE_READY);
 
@@ -15849,100 +15913,71 @@ nm_device_start_ip_check(NMDevice *self)
 
     s_con = nm_connection_get_setting_connection(connection);
     g_assert(s_con);
-    gw_ping_timeout               = nm_setting_connection_get_gateway_ping_timeout(s_con);
-    ip_ping_addresses_require_all = _prop_get_connection_ip_ping_addresses_require_all(self, s_con);
-    ip_ping_timeout               = nm_setting_connection_get_ip_ping_timeout(s_con);
+    gw_ping_timeout = nm_setting_connection_get_gateway_ping_timeout(s_con);
+    ip_ping_timeout = nm_setting_connection_get_ip_ping_timeout(s_con);
+    require_all     = _prop_get_connection_ip_ping_addresses_require_all(self, s_con);
 
-    buf[0] = '\0';
-    if (gw_ping_timeout != 0 && ip_ping_timeout == 0) {
+    /* the timeouts are mutually exclusive */
+    nm_assert(gw_ping_timeout == 0 || ip_ping_timeout == 0);
+
+    if (gw_ping_timeout > 0) {
         const NMPObject      *gw;
         const NML3ConfigData *l3cd;
 
-        _LOGD(LOGD_DEVICE, "starting ping gateway...");
-
         l3cd = priv->l3cfg ? nm_l3cfg_get_combined_l3cd(priv->l3cfg, TRUE) : NULL;
         if (!l3cd) {
             /* pass */
         } else if (priv->ip_data_4.state == NM_DEVICE_IP_STATE_READY) {
             gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET);
             if (gw) {
-                nm_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf);
-                ping_binary = nm_utils_find_helper("ping", "/usr/bin/ping", NULL);
-                log_domain  = LOGD_IP4;
+                addr_bin.addr_family = AF_INET;
+                addr_bin.addr.addr4  = NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway;
             }
         } else if (priv->ip_data_6.state == NM_DEVICE_IP_STATE_READY) {
             gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET6);
             if (gw) {
-                nm_inet6_ntop(&NMP_OBJECT_CAST_IP6_ROUTE(gw)->gateway, buf);
-                ping_binary = nm_utils_find_helper("ping6", "/usr/bin/ping6", NULL);
-                log_domain  = LOGD_IP6;
+                addr_bin.addr_family = AF_INET6;
+                addr_bin.addr.addr6  = NMP_OBJECT_CAST_IP6_ROUTE(gw)->gateway;
             }
         }
-    }
-
-    if (buf[0]) {
-        PingOperation *ping_op = ping_operation_new(self,
-                                                    log_domain,
-                                                    buf,
-                                                    ping_binary,
-                                                    gw_ping_timeout,
-                                                    ip_ping_addresses_require_all);
-
-        if (start_ping(self, ping_op))
-            ping_started = TRUE;
-    }
 
-    if (gw_ping_timeout == 0 && ip_ping_timeout != 0) {
+        if (addr_bin.addr_family != AF_UNSPEC) {
+            _LOGD(LOGD_DEVICE,
+                  "starting ping on the IPv%c gateway with a %u seconds timeout",
+                  nm_utils_addr_family_to_char(addr_bin.addr_family),
+                  gw_ping_timeout);
+            ping_operation_start(self, NULL, &addr_bin, require_all);
+        }
+    } else if (ip_ping_timeout > 0) {
         const NML3ConfigData *l3cd;
+        GArray               *ip_ping_addresses;
+        const char *const    *strv;
         guint                 i;
-        GArray            *ip_ping_addresses = _nm_setting_connection_get_ip_ping_addresses(s_con);
-        const char *const *strv = nm_strvarray_get_strv_notempty(ip_ping_addresses, NULL);
 
-        _LOGD(LOGD_DEVICE, "starting ping ip addresses...");
+        ip_ping_addresses = _nm_setting_connection_get_ip_ping_addresses(s_con);
+        strv              = nm_strvarray_get_strv_notnull(ip_ping_addresses, NULL);
 
-        l3cd = priv->l3cfg ? nm_l3cfg_get_combined_l3cd(priv->l3cfg, TRUE) : NULL;
+        _LOGD(LOGD_DEVICE,
+              "starting ping on the ip-ping-addresses with a %u seconds timeout",
+              ip_ping_timeout);
 
+        l3cd = priv->l3cfg ? nm_l3cfg_get_combined_l3cd(priv->l3cfg, TRUE) : NULL;
         if (l3cd) {
             for (i = 0; strv[i]; i++) {
-                const char     *s = strv[i];
-                struct in_addr  ipv4_addr;
-                struct in6_addr ipv6_addr;
-
-                if (priv->ip_data_4.state == NM_DEVICE_IP_STATE_READY
-                    && inet_pton(AF_INET, (const char *) s, &ipv4_addr)) {
-                    ping_binary = nm_utils_find_helper("ping", "/usr/bin/ping", NULL);
-                    log_domain  = LOGD_IP4;
-                } else if (priv->ip_data_6.state == NM_DEVICE_IP_STATE_READY
-                           && inet_pton(AF_INET6, (const char *) s, &ipv6_addr)) {
-                    ping_binary = nm_utils_find_helper("ping6", "/usr/bin/ping6", NULL);
-                    log_domain  = LOGD_IP6;
-                } else
-                    continue;
-
-                if (s[0]) {
-                    PingOperation *ping_op = ping_operation_new(self,
-                                                                log_domain,
-                                                                s,
-                                                                ping_binary,
-                                                                ip_ping_timeout,
-                                                                ip_ping_addresses_require_all);
-
-                    if (start_ping(self, ping_op))
-                        ping_started = TRUE;
-                }
+                ping_operation_start(self, strv[i], NULL, require_all);
             }
         }
     }
 
-    if (ping_started) {
+    if (c_list_is_empty(&priv->ping_ops_lst_head)) {
+        /* No ping operation in progress, advance to pre-up */
+        ip_check_pre_up(self);
+    } else {
         priv->ping_timeout =
-            nm_g_timeout_add_seconds_source(gw_ping_timeout ? gw_ping_timeout : ip_ping_timeout,
+            nm_g_timeout_add_seconds_source(ip_ping_timeout > 0 ? ip_ping_timeout : gw_ping_timeout,
                                             ip_check_ping_timeout_cb,
                                             self);
     }
-    /* If no ping was started, just advance to pre_up. */
-    else
-        ip_check_pre_up(self);
 }
 
 /*****************************************************************************/
@@ -17401,17 +17436,11 @@ _cancel_activation(NMDevice *self)
 
     _dispatcher_cleanup(self);
 
-    if (priv->ping_operations) {
-        g_list_free_full(priv->ping_operations, (GDestroyNotify) cleanup_ping_operation);
-        priv->ping_operations = NULL;
-    }
-
-    if (priv->ping_timeout)
-        nm_clear_g_source_inst(&priv->ping_timeout);
-
     _dev_ip_state_cleanup(self, AF_INET, FALSE);
     _dev_ip_state_cleanup(self, AF_INET6, FALSE);
 
+    ping_cleanup(self);
+
     /* Break the activation chain */
     activation_source_clear(self);
 }
@@ -17968,6 +17997,14 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason,
             nm_device_cleanup(self, reason, CLEANUP_TYPE_DECONFIGURE);
         }
         break;
+    case NM_DEVICE_STATE_DEACTIVATING:
+        /* When deactivating, certain devices are removed/disconnected after the
+         * STATE_CHANGED signal is sent and before the DHCP release packet
+         * can be sent. To ensure the release packet is sent, we cleanup DHCP
+         * before the signal is emitted*/
+        _dev_ipdhcpx_cleanup(self, AF_INET, TRUE, FALSE);
+        _dev_ipdhcpx_cleanup(self, AF_INET6, TRUE, FALSE);
+        break;
     case NM_DEVICE_STATE_DISCONNECTED:
         if (old_state > NM_DEVICE_STATE_DISCONNECTED) {
             /* Ensure devices that previously assumed a connection now have
@@ -18017,6 +18054,7 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason,
                                (guint32) state,
                                (guint32) old_state,
                                (guint32) reason);
+
     g_signal_emit(self,
                   signals[STATE_CHANGED],
                   0,
@@ -18167,13 +18205,8 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason,
         break;
     }
     case NM_DEVICE_STATE_SECONDARIES:
-        if (priv->ping_operations) {
-            g_list_free_full(priv->ping_operations, (GDestroyNotify) cleanup_ping_operation);
-            priv->ping_operations = NULL;
-        }
-        if (priv->ping_timeout)
-            nm_clear_g_source_inst(&priv->ping_timeout);
         _LOGD(LOGD_DEVICE, "device entered SECONDARIES state");
+        ping_cleanup(self);
         break;
     default:
         break;
@@ -19153,14 +19186,14 @@ nm_device_get_supplicant_timeout(NMDevice *self)
                                                        SUPPLICANT_DEFAULT_TIMEOUT);
 }
 
-gboolean
-nm_device_auth_retries_try_next(NMDevice *self)
+static int
+_device_get_auth_retries(NMDevice *self)
 {
     NMDevicePrivate     *priv;
     NMSettingConnection *s_con;
     int                  auth_retries;
 
-    g_return_val_if_fail(NM_IS_DEVICE(self), FALSE);
+    g_return_val_if_fail(NM_IS_DEVICE(self), 0);
 
     priv         = NM_DEVICE_GET_PRIVATE(self);
     auth_retries = priv->auth_retries;
@@ -19192,13 +19225,47 @@ nm_device_auth_retries_try_next(NMDevice *self)
         priv->auth_retries = auth_retries;
     }
 
+    return auth_retries;
+}
+
+gboolean
+nm_device_auth_retries_has_next(NMDevice *self)
+{
+    int auth_retries;
+
+    g_return_val_if_fail(NM_IS_DEVICE(self), FALSE);
+
+    auth_retries = _device_get_auth_retries(self);
+
+    if (auth_retries == NM_DEVICE_AUTH_RETRIES_INFINITY)
+        return TRUE;
+
+    if (auth_retries > 0)
+        return TRUE;
+
+    return FALSE;
+}
+
+gboolean
+nm_device_auth_retries_try_next(NMDevice *self)
+{
+    NMDevicePrivate *priv;
+    int              auth_retries;
+
+    g_return_val_if_fail(NM_IS_DEVICE(self), FALSE);
+
+    priv         = NM_DEVICE_GET_PRIVATE(self);
+    auth_retries = _device_get_auth_retries(self);
+
     if (auth_retries == NM_DEVICE_AUTH_RETRIES_INFINITY)
         return TRUE;
     if (auth_retries <= 0) {
         nm_assert(auth_retries == 0);
         return FALSE;
     }
+
     priv->auth_retries--;
+
     return TRUE;
 }
 
@@ -19838,6 +19905,8 @@ nm_device_init(NMDevice *self)
     priv->available_connections = g_hash_table_new_full(nm_direct_hash, NULL, g_object_unref, NULL);
     priv->ip6_saved_properties  = g_hash_table_new_full(nm_str_hash, g_str_equal, NULL, g_free);
 
+    c_list_init(&priv->ping_ops_lst_head);
+
     priv->managed_type_ = NM_DEVICE_MANAGED_TYPE_EXTERNAL;
     /* If networking is already disabled at boot, we want to manage all devices
      * after re-enabling networking; hence, the initial state is MANAGED. */
diff --git a/src/core/devices/nm-device.h b/src/core/devices/nm-device.h
index 2f287953..c8069d7c 100644
--- a/src/core/devices/nm-device.h
+++ b/src/core/devices/nm-device.h
@@ -791,6 +791,7 @@ void     nm_device_update_permanent_hw_address(NMDevice *self, gboolean force_fr
 void     nm_device_update_dynamic_ip_setup(NMDevice *self, const char *reason);
 guint    nm_device_get_supplicant_timeout(NMDevice *self);
 
+gboolean nm_device_auth_retries_has_next(NMDevice *self);
 gboolean nm_device_auth_retries_try_next(NMDevice *self);
 
 gboolean nm_device_hw_addr_get_cloned(NMDevice     *self,
diff --git a/src/core/devices/wifi/nm-device-iwd.c b/src/core/devices/wifi/nm-device-iwd.c
index fa6e2f9d..94b9a7d7 100644
--- a/src/core/devices/wifi/nm-device-iwd.c
+++ b/src/core/devices/wifi/nm-device-iwd.c
@@ -2270,6 +2270,37 @@ add_new:
     return NM_ACT_STAGE_RETURN_SUCCESS;
 }
 
+static void
+set_powersave(NMDevice *device)
+{
+    NMDeviceIwd               *self = NM_DEVICE_IWD(device);
+    NMSettingWireless         *s_wireless;
+    NMSettingWirelessPowersave val;
+
+    s_wireless = nm_device_get_applied_setting(device, NM_TYPE_SETTING_WIRELESS);
+
+    g_return_if_fail(s_wireless);
+
+    val = nm_setting_wireless_get_powersave(s_wireless);
+    if (val == NM_SETTING_WIRELESS_POWERSAVE_DEFAULT) {
+        val = nm_config_data_get_connection_default_int64(NM_CONFIG_GET_DATA,
+                                                          "wifi.powersave",
+                                                          device,
+                                                          NM_SETTING_WIRELESS_POWERSAVE_IGNORE,
+                                                          NM_SETTING_WIRELESS_POWERSAVE_ENABLE,
+                                                          NM_SETTING_WIRELESS_POWERSAVE_IGNORE);
+    }
+
+    _LOGT(LOGD_WIFI, "powersave is set to %u", (unsigned) val);
+
+    if (val == NM_SETTING_WIRELESS_POWERSAVE_IGNORE)
+        return;
+
+    nm_platform_wifi_set_powersave(nm_device_get_platform(device),
+                                   nm_device_get_ifindex(device),
+                                   val == NM_SETTING_WIRELESS_POWERSAVE_ENABLE);
+}
+
 static NMActStageReturn
 act_stage2_config(NMDevice *device, NMDeviceStateReason *out_failure_reason)
 {
@@ -2297,6 +2328,8 @@ act_stage2_config(NMDevice *device, NMDeviceStateReason *out_failure_reason)
             goto out_fail;
         }
 
+        set_powersave(device);
+
         /* With priv->iwd_autoconnect we have to let IWD handle retries for
          * infrastructure networks.  IWD will not necessarily retry the same
          * network after a failure but it will likely go into an autoconnect
diff --git a/src/core/devices/wifi/nm-device-wifi.c b/src/core/devices/wifi/nm-device-wifi.c
index b41ed5e1..b836c1e8 100644
--- a/src/core/devices/wifi/nm-device-wifi.c
+++ b/src/core/devices/wifi/nm-device-wifi.c
@@ -194,6 +194,9 @@ static void supplicant_iface_notify_p2p_available(NMSupplicantInterface *iface,
 static void supplicant_iface_notify_wpa_psk_mismatch_cb(NMSupplicantInterface *iface,
                                                         NMDeviceWifi          *self);
 
+static void supplicant_iface_notify_wpa_sae_mismatch_cb(NMSupplicantInterface *iface,
+                                                        NMDeviceWifi          *self);
+
 static void periodic_update(NMDeviceWifi *self);
 
 static void ap_add_remove(NMDeviceWifi *self,
@@ -631,6 +634,10 @@ supplicant_interface_acquire_cb(NMSupplicantManager         *supplicant_manager,
                      NM_SUPPLICANT_INTERFACE_PSK_MISMATCH,
                      G_CALLBACK(supplicant_iface_notify_wpa_psk_mismatch_cb),
                      self);
+    g_signal_connect(priv->sup_iface,
+                     NM_SUPPLICANT_INTERFACE_SAE_MISMATCH,
+                     G_CALLBACK(supplicant_iface_notify_wpa_sae_mismatch_cb),
+                     self);
 
     _scan_notify_is_scanning(self);
 
@@ -2191,21 +2198,16 @@ supplicant_iface_wps_credentials_cb(NMSupplicantInterface *iface,
 
     val_key = g_variant_lookup_value(credentials, "Key", G_VARIANT_TYPE_BYTESTRING);
     if (val_key) {
-        char psk[64];
+        char psk[65];
 
         array = g_variant_get_fixed_array(val_key, &psk_len, 1);
-        if (psk_len >= 8 && psk_len <= 63) {
-            memcpy(psk, array, psk_len);
-            psk[psk_len] = '\0';
-            if (g_utf8_validate(psk, psk_len, NULL)) {
-                secrets = g_variant_new_parsed("[{%s, [{%s, <%s>}]}]",
-                                               NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
-                                               NM_SETTING_WIRELESS_SECURITY_PSK,
-                                               psk);
-                g_variant_ref_sink(secrets);
-            }
-        }
-        if (!secrets)
+        if (nm_wifi_utils_wps_key_to_psk((const guint8 *) array, psk_len, &psk)) {
+            secrets = g_variant_new_parsed("[{%s, [{%s, <%s>}]}]",
+                                           NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
+                                           NM_SETTING_WIRELESS_SECURITY_PSK,
+                                           psk);
+            g_variant_ref_sink(secrets);
+        } else
             _LOGW(LOGD_DEVICE | LOGD_WIFI, "WPS: ignore invalid PSK");
     }
 
@@ -2244,6 +2246,26 @@ wps_timeout_cb(gpointer user_data)
     return G_SOURCE_REMOVE;
 }
 
+static gboolean
+wifi_connection_is_new(NMDeviceWifi *self)
+{
+    NMDevice             *device = NM_DEVICE(self);
+    NMActRequest         *req;
+    NMSettingsConnection *connection;
+    guint64               timestamp = 0;
+
+    req = nm_device_get_act_request(device);
+    g_return_val_if_fail(NM_IS_ACT_REQUEST(req), TRUE);
+
+    connection = nm_act_request_get_settings_connection(req);
+    g_return_val_if_fail(NM_IS_SETTINGS_CONNECTION(connection), TRUE);
+
+    if (nm_settings_connection_get_timestamp(connection, &timestamp) && timestamp != 0)
+        return FALSE;
+
+    return TRUE;
+}
+
 static void
 wifi_secrets_get_secrets(NMDeviceWifi                *self,
                          const char                  *setting_name,
@@ -2398,10 +2420,11 @@ handle_8021x_or_psk_auth_fail(NMDeviceWifi              *self,
                               NMSupplicantInterfaceState old_state,
                               int                        disconnect_reason)
 {
-    NMDevice     *device = NM_DEVICE(self);
-    NMActRequest *req;
-    const char   *setting_name = NULL;
-    gboolean      handled      = FALSE;
+    NMDevice                    *device = NM_DEVICE(self);
+    NMActRequest                *req;
+    const char                  *setting_name = NULL;
+    NMSecretAgentGetSecretsFlags secret_flags = NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION
+                                                | NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW;
 
     g_return_val_if_fail(new_state == NM_SUPPLICANT_INTERFACE_STATE_DISCONNECTED, FALSE);
 
@@ -2411,8 +2434,7 @@ handle_8021x_or_psk_auth_fail(NMDeviceWifi              *self,
     req = nm_device_get_act_request(NM_DEVICE(self));
     g_return_val_if_fail(req != NULL, FALSE);
 
-    if (need_new_8021x_secrets(self, old_state, &setting_name)
-        || need_new_wpa_psk(self, old_state, disconnect_reason, &setting_name)) {
+    if (need_new_8021x_secrets(self, old_state, &setting_name)) {
         nm_act_request_clear_secrets(req);
 
         _LOGI(LOGD_DEVICE | LOGD_WIFI,
@@ -2422,14 +2444,54 @@ handle_8021x_or_psk_auth_fail(NMDeviceWifi              *self,
         nm_device_state_changed(device,
                                 NM_DEVICE_STATE_NEED_AUTH,
                                 NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT);
-        wifi_secrets_get_secrets(self,
-                                 setting_name,
-                                 NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION
-                                     | NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW);
-        handled = TRUE;
+        wifi_secrets_get_secrets(self, setting_name, secret_flags);
+        return TRUE;
+    }
+
+    if (need_new_wpa_psk(self, old_state, disconnect_reason, &setting_name)) {
+        nm_act_request_clear_secrets(req);
+        cleanup_association_attempt(self, TRUE);
+
+        if (wifi_connection_is_new(self)) {
+            _LOGI(LOGD_DEVICE | LOGD_WIFI,
+                  "Activation: (wifi) new connection disconnected during association, asking for "
+                  "new key");
+            nm_device_state_changed(device,
+                                    NM_DEVICE_STATE_NEED_AUTH,
+                                    NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT);
+            wifi_secrets_get_secrets(self, setting_name, secret_flags);
+            return TRUE;
+        }
+
+        if (!nm_device_auth_retries_try_next(device)) {
+            nm_device_state_changed(device,
+                                    NM_DEVICE_STATE_FAILED,
+                                    NM_DEVICE_STATE_REASON_NO_SECRETS);
+            return TRUE;
+        }
+
+        if (nm_device_auth_retries_has_next(device)) {
+            secret_flags &= ~NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW;
+            _LOGI(
+                LOGD_DEVICE | LOGD_WIFI,
+                "Activation: (wifi) disconnected during association, reauthenticating connection");
+        } else {
+            _LOGI(LOGD_DEVICE | LOGD_WIFI,
+                  "Activation: (wifi) disconnected during association, asking for new key");
+        }
+
+        nm_device_state_changed(device,
+                                NM_DEVICE_STATE_NEED_AUTH,
+                                NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT);
+        wifi_secrets_get_secrets(self, setting_name, secret_flags);
+
+        return TRUE;
     }
 
-    return handled;
+    _LOGI(LOGD_DEVICE | LOGD_WIFI,
+          "Activation: (wifi) disconnected during association, retrying connection");
+
+    return FALSE;
 }
 
 static gboolean
@@ -2861,6 +2923,12 @@ supplicant_iface_notify_wpa_psk_mismatch_cb(NMSupplicantInterface *iface, NMDevi
     if (nm_device_get_state(device) != NM_DEVICE_STATE_CONFIG)
         return;
 
+    if (!wifi_connection_is_new(self) && nm_device_auth_retries_has_next(device)) {
+        _LOGI(LOGD_DEVICE | LOGD_WIFI,
+              "Activation: (wifi) psk mismatch reported by supplicant, retrying connection");
+        return;
+    }
+
     _LOGI(LOGD_DEVICE | LOGD_WIFI,
           "Activation: (wifi) psk mismatch reported by supplicant, asking for new key");
 
@@ -2879,6 +2947,34 @@ supplicant_iface_notify_wpa_psk_mismatch_cb(NMSupplicantInterface *iface, NMDevi
                                  | NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW);
 }
 
+static void
+supplicant_iface_notify_wpa_sae_mismatch_cb(NMSupplicantInterface *iface, NMDeviceWifi *self)
+{
+    NMDevice     *device = NM_DEVICE(self);
+    NMActRequest *req;
+    const char   *setting_name = NM_SETTING_WIRELESS_SECURITY_SETTING_NAME;
+
+    if (nm_device_get_state(device) != NM_DEVICE_STATE_CONFIG)
+        return;
+
+    _LOGI(LOGD_DEVICE | LOGD_WIFI,
+          "Activation: (wifi) SAE password mismatch reported by supplicant, asking for new key");
+
+    req = nm_device_get_act_request(NM_DEVICE(self));
+    g_return_if_fail(req != NULL);
+
+    nm_act_request_clear_secrets(req);
+
+    cleanup_association_attempt(self, TRUE);
+    nm_device_state_changed(device,
+                            NM_DEVICE_STATE_NEED_AUTH,
+                            NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT);
+    wifi_secrets_get_secrets(self,
+                             setting_name,
+                             NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION
+                                 | NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW);
+}
+
 /*
  * supplicant_connection_timeout_cb
  *
@@ -3222,8 +3318,19 @@ act_stage1_prepare(NMDevice *device, NMDeviceStateReason *out_failure_reason)
 static void
 ensure_hotspot_frequency(NMDeviceWifi *self, NMSettingWireless *s_wifi, NMWifiAP *ap)
 {
-    guint32     a_freqs[]  = {5180, 5200, 5220, 5745, 5765, 5785, 5805, 0};
-    guint32     bg_freqs[] = {2412, 2437, 2462, 2472, 0};
+    guint32     freqs_a[]    = {5180, /* only U-NII-1 channels: non-DFS and available everywhere */
+                                5200,
+                                5220,
+                                5240,
+                                0};
+    guint32     freqs_bg[]   = {2412, 2437, 2462, 2472, 0};
+    guint32     freqs_6ghz[] = {5975, /* only U-NII-5 PSC channels, for better compatibility */
+                                6055,
+                                6135,
+                                6215,
+                                6295,
+                                6375,
+                                0};
     guint32    *rnd_freqs;
     guint       rnd_freqs_len;
     NMDevice   *device = NM_DEVICE(self);
@@ -3234,7 +3341,7 @@ ensure_hotspot_frequency(NMDeviceWifi *self, NMSettingWireless *s_wifi, NMWifiAP
     guint       l;
 
     nm_assert(ap);
-    nm_assert(NM_IN_STRSET(band, NULL, "a", "bg"));
+    nm_assert(NM_IN_STRSET(band, NULL, "a", "bg", "6GHz"));
 
     if (nm_wifi_ap_get_freq(ap))
         return;
@@ -3268,11 +3375,14 @@ ensure_hotspot_frequency(NMDeviceWifi *self, NMSettingWireless *s_wifi, NMWifiAP
     }
 
     if (nm_streq0(band, "a")) {
-        rnd_freqs     = a_freqs;
-        rnd_freqs_len = G_N_ELEMENTS(a_freqs) - 1;
+        rnd_freqs     = freqs_a;
+        rnd_freqs_len = G_N_ELEMENTS(freqs_a) - 1;
+    } else if (nm_streq0(band, "6GHz")) {
+        rnd_freqs     = freqs_6ghz;
+        rnd_freqs_len = G_N_ELEMENTS(freqs_6ghz) - 1;
     } else {
-        rnd_freqs     = bg_freqs;
-        rnd_freqs_len = G_N_ELEMENTS(bg_freqs) - 1;
+        rnd_freqs     = freqs_bg;
+        rnd_freqs_len = G_N_ELEMENTS(freqs_bg) - 1;
     }
 
     /* shuffle the frequencies (inplace). The idea is to choose
diff --git a/src/core/devices/wifi/nm-wifi-ap.c b/src/core/devices/wifi/nm-wifi-ap.c
index ceb954b7..3e758972 100644
--- a/src/core/devices/wifi/nm-wifi-ap.c
+++ b/src/core/devices/wifi/nm-wifi-ap.c
@@ -574,16 +574,6 @@ nm_wifi_ap_to_string(const NMWifiAP *self, char *str_buf, gulong buf_len, gint64
     return str_buf;
 }
 
-static guint
-freq_to_band(guint32 freq)
-{
-    if (freq >= 4915 && freq <= 5825)
-        return 5;
-    else if (freq >= 2412 && freq <= 2484)
-        return 2;
-    return 0;
-}
-
 gboolean
 nm_wifi_ap_check_compatible(NMWifiAP *self, NMConnection *connection)
 {
@@ -631,12 +621,12 @@ nm_wifi_ap_check_compatible(NMWifiAP *self, NMConnection *connection)
 
     band = nm_setting_wireless_get_band(s_wireless);
     if (band) {
-        guint ap_band = freq_to_band(priv->freq);
+        const char *ap_band = nm_wifi_freq_to_band_prop(priv->freq);
 
-        if (!strcmp(band, "a") && ap_band != 5)
-            return FALSE;
-        else if (!strcmp(band, "bg") && ap_band != 2)
+        if (!nm_streq(band, ap_band))
             return FALSE;
+
+        return TRUE;
     }
 
     channel = nm_setting_wireless_get_channel(s_wireless);
diff --git a/src/core/devices/wifi/nm-wifi-utils.c b/src/core/devices/wifi/nm-wifi-utils.c
index 332352ab..2ee4ec2e 100644
--- a/src/core/devices/wifi/nm-wifi-utils.c
+++ b/src/core/devices/wifi/nm-wifi-utils.c
@@ -639,7 +639,7 @@ nm_wifi_utils_complete_connection(GBytes       *ap_ssid,
                 chan_valid = FALSE;
             }
 
-            band = nm_utils_wifi_freq_to_band(ap_freq);
+            band = nm_wifi_freq_to_band_prop(ap_freq);
             if (band) {
                 g_object_set(s_wifi, NM_SETTING_WIRELESS_BAND, band, NULL);
             } else {
@@ -890,6 +890,28 @@ nm_wifi_utils_is_manf_default_ssid(GBytes *ssid)
     return FALSE;
 }
 
+/* Convert a WPS "Key" credential into a PSK string. The key is either an
+ * 8..63 character passphrase or a 64 character hexadecimal PSK. The actual
+ * WPA-PSK validity check is shared with nm_utils_wpa_psk_valid(). */
+gboolean
+nm_wifi_utils_wps_key_to_psk(const guint8 *key, gsize key_len, char (*out_psk)[65])
+{
+    if (key_len > 64)
+        return FALSE;
+    if (key_len < 64 && !g_utf8_validate((const char *) key, key_len, NULL))
+        return FALSE;
+
+    memcpy(*out_psk, key, key_len);
+    (*out_psk)[key_len] = '\0';
+
+    /* An embedded NUL would make nm_utils_wpa_psk_valid() see a truncated
+     * string, so reject it explicitly. */
+    if (strlen(*out_psk) != key_len)
+        return FALSE;
+
+    return nm_utils_wpa_psk_valid(*out_psk);
+}
+
 /* To be used for connections where the SSID has been validated before */
 gboolean
 nm_wifi_connection_get_iwd_ssid_and_security(NMConnection         *connection,
@@ -1929,3 +1951,19 @@ nm_wifi_utils_wfd_info_eq(const NMIwdWfdInfo *a, const NMIwdWfdInfo *b)
     return a->source == b->source && a->sink == b->sink && a->port == b->port
            && a->has_audio == b->has_audio && a->has_uibc == b->has_uibc && a->has_cp == b->has_cp;
 }
+
+const char *
+nm_wifi_freq_to_band_prop(guint32 freq)
+{
+    switch (nm_utils_wifi_freq_to_band(freq)) {
+    case NM_WIFI_BAND_2_4_GHZ:
+        return "bg";
+    case NM_WIFI_BAND_5_GHZ:
+        return "a";
+    case NM_WIFI_BAND_6_GHZ:
+        return "6GHz";
+    default:
+    case NM_WIFI_BAND_UNKNOWN:
+        return NULL;
+    }
+}
diff --git a/src/core/devices/wifi/nm-wifi-utils.h b/src/core/devices/wifi/nm-wifi-utils.h
index 1d46a900..30920396 100644
--- a/src/core/devices/wifi/nm-wifi-utils.h
+++ b/src/core/devices/wifi/nm-wifi-utils.h
@@ -42,6 +42,8 @@ gboolean nm_wifi_utils_complete_connection(GBytes       *ssid,
 
 gboolean nm_wifi_utils_is_manf_default_ssid(GBytes *ssid);
 
+gboolean nm_wifi_utils_wps_key_to_psk(const guint8 *key, gsize key_len, char (*out_psk)[65]);
+
 gboolean nm_wifi_connection_get_iwd_ssid_and_security(NMConnection         *connection,
                                                       char                **ssid,
                                                       NMIwdNetworkSecurity *security);
@@ -56,4 +58,6 @@ bool    nm_wifi_utils_parse_wfd_ies(GBytes *ies, NMIwdWfdInfo *out_wfd);
 GBytes *nm_wifi_utils_build_wfd_ies(const NMIwdWfdInfo *wfd);
 bool    nm_wifi_utils_wfd_info_eq(const NMIwdWfdInfo *a, const NMIwdWfdInfo *b);
 
+const char *nm_wifi_freq_to_band_prop(guint32 freq);
+
 #endif /* __NM_WIFI_UTILS_H__ */
diff --git a/src/core/devices/wifi/tests/test-devices-wifi.c b/src/core/devices/wifi/tests/test-devices-wifi.c
index a52696ea..b50e2626 100644
--- a/src/core/devices/wifi/tests/test-devices-wifi.c
+++ b/src/core/devices/wifi/tests/test-devices-wifi.c
@@ -1459,6 +1459,50 @@ test_ssids_options_to_ptrarray(void)
 
 /*****************************************************************************/
 
+static void
+test_wps_key_to_psk(void)
+{
+    static const struct {
+        const char *key;
+        gsize       key_len;
+        gboolean    valid;
+    } cases[] = {
+        {"12345678", 8, TRUE},
+        {"supersecret123", 14, TRUE},
+        {"caf\xc3\xa9_key", 9, TRUE},
+        {"123456789012345678901234567890123456789012345678901234567890123", 63, TRUE},
+        {"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef", 64, TRUE},
+        {"0123456789ABCDEF0123456789abcdef0123456789abcdef0123456789abcdeF", 64, TRUE},
+        {"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdeg", 64, FALSE},
+        {"", 0, FALSE},
+        {"1234567", 7, FALSE},
+        {"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0", 65, FALSE},
+        {"abc\xff"
+         "def123",
+         10,
+         FALSE},
+        {"0123456789abcdef0123456789abcdef\0"
+         "23456789abcdef0123456789abcdef0",
+         64,
+         FALSE},
+    };
+    gsize i;
+
+    for (i = 0; i < G_N_ELEMENTS(cases); i++) {
+        char     psk[65];
+        gboolean ok;
+
+        ok = nm_wifi_utils_wps_key_to_psk((const guint8 *) cases[i].key, cases[i].key_len, &psk);
+        g_assert_cmpint(ok, ==, cases[i].valid);
+        if (ok) {
+            g_assert_cmpmem(psk, cases[i].key_len, cases[i].key, cases[i].key_len);
+            g_assert_cmpint(psk[cases[i].key_len], ==, '\0');
+        }
+    }
+}
+
+/*****************************************************************************/
+
 NMTST_DEFINE();
 
 int
@@ -1605,5 +1649,7 @@ main(int argc, char **argv)
 
     g_test_add_func("/wifi/ssids_options_to_ptrarray", test_ssids_options_to_ptrarray);
 
+    g_test_add_func("/wifi/wps_key_to_psk", test_wps_key_to_psk);
+
     return g_test_run();
 }
diff --git a/src/core/devices/wwan/nm-modem-manager.c b/src/core/devices/wwan/nm-modem-manager.c
index 4a89f38e..b8438e3f 100644
--- a/src/core/devices/wwan/nm-modem-manager.c
+++ b/src/core/devices/wwan/nm-modem-manager.c
@@ -258,16 +258,7 @@ modm_handle_name_owner_changed(MMManager *modem_manager, GParamSpec *pspec, NMMo
     /* Available! */
     g_free(name_owner);
 
-    /* Hack alert: GDBusObjectManagerClient won't signal neither 'object-added'
-     * nor 'object-removed' if it was created while there was no ModemManager in
-     * the bus. This hack avoids this issue until we get a GIO with the fix
-     * included... */
-    modm_clear_manager(self);
-    modm_ensure_manager(self);
-
-    /* Whenever GDBusObjectManagerClient is fixed, we can just do the following:
-     * modm_manager_available (self);
-     */
+    modm_manager_available(self);
 }
 
 static void
diff --git a/src/core/dhcp/README.next.md b/src/core/dhcp/README.next.md
index 88fa6683..1e61e75a 100644
--- a/src/core/dhcp/README.next.md
+++ b/src/core/dhcp/README.next.md
@@ -54,17 +54,14 @@ complexity out of `NMDevice`.
       mean that it gave up. It will keep retrying, it's just that there is little
       hope of getting a new lease. This happens, when you try to run DHCP on a Layer3
       link (WireGuard). There is little hope to succeed, but `NMDhcpClient`
-      (theoretically) will retry and may recover from this. Another example is when
-      we fail to start dhclient because it's not installed. In that case, we are not
-      optimistic to recover, however `NMDhcpDhclient` will retry (with backoff
-      timeout) and might still recover from this. For most cases, `NMDevice` will
+      (theoretically) will retry and may recover from this. For most cases, `NMDevice` will
       treat the no-lease cases the same, but in case of "bad" it might give up
       earlier.
 
 When a lease expires, that does not necessarily mean that we are now in a bad
 state. It might mean that the DHCP server is temporarily down, but we might
 recover from that easily. "bad" really means, something is wrong on our side
-which prevents us from getting a lease. Also, imagine `dhclient` dies (we would
+which prevents us from getting a lease. Also, imagine the DHCP client dies (we would
 try to restart, but assume that fails too), but we still have a valid lease,
 then possibly `NMDhcpClient` should still pretend all is good and we still have
 a lease until it expires. It may be we can recover before that happens. The
@@ -88,8 +85,7 @@ optionally does ACD first, then configures the IP address first and calls
 different lease). With this, the above state "has a lease" has actually three
 flavors: "has a lease but not yet ACD probed" and "has a lease but
 accepted/declined" (but `NM_DHCP_CLIENT_SIGNAL_STATE_CHANGED` gets only emitted
-when we get the lease, not when we accept/decline it). With `dhclient`, when we
-receive a lease, it means  "has a lease but accepted" right away.
+when we get the lease, not when we accept/decline it).
 
 - for IPv6 prefix delegation, there is also `needed_prefixes` and
   `NM_DHCP_CLIENT_NOTIFY_TYPE_PREFIX_DELEGATED`. Currently `needed_prefixes` needs
diff --git a/src/core/dhcp/nm-dhcp-client.c b/src/core/dhcp/nm-dhcp-client.c
index 18ad4024..c17e5544 100644
--- a/src/core/dhcp/nm-dhcp-client.c
+++ b/src/core/dhcp/nm-dhcp-client.c
@@ -266,9 +266,8 @@ nm_dhcp_client_create_options_dict(NMDhcpClient *self, gboolean static_keys)
         guint option = IS_IPv4 ? NM_DHCP_OPTION_DHCP4_CLIENT_ID : NM_DHCP_OPTION_DHCP6_CLIENT_ID;
         gs_free char *str = nm_dhcp_utils_duid_to_string(effective_client_id);
 
-        /* Note that for the nm-dhcp-helper based plugins (dhclient), the plugin
-         * may send the used client-id/DUID via the environment variables and
-         * overwrite them yet again. */
+        /* Note that nm-dhcp-helper based plugins may send the used client-id/DUID
+         * via the environment variables and overwrite them yet again. */
 
         nm_dhcp_option_take_option(options,
                                    static_keys,
@@ -786,13 +785,12 @@ _nm_dhcp_client_notify(NMDhcpClient         *self,
                        NMDhcpClientEventType client_event_type,
                        const NML3ConfigData *l3cd)
 {
-    NMDhcpClientPrivate                     *priv = NM_DHCP_CLIENT_GET_PRIVATE(self);
-    GHashTable                              *options;
-    gboolean                                 l3cd_changed;
-    NMOptionBool                             acd_state;
-    const int                                IS_IPv4     = NM_IS_IPv4(priv->config.addr_family);
-    nm_auto_unref_l3cd const NML3ConfigData *l3cd_merged = NULL;
-    char                                     sbuf1[NM_HASH_OBFUSCATE_PTR_STR_BUF_SIZE];
+    NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self);
+    GHashTable          *options;
+    gboolean             l3cd_changed;
+    NMOptionBool         acd_state;
+    const int            IS_IPv4 = NM_IS_IPv4(priv->config.addr_family);
+    char                 sbuf1[NM_HASH_OBFUSCATE_PTR_STR_BUF_SIZE];
 
     nm_assert(NM_IN_SET(client_event_type,
                         NM_DHCP_CLIENT_EVENT_TYPE_UNSPECIFIED,
@@ -825,16 +823,6 @@ _nm_dhcp_client_notify(NMDhcpClient         *self,
     if (client_event_type >= NM_DHCP_CLIENT_EVENT_TYPE_TIMEOUT)
         watch_cleanup(self);
 
-    if (!IS_IPv4 && l3cd) {
-        /* nm_dhcp_utils_merge_new_dhcp6_lease() relies on "life_starts" option
-         * for merging, which is only set by dhclient. Internal client never sets that,
-         * but it supports multiple IP addresses per lease. */
-        if (nm_dhcp_utils_merge_new_dhcp6_lease(priv->l3cd_next, l3cd, &l3cd_merged)) {
-            _LOGD("lease merged with existing one");
-            l3cd = nm_l3_config_data_seal(l3cd_merged);
-        }
-    }
-
     if (l3cd) {
         nm_clear_g_source_inst(&priv->no_lease_timeout_source);
     } else
@@ -1460,7 +1448,9 @@ nm_dhcp_client_schedule_ipv6_only_restart(NMDhcpClient *self, guint timeout)
     nm_assert(!priv->is_stopped);
 
     timeout = NM_MAX(priv->v4.ipv6_only_min_wait, timeout);
-    _LOGI("received option \"ipv6-only-preferred\": stopping DHCPv4 for %u seconds", timeout);
+    _LOGI("received option \"ipv6-only-preferred\": stopping DHCPv4 for %u seconds. Set "
+          "ipv4.dhcp-ipv6-only-preferred=no to force the use of IPv4 on this IPv6-mostly network",
+          timeout);
 
     nm_dhcp_client_stop(self, FALSE);
     nm_clear_g_source_inst(&priv->no_lease_timeout_source);
@@ -1690,21 +1680,14 @@ maybe_add_option(NMDhcpClient *self, GHashTable *hash, const char *key, GVariant
 
     g_hash_table_insert(hash, g_strdup(key), str_value);
 
-    /* dhclient has no special labels for private dhcp options: it uses "unknown_xyz"
-     * labels for that. We need to identify those to alias them to our "private_xyz"
-     * format unused in the internal dchp plugins.
-     */
+    /* "unknown_xyz" labels are aliased to our "private_xyz" format. */
     if ((priv_opt_num = label_is_unknown_xyz(key)) > 0) {
         gs_free guint8 *check_val = NULL;
         char           *hex_str   = NULL;
         gsize           len;
 
-        /* dhclient passes values from dhcp private options in its own "string" format:
-         * if the raw values are printable as ascii strings, it will pass the string
-         * representation; if the values are not printable as an ascii string, it will
-         * pass a string displaying the hex values (hex string). Try to enforce passing
-         * always an hex string, converting string representation if needed.
-         */
+        /* Private options may arrive as printable ascii strings or as hex strings.
+         * Normalize to always use hex string format. */
         check_val = nm_utils_hexstr2bin_alloc(str_value, FALSE, TRUE, ":", 0, &len);
         hex_str   = nm_utils_bin2hexstr_full(check_val ?: (guint8 *) str_value,
                                            check_val ? len : strlen(str_value),
diff --git a/src/core/dhcp/nm-dhcp-client.h b/src/core/dhcp/nm-dhcp-client.h
index a7b6ae98..12f3a276 100644
--- a/src/core/dhcp/nm-dhcp-client.h
+++ b/src/core/dhcp/nm-dhcp-client.h
@@ -53,8 +53,8 @@ typedef enum _nm_packed {
      * As such, it's never officially in a non-recoverable state.
      * However, there are cases when it really looks like we won't
      * be able to get a lease. For example, if the underlying interface
-     * is layer 3 only, if we have no IPv6 link local address for a prolonged
-     * time, or if dhclient is not installed.
+     * is layer 3 only, or if we have no IPv6 link local address for a prolonged
+     * time.
      * But even these cases are potentially recoverable. This is only
      * a hint to the user (which they might ignore).
      *
@@ -311,7 +311,6 @@ typedef struct {
 
 GType nm_dhcp_nettools_get_type(void);
 
-extern const NMDhcpClientFactory _nm_dhcp_client_factory_dhclient;
 extern const NMDhcpClientFactory _nm_dhcp_client_factory_dhcpcd;
 extern const NMDhcpClientFactory _nm_dhcp_client_factory_internal;
 extern const NMDhcpClientFactory _nm_dhcp_client_factory_systemd;
diff --git a/src/core/dhcp/nm-dhcp-dhclient-utils.c b/src/core/dhcp/nm-dhcp-dhclient-utils.c
deleted file mode 100644
index 286f7aa1..00000000
--- a/src/core/dhcp/nm-dhcp-dhclient-utils.c
+++ /dev/null
@@ -1,763 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (C) 2011 Red Hat, Inc.
- */
-
-#include "src/core/nm-default-daemon.h"
-
-#include "nm-dhcp-dhclient-utils.h"
-
-#include <ctype.h>
-#include <arpa/inet.h>
-#include <net/if.h>
-#include <linux/if_ether.h>
-
-#include "libnm-glib-aux/nm-dedup-multi.h"
-
-#include "nm-dhcp-utils.h"
-#include "nm-utils.h"
-#include "libnm-platform/nm-platform.h"
-#include "NetworkManagerUtils.h"
-
-#define TIMEOUT_TAG  "timeout "
-#define RETRY_TAG    "retry "
-#define CLIENTID_TAG "send dhcp-client-identifier"
-
-#define HOSTNAME4_TAG    "send host-name"
-#define HOSTNAME4_FORMAT HOSTNAME4_TAG " \"%s\"; # added by NetworkManager"
-
-#define FQDN_TAG_PREFIX "send fqdn."
-#define FQDN_TAG        FQDN_TAG_PREFIX "fqdn"
-#define FQDN_FORMAT     FQDN_TAG " \"%s\"; # added by NetworkManager"
-
-#define ALSOREQ_TAG "also request "
-#define REQ_TAG     "request "
-
-#define MUDURLv4_DEF "option mudurl code 161 = text;\n"
-#define MUDURLv4_FMT "send mudurl \"%s\";\n"
-
-#define MUDURLv6_DEF "option dhcp6.mudurl code 112 = text;\n"
-#define MUDURLv6_FMT "send dhcp6.mudurl \"%s\";\n"
-
-static void
-add_request(GPtrArray *array, const char *item)
-{
-    guint i;
-
-    for (i = 0; i < array->len; i++) {
-        if (nm_streq(array->pdata[i], item))
-            return;
-    }
-    g_ptr_array_add(array, g_strdup(item));
-}
-
-static gboolean
-grab_request_options(GPtrArray *store, const char *line)
-{
-    gs_free const char **line_v = NULL;
-    gsize                i;
-
-    /* Grab each 'request' or 'also request'  option and save for later */
-    line_v = nm_strsplit_set(line, "\t ,");
-    for (i = 0; line_v && line_v[i]; i++) {
-        const char *ss = nm_str_skip_leading_spaces(line_v[i]);
-        gsize       l;
-        gboolean    end = FALSE;
-
-        if (!ss[0])
-            continue;
-        if (ss[0] == ';') {
-            /* all done */
-            return TRUE;
-        }
-
-        if (!g_ascii_isalnum(ss[0]))
-            continue;
-
-        l = strlen(ss);
-
-        while (l > 0 && g_ascii_isspace(ss[l - 1])) {
-            ((char *) ss)[l - 1] = '\0';
-            l--;
-        }
-        if (l > 0 && ss[l - 1] == ';') {
-            /* Remove the EOL marker */
-            ((char *) ss)[l - 1] = '\0';
-            end                  = TRUE;
-        }
-
-        if (ss[0])
-            add_request(store, ss);
-
-        if (end)
-            return TRUE;
-    }
-
-    return FALSE;
-}
-
-static void
-add_ip4_config(GString            *str,
-               GBytes             *client_id,
-               const char         *hostname,
-               gboolean            use_fqdn,
-               NMDhcpHostnameFlags hostname_flags)
-{
-    if (client_id) {
-        const char *p;
-        gsize       l;
-        guint       i;
-
-        p = g_bytes_get_data(client_id, &l);
-        nm_assert(p);
-
-        /* Allow type 0 (non-hardware address) to be represented as a string
-         * as long as all the characters are printable.
-         */
-        for (i = 1; (p[0] == 0) && i < l; i++) {
-            if (!g_ascii_isprint(p[i]) || p[i] == '\\' || p[i] == '"')
-                break;
-        }
-
-        g_string_append(str, CLIENTID_TAG " ");
-        if (l == 0) {
-            /* An empty value effectively unsets the client-id to avoid sending it */
-            g_string_append(str, "\"\"");
-        } else if (i < l) {
-            /* Unprintable; convert to a hex string */
-            for (i = 0; i < l; i++) {
-                if (i > 0)
-                    g_string_append_c(str, ':');
-                g_string_append_printf(str, "%02x", (guint8) p[i]);
-            }
-        } else {
-            /* Printable; just add to the line with type 0 */
-            g_string_append_c(str, '"');
-            g_string_append(str, "\\x00");
-            g_string_append_len(str, p + 1, l - 1);
-            g_string_append_c(str, '"');
-        }
-        g_string_append(str, "; # added by NetworkManager\n");
-    }
-
-    if (hostname) {
-        if (use_fqdn) {
-            g_string_append_printf(str, FQDN_FORMAT "\n", hostname);
-
-            g_string_append_printf(str,
-                                   FQDN_TAG_PREFIX "encoded %s;\n",
-                                   (hostname_flags & NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED) ? "on"
-                                                                                         : "off");
-
-            g_string_append_printf(
-                str,
-                FQDN_TAG_PREFIX "server-update %s;\n",
-                (hostname_flags & NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE) ? "on" : "off");
-
-            g_string_append_printf(str,
-                                   FQDN_TAG_PREFIX "no-client-update %s;\n",
-                                   (hostname_flags & NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE) ? "on"
-                                                                                           : "off");
-        } else
-            g_string_append_printf(str, HOSTNAME4_FORMAT "\n", hostname);
-    }
-
-    g_string_append_c(str, '\n');
-
-    /* Define options for classless static routes */
-    g_string_append(
-        str,
-        "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n");
-    g_string_append(str,
-                    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n");
-    /* Web Proxy Auto-Discovery option (bgo #368423) */
-    g_string_append(str, "option wpad code 252 = string;\n");
-
-    g_string_append_c(str, '\n');
-}
-
-static void
-add_hostname6(GString *str, const char *hostname, NMDhcpHostnameFlags hostname_flags)
-{
-    if (hostname) {
-        g_string_append_printf(str, FQDN_FORMAT "\n", hostname);
-        if (hostname_flags & NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE)
-            g_string_append(str, FQDN_TAG_PREFIX "server-update on;\n");
-        if (hostname_flags & NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE)
-            g_string_append(str, FQDN_TAG_PREFIX "no-client-update on;\n");
-        g_string_append_c(str, '\n');
-    }
-}
-
-static void
-add_mud_url_config(GString *str, const char *mud_url, int addr_family)
-{
-    if (mud_url) {
-        if (addr_family == AF_INET) {
-            g_string_append(str, MUDURLv4_DEF);
-            g_string_append_printf(str, MUDURLv4_FMT, mud_url);
-        } else {
-            g_string_append(str, MUDURLv6_DEF);
-            g_string_append_printf(str, MUDURLv6_FMT, mud_url);
-        }
-    }
-}
-
-static GBytes *
-read_client_id(const char *str)
-{
-    gs_free char *s = NULL;
-    char         *p;
-    int           i = 0;
-    int           j = 0;
-    gsize         l;
-
-    nm_assert(NM_STR_HAS_PREFIX(str, CLIENTID_TAG));
-    str += NM_STRLEN(CLIENTID_TAG);
-
-    if (!g_ascii_isspace(*str))
-        return NULL;
-    while (g_ascii_isspace(*str))
-        str++;
-
-    if (*str == '"') {
-        /* Parse string literal with escape sequences */
-        s = g_strdup(str + 1);
-        p = strrchr(s, '"');
-        if (p)
-            *p = '\0';
-        else
-            return NULL;
-
-        if (!s[0])
-            return NULL;
-
-        while (s[i]) {
-            if (s[i] == '\\' && s[i + 1] == 'x' && g_ascii_isxdigit(s[i + 2])
-                && g_ascii_isxdigit(s[i + 3])) {
-                s[j++] = (g_ascii_xdigit_value(s[i + 2]) << 4) + g_ascii_xdigit_value(s[i + 3]);
-                i += 4;
-                continue;
-            }
-            if (s[i] == '\\' && s[i + 1] >= '0' && s[i + 1] <= '7' && s[1 + 2] >= '0'
-                && s[i + 2] <= '7' && s[1 + 3] >= '0' && s[i + 3] <= '7') {
-                s[j++] = ((s[i + 1] - '0') << 6) + ((s[i + 2] - '0') << 3) + (s[i + 3] - '0');
-                i += 4;
-                continue;
-            }
-            s[j++] = s[i++];
-        }
-        return g_bytes_new_take(g_steal_pointer(&s), j);
-    }
-
-    /* Otherwise, try to read a hexadecimal sequence */
-    s = g_strdup(str);
-    g_strchomp(s);
-    l = strlen(s);
-    if (l > 0 && s[l - 1] == ';')
-        s[l - 1] = '\0';
-
-    return nm_utils_hexstr2bin(s);
-}
-
-static gboolean
-read_interface(const char *line, char *interface, guint size)
-{
-    gs_free char *dup = g_strdup(line + NM_STRLEN("interface"));
-    char         *ptr = dup, *end;
-
-    while (g_ascii_isspace(*ptr))
-        ptr++;
-
-    if (*ptr == '"') {
-        ptr++;
-        end = strchr(ptr, '"');
-        if (!end)
-            return FALSE;
-        *end = '\0';
-    } else {
-        end = strchr(ptr, ' ');
-        if (!end)
-            end = strchr(ptr, '{');
-        if (!end)
-            return FALSE;
-        *end = '\0';
-    }
-
-    if (ptr[0] == '\0' || strlen(ptr) + 1 > size)
-        return FALSE;
-
-    g_snprintf(interface, size, "%s", ptr);
-
-    return TRUE;
-}
-
-char *
-nm_dhcp_dhclient_create_config(const char         *interface,
-                               int                 addr_family,
-                               GBytes             *client_id,
-                               gboolean            send_client_id,
-                               const char         *anycast_address,
-                               const char         *hostname,
-                               guint32             timeout,
-                               gboolean            use_fqdn,
-                               NMDhcpHostnameFlags hostname_flags,
-                               const char         *mud_url,
-                               const char *const  *reject_servers,
-                               const char         *orig_path,
-                               const char         *orig_contents,
-                               GBytes            **out_new_client_id)
-{
-    nm_auto_free_gstring GString *new_contents  = NULL;
-    gs_unref_ptrarray GPtrArray  *fqdn_opts     = NULL;
-    gs_unref_ptrarray GPtrArray  *reqs          = NULL;
-    gboolean                      reset_reqlist = FALSE;
-    int                           i;
-
-    g_return_val_if_fail(!anycast_address || nm_utils_hwaddr_valid(anycast_address, ETH_ALEN),
-                         NULL);
-    g_return_val_if_fail(NM_IN_SET(addr_family, AF_INET, AF_INET6), NULL);
-    g_return_val_if_fail(!reject_servers || addr_family == AF_INET, NULL);
-    nm_assert(!out_new_client_id || !*out_new_client_id);
-
-    new_contents = g_string_new(_("# Created by NetworkManager\n"));
-    reqs         = g_ptr_array_new_full(5, g_free);
-
-    if (orig_contents) {
-        gs_free const char          **lines = NULL;
-        gsize                         line_i;
-        nm_auto_free_gstring GString *blocks_stack = NULL;
-        guint                         blocks_skip  = 0;
-        gboolean                      in_alsoreq   = FALSE;
-        gboolean                      in_req       = FALSE;
-        char                          intf[IFNAMSIZ];
-
-        blocks_stack = g_string_new(NULL);
-        g_string_append_printf(new_contents, _("# Merged from %s\n\n"), orig_path);
-        intf[0] = '\0';
-
-        lines = nm_strsplit_set(orig_contents, "\n\r");
-        for (line_i = 0; lines && lines[line_i]; line_i++) {
-            const char *line = nm_str_skip_leading_spaces(lines[line_i]);
-            const char *p;
-
-            if (line[0] == '\0')
-                continue;
-
-            g_strchomp((char *) line);
-
-            p = line;
-            if (in_req) {
-                /* pass */
-            } else if (strchr(p, '{')) {
-                if (NM_STR_HAS_PREFIX(p, "lease") || NM_STR_HAS_PREFIX(p, "alias")
-                    || NM_STR_HAS_PREFIX(p, "interface") || NM_STR_HAS_PREFIX(p, "pseudo")) {
-                    /* skip over these blocks, except 'interface' when it
-                     * matches the current interface */
-                    blocks_skip++;
-                    g_string_append_c(blocks_stack, 'b');
-                    if (!intf[0] && NM_STR_HAS_PREFIX(p, "interface")) {
-                        if (read_interface(p, intf, sizeof(intf)))
-                            continue;
-                    }
-                } else {
-                    /* allow other blocks (conditionals) */
-                    if (!strchr(p, '}')) /* '} else {'  */
-                        g_string_append_c(blocks_stack, 'c');
-                }
-            } else if (strchr(p, '}')) {
-                if (blocks_stack->len > 0) {
-                    if (blocks_stack->str[blocks_stack->len - 1] == 'b') {
-                        g_string_truncate(blocks_stack, blocks_stack->len - 1);
-                        nm_assert(blocks_skip > 0);
-                        blocks_skip--;
-                        intf[0] = '\0';
-                        continue;
-                    }
-                    g_string_truncate(blocks_stack, blocks_stack->len - 1);
-                }
-            }
-
-            if (blocks_skip > 0 && !intf[0])
-                continue;
-
-            if (intf[0] && !nm_streq(intf, interface))
-                continue;
-
-            /* Some timing parameters in dhclient should not be imported (timeout, retry).
-             * The retry parameter will be simply not used as we will exit on first failure.
-             * The timeout one instead may affect NetworkManager behavior: if the timeout
-             * elapses before dhcp-timeout dhclient will report failure and cause NM to
-             * fail the dhcp process before dhcp-timeout. So, always skip importing timeout
-             * as we will need to add one greater than dhcp-timeout.
-             */
-            if (NM_STR_HAS_PREFIX(p, TIMEOUT_TAG) || NM_STR_HAS_PREFIX(p, RETRY_TAG))
-                continue;
-
-            if (NM_STR_HAS_PREFIX(p, CLIENTID_TAG)) {
-                /* Skip "dhcp-client-id" if the connection has defined a custom one or "none" */
-                if (client_id || !send_client_id)
-                    continue;
-
-                /* Otherwise, capture and return the existing client id */
-                if (out_new_client_id)
-                    nm_clear_pointer(out_new_client_id, g_bytes_unref);
-                NM_SET_OUT(out_new_client_id, read_client_id(p));
-                /* fall-through. We keep the line... */
-            }
-
-            /* Override config file hostname and use one from the connection */
-            if (hostname) {
-                if (NM_STR_HAS_PREFIX(p, HOSTNAME4_TAG))
-                    continue;
-                if (NM_STR_HAS_PREFIX(p, FQDN_TAG))
-                    continue;
-            }
-
-            /* To let user's FQDN options (except "fqdn.fqdn") override the
-             * default ones set by NM, add them later
-             */
-            if (NM_STR_HAS_PREFIX(p, FQDN_TAG_PREFIX)) {
-                if (!fqdn_opts)
-                    fqdn_opts = g_ptr_array_new_full(5, g_free);
-                g_ptr_array_add(fqdn_opts, g_strdup(p + NM_STRLEN(FQDN_TAG_PREFIX)));
-                continue;
-            }
-
-            /* Ignore 'script' since we pass our own */
-            if (g_str_has_prefix(p, "script "))
-                continue;
-
-            /* Check for "request" */
-            if (NM_STR_HAS_PREFIX(p, REQ_TAG)) {
-                in_req = TRUE;
-                p += NM_STRLEN(REQ_TAG);
-                g_ptr_array_set_size(reqs, 0);
-                reset_reqlist = TRUE;
-            }
-
-            /* Save all request options for later use */
-            if (in_req) {
-                in_req = !grab_request_options(reqs, p);
-                continue;
-            }
-
-            /* Check for "also require" */
-            if (NM_STR_HAS_PREFIX(p, ALSOREQ_TAG)) {
-                in_alsoreq = TRUE;
-                p += NM_STRLEN(ALSOREQ_TAG);
-            }
-
-            if (in_alsoreq) {
-                in_alsoreq = !grab_request_options(reqs, p);
-                continue;
-            }
-
-            /* Existing configuration line is OK, add it to new configuration */
-            g_string_append(new_contents, line);
-            g_string_append_c(new_contents, '\n');
-        }
-    } else
-        g_string_append_c(new_contents, '\n');
-
-    /* ensure dhclient timeout is greater than dhcp-timeout: as dhclient timeout default value is
-     * 60 seconds, we need this only if dhcp-timeout is greater than 60.
-     */
-    if (timeout >= 60) {
-        timeout = timeout < G_MAXINT32 ? timeout + 1 : G_MAXINT32;
-        g_string_append_printf(new_contents, "timeout %u;\n", timeout);
-    }
-
-    add_mud_url_config(new_contents, mud_url, addr_family);
-
-    if (reject_servers && reject_servers[0]) {
-        g_string_append(new_contents, "reject ");
-        for (i = 0; reject_servers[i]; i++) {
-            if (i != 0)
-                g_string_append(new_contents, ", ");
-            g_string_append(new_contents, reject_servers[i]);
-        }
-        g_string_append(new_contents, ";\n");
-    }
-
-    if (addr_family == AF_INET) {
-        nm_auto_unref_bytes GBytes *client_id_none = NULL;
-        client_id = send_client_id ? client_id : (client_id_none = g_bytes_new_static("", 0));
-        add_ip4_config(new_contents, client_id, hostname, use_fqdn, hostname_flags);
-        add_request(reqs, "rfc3442-classless-static-routes");
-        add_request(reqs, "ms-classless-static-routes");
-        add_request(reqs, "static-routes");
-        add_request(reqs, "wpad");
-        add_request(reqs, "ntp-servers");
-        add_request(reqs, "root-path");
-    } else {
-        add_hostname6(new_contents, hostname, hostname_flags);
-        add_request(reqs, "dhcp6.name-servers");
-        add_request(reqs, "dhcp6.domain-search");
-
-        /* FIXME: internal client does not support requesting client-id option. Does this even work? */
-        add_request(reqs, "dhcp6.client-id");
-    }
-
-    if (reset_reqlist)
-        g_string_append(new_contents, "request; # override dhclient defaults\n");
-    /* And add it to the dhclient configuration */
-    for (i = 0; i < reqs->len; i++)
-        g_string_append_printf(new_contents, "also request %s;\n", (char *) reqs->pdata[i]);
-
-    if (fqdn_opts) {
-        for (i = 0; i < fqdn_opts->len; i++) {
-            const char *t = fqdn_opts->pdata[i];
-
-            if (i == 0)
-                g_string_append_printf(new_contents, "\n# FQDN options from %s\n", orig_path);
-            g_string_append_printf(new_contents, FQDN_TAG_PREFIX "%s\n", t);
-        }
-    }
-
-    g_string_append_c(new_contents, '\n');
-
-    if (anycast_address) {
-        g_string_append_printf(new_contents,
-                               "interface \"%s\" {\n"
-                               " initial-interval 1; \n"
-                               " anycast-mac ethernet %s;\n"
-                               "}\n",
-                               interface,
-                               anycast_address);
-    }
-
-    return g_string_free(g_steal_pointer(&new_contents), FALSE);
-}
-
-/* In the lease file, dhclient will write "option dhcp6.client-id $HEXSTR". This
- * function does the same. */
-static char *
-nm_dhcp_dhclient_escape_duid_as_hex(GBytes *duid)
-{
-    const guint8 *s;
-    gsize         len;
-
-    nm_assert(duid);
-
-    s = g_bytes_get_data(duid, &len);
-    return nm_utils_bin2hexstr_fuller(s, len, ':', FALSE, FALSE, NULL);
-}
-
-/* Roughly follow what dhclient's quotify_buf() and pretty_escape() functions do */
-char *
-nm_dhcp_dhclient_escape_duid(GBytes *duid)
-{
-    char         *escaped;
-    const guint8 *s, *s0;
-    gsize         len;
-    char         *d;
-
-    g_return_val_if_fail(duid, NULL);
-
-    s0 = g_bytes_get_data(duid, &len);
-    s  = s0;
-
-    d = escaped = g_malloc((len * 4) + 1);
-    while (s < (s0 + len)) {
-        if (!g_ascii_isprint(*s)) {
-            *d++ = '\\';
-            *d++ = '0' + ((*s >> 6) & 0x7);
-            *d++ = '0' + ((*s >> 3) & 0x7);
-            *d++ = '0' + (*s++ & 0x7);
-        } else if (*s == '"' || *s == '\'' || *s == '$' || *s == '`' || *s == '\\' || *s == '|'
-                   || *s == '&') {
-            *d++ = '\\';
-            *d++ = *s++;
-        } else
-            *d++ = *s++;
-    }
-    *d++ = '\0';
-    return escaped;
-}
-
-static gboolean
-isoctal(const guint8 *p)
-{
-    return (p[0] >= '0' && p[0] <= '3' && p[1] >= '0' && p[1] <= '7' && p[2] >= '0' && p[2] <= '7');
-}
-
-GBytes *
-nm_dhcp_dhclient_unescape_duid(const char *duid)
-{
-    GByteArray   *unescaped;
-    const guint8 *p = (const guint8 *) duid;
-    guint         i, len;
-    guint8        octal;
-
-    /* FIXME: it's wrong to have an "unescape-duid" function. dhclient
-     * defines a file format with escaping. So we need a general unescape
-     * function that can handle dhclient syntax. */
-
-    len       = strlen(duid);
-    unescaped = g_byte_array_sized_new(len);
-    for (i = 0; i < len; i++) {
-        if (p[i] == '\\') {
-            i++;
-            if (isdigit(p[i])) {
-                /* Octal escape sequence */
-                if (i + 2 >= len || !isoctal(p + i))
-                    goto error;
-                octal = ((p[i] - '0') << 6) + ((p[i + 1] - '0') << 3) + (p[i + 2] - '0');
-                g_byte_array_append(unescaped, &octal, 1);
-                i += 2;
-            } else {
-                /* FIXME: don't warn on untrusted data. Either signal an error, or accept
-                 * it silently. */
-
-                /* One of ", ', $, `, \, |, or & */
-                g_warn_if_fail(p[i] == '"' || p[i] == '\'' || p[i] == '$' || p[i] == '`'
-                               || p[i] == '\\' || p[i] == '|' || p[i] == '&');
-                g_byte_array_append(unescaped, &p[i], 1);
-            }
-        } else
-            g_byte_array_append(unescaped, &p[i], 1);
-    }
-
-    return g_byte_array_free_to_bytes(unescaped);
-
-error:
-    g_byte_array_free(unescaped, TRUE);
-    return NULL;
-}
-
-#define DEFAULT_DUID_PREFIX "default-duid \""
-
-/* Beware: @error may be unset even if the function returns %NULL. */
-GBytes *
-nm_dhcp_dhclient_read_duid(const char *leasefile, GError **error)
-{
-    gs_free char        *contents   = NULL;
-    gs_free const char **contents_v = NULL;
-    gsize                i;
-
-    if (!g_file_test(leasefile, G_FILE_TEST_EXISTS))
-        return NULL;
-
-    if (!g_file_get_contents(leasefile, &contents, NULL, error))
-        return NULL;
-
-    contents_v = nm_strsplit_set(contents, "\n\r");
-    for (i = 0; contents_v && contents_v[i]; i++) {
-        const char *p = nm_str_skip_leading_spaces(contents_v[i]);
-        GBytes     *duid;
-
-        if (!NM_STR_HAS_PREFIX(p, DEFAULT_DUID_PREFIX))
-            continue;
-
-        p += NM_STRLEN(DEFAULT_DUID_PREFIX);
-
-        g_strchomp((char *) p);
-
-        if (!NM_STR_HAS_SUFFIX(p, "\";"))
-            continue;
-
-        ((char *) p)[strlen(p) - 2] = '\0';
-
-        duid = nm_dhcp_dhclient_unescape_duid(p);
-        if (duid)
-            return duid;
-    }
-
-    return NULL;
-}
-
-gboolean
-nm_dhcp_dhclient_save_duid(const char *leasefile,
-                           GBytes     *duid,
-                           gboolean    enforce_duid,
-                           GError    **error)
-{
-    gs_free char                 *escaped_duid = NULL;
-    gs_free const char          **lines        = NULL;
-    nm_auto_free_gstring GString *s            = NULL;
-    const char *const            *iter;
-    gs_free char                 *conflicting_duid_line = NULL;
-    gs_free char                 *contents              = NULL;
-    gsize                         contents_len          = 0;
-
-    g_return_val_if_fail(leasefile != NULL, FALSE);
-
-    if (!duid) {
-        nm_utils_error_set_literal(error, NM_UTILS_ERROR_UNKNOWN, "missing duid");
-        g_return_val_if_reached(FALSE);
-    }
-
-    escaped_duid = nm_dhcp_dhclient_escape_duid(duid);
-    nm_assert(escaped_duid);
-
-    if (g_file_test(leasefile, G_FILE_TEST_EXISTS)) {
-        if (!g_file_get_contents(leasefile, &contents, &contents_len, error)) {
-            g_prefix_error(error, "failed to read lease file %s: ", leasefile);
-            return FALSE;
-        }
-
-        lines = nm_strsplit_set_with_empty(contents, "\n");
-    }
-
-    s = g_string_sized_new(contents_len + 50);
-    g_string_append_printf(s, DEFAULT_DUID_PREFIX "%s\";\n", escaped_duid);
-
-    /* Preserve existing leasefile contents */
-    if (lines) {
-        for (iter = lines; *iter; iter++) {
-            const char *str = *iter;
-            const char *l;
-            gboolean    ends_with_r;
-            gsize       l_len;
-            gsize       prefix_len;
-
-            l          = nm_str_skip_leading_spaces(str);
-            l_len      = strlen(l);
-            prefix_len = l - str;
-
-            ends_with_r = l_len > 0 && l[l_len - 1u] == '\r';
-            if (ends_with_r) {
-                ((char *) l)[--l_len] = '\0';
-            }
-
-            if (NM_STR_HAS_PREFIX(l, DEFAULT_DUID_PREFIX)) {
-                /* We always add our line on top. This line can be skipped. */
-                continue;
-            }
-
-            if (enforce_duid & NM_STR_HAS_PREFIX(l, "option dhcp6.client-id ")) {
-                /* we want to use our duid. Skip the per-lease client-id. */
-                if (!conflicting_duid_line) {
-                    gs_free char *duid_hex = nm_dhcp_dhclient_escape_duid_as_hex(duid);
-
-                    conflicting_duid_line = g_strdup_printf("option dhcp6.client-id %s;", duid_hex);
-                }
-                /* We adjust the duid line and set what we want. */
-                l = conflicting_duid_line;
-            }
-
-            g_string_append_len(s, str, prefix_len);
-            g_string_append(s, l);
-            if (ends_with_r) {
-                g_string_append_c(s, '\r');
-                g_string_append_c(s, '\n');
-            } else if ((iter[1]) != NULL) {
-                /* avoid to add an extra '\n' at the end of file */
-                g_string_append_c(s, '\n');
-            }
-        }
-    }
-
-    if (contents && strlen(contents) == contents_len && nm_streq(contents, s->str)) {
-        /* The file is already as we want it. We are done. */
-        return TRUE;
-    }
-
-    if (!g_file_set_contents(leasefile, s->str, -1, error)) {
-        g_prefix_error(error, "failed to set DUID in lease file %s: ", leasefile);
-        return FALSE;
-    }
-
-    return TRUE;
-}
diff --git a/src/core/dhcp/nm-dhcp-dhclient-utils.h b/src/core/dhcp/nm-dhcp-dhclient-utils.h
deleted file mode 100644
index 34b26175..00000000
--- a/src/core/dhcp/nm-dhcp-dhclient-utils.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (C) 2010 Red Hat, Inc.
- */
-
-#ifndef __NETWORKMANAGER_DHCP_DHCLIENT_UTILS_H__
-#define __NETWORKMANAGER_DHCP_DHCLIENT_UTILS_H__
-
-#include "nm-setting-ip4-config.h"
-#include "nm-setting-ip6-config.h"
-
-char *nm_dhcp_dhclient_create_config(const char         *interface,
-                                     int                 addr_family,
-                                     GBytes             *client_id,
-                                     gboolean            send_client_id,
-                                     const char         *anycast_addr,
-                                     const char         *hostname,
-                                     guint32             timeout,
-                                     gboolean            use_fqdn,
-                                     NMDhcpHostnameFlags hostname_flags,
-                                     const char         *mud_url,
-                                     const char *const  *reject_servers,
-                                     const char         *orig_path,
-                                     const char         *orig_contents,
-                                     GBytes            **out_new_client_id);
-
-char *nm_dhcp_dhclient_escape_duid(GBytes *duid);
-
-GBytes *nm_dhcp_dhclient_unescape_duid(const char *duid);
-
-GBytes *nm_dhcp_dhclient_read_duid(const char *leasefile, GError **error);
-
-gboolean nm_dhcp_dhclient_save_duid(const char *leasefile,
-                                    GBytes     *duid,
-                                    gboolean    enforce_duid,
-                                    GError    **error);
-
-#endif /* __NETWORKMANAGER_DHCP_DHCLIENT_UTILS_H__ */
diff --git a/src/core/dhcp/nm-dhcp-dhclient.c b/src/core/dhcp/nm-dhcp-dhclient.c
deleted file mode 100644
index 7e00599c..00000000
--- a/src/core/dhcp/nm-dhcp-dhclient.c
+++ /dev/null
@@ -1,741 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (C) 2005 - 2012 Red Hat, Inc.
- */
-
-#include <config.h>
-#define __CONFIG_H__
-
-#define _XOPEN_SOURCE
-#include <time.h>
-#undef _XOPEN_SOURCE
-
-#include "src/core/nm-default-daemon.h"
-
-#if WITH_DHCLIENT
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <ctype.h>
-
-#include "libnm-glib-aux/nm-dedup-multi.h"
-
-#include "nm-utils.h"
-#include "nm-dhcp-dhclient-utils.h"
-#include "nm-dhcp-manager.h"
-#include "NetworkManagerUtils.h"
-#include "nm-dhcp-listener.h"
-#include "nm-dhcp-client-logging.h"
-
-/*****************************************************************************/
-
-static const char *
-_addr_family_to_path_part(int addr_family)
-{
-    nm_assert(NM_IN_SET(addr_family, AF_INET, AF_INET6));
-    return (addr_family == AF_INET6) ? "6" : "";
-}
-
-/*****************************************************************************/
-
-#define NM_TYPE_DHCP_DHCLIENT (nm_dhcp_dhclient_get_type())
-#define NM_DHCP_DHCLIENT(obj) \
-    (_NM_G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclient))
-#define NM_DHCP_DHCLIENT_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientClass))
-#define NM_IS_DHCP_DHCLIENT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_DHCP_DHCLIENT))
-#define NM_IS_DHCP_DHCLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_DHCP_DHCLIENT))
-#define NM_DHCP_DHCLIENT_GET_CLASS(obj) \
-    (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientClass))
-
-typedef struct _NMDhcpDhclient      NMDhcpDhclient;
-typedef struct _NMDhcpDhclientClass NMDhcpDhclientClass;
-
-static GType nm_dhcp_dhclient_get_type(void);
-
-/*****************************************************************************/
-
-typedef struct {
-    char           *conf_file;
-    const char     *def_leasefile;
-    char           *lease_file;
-    char           *pid_file;
-    NMDhcpListener *dhcp_listener;
-} NMDhcpDhclientPrivate;
-
-struct _NMDhcpDhclient {
-    NMDhcpClient          parent;
-    NMDhcpDhclientPrivate _priv;
-};
-
-struct _NMDhcpDhclientClass {
-    NMDhcpClientClass parent;
-};
-
-G_DEFINE_TYPE(NMDhcpDhclient, nm_dhcp_dhclient, NM_TYPE_DHCP_CLIENT)
-
-#define NM_DHCP_DHCLIENT_GET_PRIVATE(self) \
-    _NM_GET_PRIVATE(self, NMDhcpDhclient, NM_IS_DHCP_DHCLIENT)
-
-/*****************************************************************************/
-
-static GBytes *read_duid_from_lease(NMDhcpDhclient *self);
-
-/*****************************************************************************/
-
-static const char *
-nm_dhcp_dhclient_get_path(void)
-{
-    return nm_utils_find_helper("dhclient", DHCLIENT_PATH, NULL);
-}
-
-/**
- * get_dhclient_leasefile():
- * @addr_family: AF_INET or AF_INET6
- * @iface: the interface name of the device on which DHCP will be done
- * @uuid: the connection UUID to which the returned lease should belong
- * @out_preferred_path: on return, the "most preferred" leasefile path
- *
- * Returns the path of an existing leasefile (if any) for this interface and
- * connection UUID.  Also returns the "most preferred" leasefile path, which
- * may be different than any found leasefile.
- *
- * Returns: an existing leasefile, or %NULL if no matching leasefile could be found
- */
-static char *
-get_dhclient_leasefile(int         addr_family,
-                       const char *iface,
-                       const char *uuid,
-                       char      **out_preferred_path)
-{
-    gs_free char *path = NULL;
-
-    if (nm_dhcp_utils_get_leasefile_path(addr_family, "dhclient", iface, uuid, &path)) {
-        NM_SET_OUT(out_preferred_path, g_strdup(path));
-        return g_steal_pointer(&path);
-    }
-
-    NM_SET_OUT(out_preferred_path, g_steal_pointer(&path));
-
-    /* If the leasefile we're looking for doesn't exist yet in the new location
-     * (eg, /var/lib/NetworkManager) then look in old locations to maintain
-     * backwards compatibility with external tools (like dracut) that put
-     * leasefiles there.
-     */
-
-    /* Old Debian, SUSE, and Mandriva location */
-    g_free(path);
-    path = g_strdup_printf(LOCALSTATEDIR "/lib/dhcp/dhclient%s-%s-%s.lease",
-                           _addr_family_to_path_part(addr_family),
-                           uuid,
-                           iface);
-    if (g_file_test(path, G_FILE_TEST_EXISTS))
-        return g_steal_pointer(&path);
-
-    /* Old Red Hat and Fedora location */
-    g_free(path);
-    path = g_strdup_printf(LOCALSTATEDIR "/lib/dhclient/dhclient%s-%s-%s.lease",
-                           _addr_family_to_path_part(addr_family),
-                           uuid,
-                           iface);
-    if (g_file_test(path, G_FILE_TEST_EXISTS))
-        return g_steal_pointer(&path);
-
-    /* Fail */
-    return NULL;
-}
-
-static char *
-find_existing_config(NMDhcpDhclient *self, int addr_family, const char *iface, const char *uuid)
-{
-    char *path;
-
-    /* NetworkManager-overridden configuration can be used to ship DHCP config
-     * with NetworkManager itself. It can be uuid-specific, device-specific
-     * or generic.
-     */
-    if (uuid) {
-        path = g_strdup_printf(NMCONFDIR "/dhclient%s-%s.conf",
-                               _addr_family_to_path_part(addr_family),
-                               uuid);
-        _LOGD("looking for existing config %s", path);
-        if (g_file_test(path, G_FILE_TEST_EXISTS))
-            return path;
-        g_free(path);
-    }
-
-    path = g_strdup_printf(NMCONFDIR "/dhclient%s-%s.conf",
-                           _addr_family_to_path_part(addr_family),
-                           iface);
-    _LOGD("looking for existing config %s", path);
-    if (g_file_test(path, G_FILE_TEST_EXISTS))
-        return path;
-    g_free(path);
-
-    path = g_strdup_printf(NMCONFDIR "/dhclient%s.conf", _addr_family_to_path_part(addr_family));
-    _LOGD("looking for existing config %s", path);
-    if (g_file_test(path, G_FILE_TEST_EXISTS))
-        return path;
-    g_free(path);
-
-    /* Distribution's dhclient configuration is used so that we can use
-     * configuration shipped with dhclient (if any).
-     *
-     * This replaces conditional compilation based on distribution name. Fedora
-     * and Debian store the configs in /etc/dhcp while upstream defaults to /etc
-     * which is then used by many other distributions. Some distributions
-     * (including Fedora) don't even provide a default configuration file.
-     */
-    path = g_strdup_printf(SYSCONFDIR "/dhcp/dhclient%s-%s.conf",
-                           _addr_family_to_path_part(addr_family),
-                           iface);
-    _LOGD("looking for existing config %s", path);
-    if (g_file_test(path, G_FILE_TEST_EXISTS))
-        return path;
-    g_free(path);
-
-    path = g_strdup_printf(SYSCONFDIR "/dhclient%s-%s.conf",
-                           _addr_family_to_path_part(addr_family),
-                           iface);
-    _LOGD("looking for existing config %s", path);
-    if (g_file_test(path, G_FILE_TEST_EXISTS))
-        return path;
-    g_free(path);
-
-    path =
-        g_strdup_printf(SYSCONFDIR "/dhcp/dhclient%s.conf", _addr_family_to_path_part(addr_family));
-    _LOGD("looking for existing config %s", path);
-    if (g_file_test(path, G_FILE_TEST_EXISTS))
-        return path;
-    g_free(path);
-
-    path = g_strdup_printf(SYSCONFDIR "/dhclient%s.conf", _addr_family_to_path_part(addr_family));
-    _LOGD("looking for existing config %s", path);
-    if (g_file_test(path, G_FILE_TEST_EXISTS))
-        return path;
-    g_free(path);
-
-    return NULL;
-}
-
-/* NM provides interface-specific options; thus the same dhclient config
- * file cannot be used since DHCP transactions can happen in parallel.
- * Since some distros don't have default per-interface dhclient config files,
- * read their single config file and merge that into a custom per-interface
- * config file along with the NM options.
- */
-static char *
-create_dhclient_config(NMDhcpDhclient     *self,
-                       int                 addr_family,
-                       const char         *iface,
-                       const char         *uuid,
-                       GBytes             *client_id,
-                       gboolean            send_client_id,
-                       const char         *anycast_address,
-                       const char         *hostname,
-                       guint32             timeout,
-                       gboolean            use_fqdn,
-                       NMDhcpHostnameFlags hostname_flags,
-                       const char         *mud_url,
-                       const char *const  *reject_servers,
-                       GBytes            **out_new_client_id)
-{
-    gs_free char *orig_path    = NULL;
-    gs_free char *orig_content = NULL;
-    char         *new_path     = NULL;
-    gs_free char *new_content  = NULL;
-    GError       *error        = NULL;
-
-    g_return_val_if_fail(iface != NULL, NULL);
-
-    new_path = g_strdup_printf(NMSTATEDIR "/dhclient%s-%s.conf",
-                               _addr_family_to_path_part(addr_family),
-                               iface);
-    _LOGD("creating composite dhclient config %s", new_path);
-
-    orig_path = find_existing_config(self, addr_family, iface, uuid);
-    if (orig_path)
-        _LOGD("merging existing dhclient config %s", orig_path);
-    else
-        _LOGD("no existing dhclient configuration to merge");
-
-    if (orig_path && g_file_test(orig_path, G_FILE_TEST_EXISTS)) {
-        if (!g_file_get_contents(orig_path, &orig_content, NULL, &error)) {
-            _LOGW("error reading dhclient configuration %s: %s", orig_path, error->message);
-            g_error_free(error);
-        }
-    }
-
-    new_content = nm_dhcp_dhclient_create_config(iface,
-                                                 addr_family,
-                                                 client_id,
-                                                 send_client_id,
-                                                 anycast_address,
-                                                 hostname,
-                                                 timeout,
-                                                 use_fqdn,
-                                                 hostname_flags,
-                                                 mud_url,
-                                                 reject_servers,
-                                                 orig_path,
-                                                 orig_content,
-                                                 out_new_client_id);
-    nm_assert(new_content);
-
-    if (!g_file_set_contents(new_path, new_content, -1, &error)) {
-        _LOGW("error creating dhclient configuration: %s", error->message);
-        g_error_free(error);
-        g_free(new_path);
-        return NULL;
-    }
-
-    return new_path;
-}
-
-static gboolean
-dhclient_start(NMDhcpClient *client,
-               gboolean      set_mode,
-               gboolean      release,
-               gboolean      set_duid,
-               pid_t        *out_pid,
-               GError      **error)
-{
-    NMDhcpDhclient              *self = NM_DHCP_DHCLIENT(client);
-    NMDhcpDhclientPrivate       *priv = NM_DHCP_DHCLIENT_GET_PRIVATE(self);
-    gs_unref_ptrarray GPtrArray *argv = NULL;
-    pid_t                        pid;
-    gs_free_error GError        *local = NULL;
-    const char                  *iface;
-    const char                  *uuid;
-    const char                  *system_bus_address;
-    const char                  *dhclient_path;
-    char                        *binary_name;
-    gs_free char                *cmd_str                  = NULL;
-    gs_free char                *pid_file                 = NULL;
-    gs_free char                *system_bus_address_env   = NULL;
-    gs_free char                *preferred_leasefile_path = NULL;
-    int                          addr_family;
-    const NMDhcpClientConfig    *client_config;
-    char                         pd_length_str[16];
-
-    g_return_val_if_fail(!priv->pid_file, FALSE);
-    client_config = nm_dhcp_client_get_config(client);
-    addr_family   = client_config->addr_family;
-
-    NM_SET_OUT(out_pid, 0);
-
-    dhclient_path = nm_dhcp_dhclient_get_path();
-    if (!dhclient_path) {
-        nm_utils_error_set_literal(error, NM_UTILS_ERROR_UNKNOWN, "dhclient binary not found");
-        return FALSE;
-    }
-
-    iface = client_config->iface;
-    uuid  = client_config->uuid;
-
-    pid_file = g_strdup_printf(NMRUNDIR "/dhclient%s-%s.pid",
-                               _addr_family_to_path_part(addr_family),
-                               iface);
-
-    /* Kill any existing dhclient from the pidfile */
-    binary_name = g_path_get_basename(dhclient_path);
-    nm_dhcp_client_stop_existing(pid_file, binary_name);
-    g_free(binary_name);
-
-    if (release) {
-        /* release doesn't use the pidfile after killing an old client */
-        nm_clear_g_free(&pid_file);
-    }
-
-    g_free(priv->lease_file);
-    priv->lease_file = get_dhclient_leasefile(addr_family, iface, uuid, &preferred_leasefile_path);
-    nm_assert(preferred_leasefile_path);
-    if (!priv->lease_file) {
-        /* No existing leasefile, dhclient will create one at the preferred path */
-        priv->lease_file = g_steal_pointer(&preferred_leasefile_path);
-    } else if (!nm_streq0(priv->lease_file, preferred_leasefile_path)) {
-        gs_unref_object GFile *src = g_file_new_for_path(priv->lease_file);
-        gs_unref_object GFile *dst = g_file_new_for_path(preferred_leasefile_path);
-
-        /* Try to copy the existing leasefile to the preferred location */
-        if (!g_file_copy(src, dst, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, &local)) {
-            gs_free char *s_path = NULL;
-            gs_free char *d_path = NULL;
-
-            /* Failure; just use the existing leasefile */
-            _LOGW("failed to copy leasefile %s to %s: %s",
-                  (s_path = g_file_get_path(src)),
-                  (d_path = g_file_get_path(dst)),
-                  local->message);
-            g_clear_error(&local);
-        } else {
-            /* Success; use the preferred leasefile path */
-            g_free(priv->lease_file);
-            priv->lease_file = g_file_get_path(dst);
-        }
-    }
-
-    /* Save the DUID to the leasefile dhclient will actually use */
-    if (set_duid && addr_family == AF_INET6) {
-        if (!nm_dhcp_dhclient_save_duid(priv->lease_file,
-                                        nm_dhcp_client_get_effective_client_id(client),
-                                        client_config->v6.enforce_duid,
-                                        &local)) {
-            nm_utils_error_set(error,
-                               NM_UTILS_ERROR_UNKNOWN,
-                               "failed to save DUID to '%s': %s",
-                               priv->lease_file,
-                               local->message);
-            return FALSE;
-        }
-    }
-
-    argv = g_ptr_array_new();
-    g_ptr_array_add(argv, (gpointer) dhclient_path);
-
-    g_ptr_array_add(argv, (gpointer) "-d");
-
-    /* Be quiet. dhclient logs to syslog anyway. And we duplicate the syslog
-     * to stderr in case of NM running with --debug.
-     */
-    g_ptr_array_add(argv, (gpointer) "-q");
-
-    if (release)
-        g_ptr_array_add(argv, (gpointer) "-r");
-
-    if (!release && client_config->addr_family == AF_INET && client_config->v4.request_broadcast) {
-        g_ptr_array_add(argv, (gpointer) "-B");
-    }
-
-    if (addr_family == AF_INET6) {
-        guint       prefixes = client_config->v6.needed_prefixes;
-        const char *mode_opt;
-
-        g_ptr_array_add(argv, (gpointer) "-6");
-
-        if (!set_mode)
-            mode_opt = NULL;
-        else if (!client_config->v6.info_only)
-            mode_opt = "-N";
-        else if (prefixes == 0)
-            mode_opt = "-S";
-        else
-            mode_opt = NULL;
-
-        if (mode_opt)
-            g_ptr_array_add(argv, (gpointer) mode_opt);
-
-        if (prefixes > 0 && client_config->v6.pd_hint_length > 0) {
-            if (!IN6_IS_ADDR_UNSPECIFIED(&client_config->v6.pd_hint_addr)) {
-                _LOGW("dhclient only supports a length as prefix delegation hint, not a prefix");
-            }
-
-            nm_sprintf_buf(pd_length_str, "%u", client_config->v6.pd_hint_length);
-            g_ptr_array_add(argv, "--prefix-len-hint");
-            g_ptr_array_add(argv, pd_length_str);
-        }
-
-        while (prefixes--)
-            g_ptr_array_add(argv, (gpointer) "-P");
-    }
-    g_ptr_array_add(argv, (gpointer) "-sf"); /* Set script file */
-    g_ptr_array_add(argv, (gpointer) nm_dhcp_helper_path);
-
-    if (pid_file) {
-        g_ptr_array_add(argv, (gpointer) "-pf"); /* Set pid file */
-        g_ptr_array_add(argv, (gpointer) pid_file);
-    }
-
-    g_ptr_array_add(argv, (gpointer) "-lf"); /* Set lease file */
-    g_ptr_array_add(argv, (gpointer) priv->lease_file);
-
-    if (priv->conf_file) {
-        g_ptr_array_add(argv, (gpointer) "-cf"); /* Set interface config file */
-        g_ptr_array_add(argv, (gpointer) priv->conf_file);
-    }
-
-    if (client_config->v4.dscp_explicit) {
-        _LOGW("dhclient does not support specifying a custom DSCP value; the TOS field will be set "
-              "to LOWDELAY (0x10).");
-    }
-
-    if (client_config->v4.ipv6_only_preferred) {
-        _LOGW("the dhclient backend does not support the \"IPv6-Only Preferred\" option; ignoring "
-              "it");
-    }
-
-    /* Usually the system bus address is well-known; but if it's supposed
-     * to be something else, we need to push it to dhclient, since dhclient
-     * sanitizes the environment it gives the action scripts.
-     */
-    system_bus_address = getenv("DBUS_SYSTEM_BUS_ADDRESS");
-    if (system_bus_address) {
-        system_bus_address_env = g_strdup_printf("DBUS_SYSTEM_BUS_ADDRESS=%s", system_bus_address);
-        g_ptr_array_add(argv, (gpointer) "-e");
-        g_ptr_array_add(argv, (gpointer) system_bus_address_env);
-    }
-
-    g_ptr_array_add(argv, (gpointer) iface);
-    g_ptr_array_add(argv, NULL);
-
-    _LOGD("running: %s", (cmd_str = g_strjoinv(" ", (char **) argv->pdata)));
-
-    if (!g_spawn_async(NULL,
-                       (char **) argv->pdata,
-                       NULL,
-                       G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_STDOUT_TO_DEV_NULL
-                           | G_SPAWN_STDERR_TO_DEV_NULL,
-                       nm_utils_setpgid,
-                       NULL,
-                       &pid,
-                       &local)) {
-        nm_utils_error_set(error,
-                           NM_UTILS_ERROR_UNKNOWN,
-                           "dhclient failed to start: %s",
-                           local->message);
-        return FALSE;
-    }
-
-    _LOGI("dhclient started with pid %lld", (long long int) pid);
-
-    if (!release)
-        nm_dhcp_client_watch_child(client, pid);
-
-    priv->pid_file = g_steal_pointer(&pid_file);
-
-    NM_SET_OUT(out_pid, pid);
-    return TRUE;
-}
-
-static gboolean
-ip4_start(NMDhcpClient *client, GError **error)
-{
-    NMDhcpDhclient           *self          = NM_DHCP_DHCLIENT(client);
-    NMDhcpDhclientPrivate    *priv          = NM_DHCP_DHCLIENT_GET_PRIVATE(self);
-    gs_unref_bytes GBytes    *new_client_id = NULL;
-    const NMDhcpClientConfig *client_config;
-
-    client_config = nm_dhcp_client_get_config(client);
-
-    nm_assert(client_config->addr_family == AF_INET);
-
-    priv->conf_file = create_dhclient_config(self,
-                                             AF_INET,
-                                             client_config->iface,
-                                             client_config->uuid,
-                                             client_config->client_id,
-                                             client_config->v4.send_client_id,
-                                             client_config->anycast_address,
-                                             client_config->hostname,
-                                             client_config->timeout,
-                                             client_config->use_fqdn,
-                                             client_config->hostname_flags,
-                                             client_config->mud_url,
-                                             client_config->reject_servers,
-                                             &new_client_id);
-    if (!priv->conf_file) {
-        nm_utils_error_set_literal(error,
-                                   NM_UTILS_ERROR_UNKNOWN,
-                                   "error creating dhclient configuration file");
-        return FALSE;
-    }
-
-    /* Note that the effective-client-id for IPv4 here might be unknown/NULL. */
-    nm_assert(!new_client_id || !client_config->client_id);
-    nm_dhcp_client_set_effective_client_id(client, client_config->client_id ?: new_client_id);
-
-    return dhclient_start(client, FALSE, FALSE, FALSE, NULL, error);
-}
-
-static gboolean
-ip6_start(NMDhcpClient *client, const struct in6_addr *ll_addr, GError **error)
-{
-    NMDhcpDhclient           *self = NM_DHCP_DHCLIENT(client);
-    NMDhcpDhclientPrivate    *priv = NM_DHCP_DHCLIENT_GET_PRIVATE(self);
-    const NMDhcpClientConfig *config;
-    gs_unref_bytes GBytes    *effective_client_id = NULL;
-
-    config = nm_dhcp_client_get_config(client);
-
-    nm_assert(config->addr_family == AF_INET6);
-
-    if (config->v6.iaid_explicit)
-        _LOGW("dhclient does not support specifying an IAID for DHCPv6, it will be ignored");
-
-    priv->conf_file = create_dhclient_config(self,
-                                             AF_INET6,
-                                             config->iface,
-                                             config->uuid,
-                                             NULL,
-                                             TRUE,
-                                             config->anycast_address,
-                                             config->hostname,
-                                             config->timeout,
-                                             TRUE,
-                                             config->hostname_flags,
-                                             config->mud_url,
-                                             NULL,
-                                             NULL);
-    if (!priv->conf_file) {
-        nm_utils_error_set_literal(error,
-                                   NM_UTILS_ERROR_UNKNOWN,
-                                   "error creating dhclient configuration file");
-        return FALSE;
-    }
-
-    nm_assert(config->client_id);
-    if (!config->v6.enforce_duid)
-        effective_client_id = read_duid_from_lease(self);
-    nm_dhcp_client_set_effective_client_id(client, effective_client_id ?: config->client_id);
-
-    return dhclient_start(client, TRUE, FALSE, TRUE, NULL, error);
-}
-
-static void
-stop(NMDhcpClient *client, gboolean release)
-{
-    NMDhcpDhclient        *self = NM_DHCP_DHCLIENT(client);
-    NMDhcpDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE(self);
-    int                    errsv;
-
-    NM_DHCP_CLIENT_CLASS(nm_dhcp_dhclient_parent_class)->stop(client, release);
-
-    if (priv->conf_file)
-        if (remove(priv->conf_file) == -1) {
-            errsv = errno;
-            _LOGD("could not remove dhcp config file \"%s\": %d (%s)",
-                  priv->conf_file,
-                  errsv,
-                  nm_strerror_native(errsv));
-        }
-    if (priv->pid_file) {
-        if (remove(priv->pid_file) == -1) {
-            errsv = errno;
-            _LOGD("could not remove dhcp pid file \"%s\": %s (%d)",
-                  priv->pid_file,
-                  nm_strerror_native(errsv),
-                  errsv);
-        }
-        nm_clear_g_free(&priv->pid_file);
-    }
-
-    if (release) {
-        pid_t rpid = -1;
-
-        if (dhclient_start(client, FALSE, TRUE, FALSE, &rpid, NULL)) {
-            /* Wait a few seconds for the release to happen */
-            nm_dhcp_client_stop_pid(rpid, nm_dhcp_client_get_iface(client));
-        }
-    }
-}
-
-static GBytes *
-read_duid_from_lease(NMDhcpDhclient *self)
-{
-    NMDhcpClient             *client = NM_DHCP_CLIENT(self);
-    NMDhcpDhclientPrivate    *priv   = NM_DHCP_DHCLIENT_GET_PRIVATE(self);
-    const NMDhcpClientConfig *client_config;
-    GBytes                   *duid      = NULL;
-    gs_free char             *leasefile = NULL;
-    GError                   *error     = NULL;
-
-    client_config = nm_dhcp_client_get_config(client);
-
-    /* Look in interface-specific leasefile first for backwards compat */
-    leasefile = get_dhclient_leasefile(AF_INET6,
-                                       nm_dhcp_client_get_iface(client),
-                                       client_config->uuid,
-                                       NULL);
-    if (leasefile) {
-        _LOGD("looking for DUID in '%s'", leasefile);
-        duid = nm_dhcp_dhclient_read_duid(leasefile, &error);
-        if (error) {
-            _LOGW("failed to read leasefile '%s': %s", leasefile, error->message);
-            g_clear_error(&error);
-        }
-        if (duid)
-            return duid;
-    }
-
-    /* Otherwise, read the default machine-wide DUID */
-    _LOGD("looking for default DUID in '%s'", priv->def_leasefile);
-    duid = nm_dhcp_dhclient_read_duid(priv->def_leasefile, &error);
-    if (error) {
-        _LOGW("failed to read leasefile '%s': %s", priv->def_leasefile, error->message);
-        g_clear_error(&error);
-    }
-
-    return duid;
-}
-
-/*****************************************************************************/
-
-static void
-nm_dhcp_dhclient_init(NMDhcpDhclient *self)
-{
-    static const char *const FILES[] = {
-        SYSCONFDIR "/dhclient6.leases", /* default */
-        LOCALSTATEDIR "/lib/dhcp/dhclient6.leases",
-        LOCALSTATEDIR "/lib/dhclient/dhclient6.leases",
-    };
-    NMDhcpDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE(self);
-    int                    i;
-
-    priv->def_leasefile = FILES[0];
-    for (i = 0; i < G_N_ELEMENTS(FILES); i++) {
-        if (g_file_test(FILES[i], G_FILE_TEST_EXISTS)) {
-            priv->def_leasefile = FILES[i];
-            break;
-        }
-    }
-
-    priv->dhcp_listener = g_object_ref(nm_dhcp_listener_get());
-    g_signal_connect(priv->dhcp_listener,
-                     NM_DHCP_LISTENER_EVENT,
-                     G_CALLBACK(nm_dhcp_client_handle_event),
-                     self);
-}
-
-static void
-dispose(GObject *object)
-{
-    NMDhcpDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE(object);
-
-    if (priv->dhcp_listener) {
-        g_signal_handlers_disconnect_by_func(priv->dhcp_listener,
-                                             G_CALLBACK(nm_dhcp_client_handle_event),
-                                             NM_DHCP_DHCLIENT(object));
-        g_clear_object(&priv->dhcp_listener);
-    }
-
-    nm_clear_g_free(&priv->pid_file);
-    nm_clear_g_free(&priv->conf_file);
-    nm_clear_g_free(&priv->lease_file);
-
-    G_OBJECT_CLASS(nm_dhcp_dhclient_parent_class)->dispose(object);
-}
-
-static void
-nm_dhcp_dhclient_class_init(NMDhcpDhclientClass *dhclient_class)
-{
-    NMDhcpClientClass *client_class = NM_DHCP_CLIENT_CLASS(dhclient_class);
-    GObjectClass      *object_class = G_OBJECT_CLASS(dhclient_class);
-
-    object_class->dispose = dispose;
-
-    client_class->ip4_start = ip4_start;
-    client_class->ip6_start = ip6_start;
-    client_class->stop      = stop;
-}
-
-const NMDhcpClientFactory _nm_dhcp_client_factory_dhclient = {
-    .name       = "dhclient",
-    .get_type_4 = nm_dhcp_dhclient_get_type,
-    .get_type_6 = nm_dhcp_dhclient_get_type,
-    .get_path   = nm_dhcp_dhclient_get_path,
-};
-
-#endif /* WITH_DHCLIENT */
diff --git a/src/core/dhcp/nm-dhcp-helper.c b/src/core/dhcp/nm-dhcp-helper.c
index 9e4cedf2..144e3cb0 100644
--- a/src/core/dhcp/nm-dhcp-helper.c
+++ b/src/core/dhcp/nm-dhcp-helper.c
@@ -205,8 +205,7 @@ do_notify:
 
     if (!NM_IN_STRSET(s_err, "org.freedesktop.DBus.Error.UnknownMethod")) {
         /* Some unexpected error. We treat that as a failure. In particular,
-         * the daemon will fail the request if ACD fails. This causes nm-dhcp-helper
-         * to fail, which in turn causes dhclient to send a DECLINE. */
+         * the daemon will fail the request if ACD fails. */
         _LOGW("failure to call notify: %s (try signal via Event)", error->message);
         success = FALSE;
         goto out;
diff --git a/src/core/dhcp/nm-dhcp-listener.c b/src/core/dhcp/nm-dhcp-listener.c
index 095131cc..cead1308 100644
--- a/src/core/dhcp/nm-dhcp-listener.c
+++ b/src/core/dhcp/nm-dhcp-listener.c
@@ -36,9 +36,6 @@ const NMDhcpClientFactory *const _nm_dhcp_manager_factories[6] = {
 #endif
     &_nm_dhcp_client_factory_systemd,
     &_nm_dhcp_client_factory_nettools,
-#if WITH_DHCLIENT
-    &_nm_dhcp_client_factory_dhclient,
-#endif
 };
 
 /*****************************************************************************/
diff --git a/src/core/dhcp/nm-dhcp-manager.c b/src/core/dhcp/nm-dhcp-manager.c
index 68bb327b..9faee84e 100644
--- a/src/core/dhcp/nm-dhcp-manager.c
+++ b/src/core/dhcp/nm-dhcp-manager.c
@@ -91,11 +91,6 @@ static const NMDhcpClientFactory *
 _client_factory_available(const NMDhcpClientFactory *client_factory)
 {
     if (client_factory) {
-        if (nm_streq(client_factory->name, "dhclient")) {
-            _LOGW(AF_UNSPEC,
-                  "attempting to used a deprecated DHCP client '%s' ",
-                  client_factory->name);
-        }
         if (!client_factory->get_path || client_factory->get_path())
             return client_factory;
     }
@@ -205,30 +200,10 @@ nm_dhcp_manager_start_client(NMDhcpManager *self, NMDhcpClientConfig *config, GE
 
     client = g_object_new(gtype, NM_DHCP_CLIENT_CONFIG, config, NULL);
 
-    /* unfortunately, our implementations work differently per address-family regarding client-id/DUID.
-     *
-     * - for IPv4, the calling code may determine a client-id (from NM's connection profile).
-     *   If present, it is taken. If not present, the DHCP plugin uses a plugin specific default.
-     *     - for "internal" plugin, the default is just "mac".
-     *     - for "dhclient", we try to get the configuration from dhclient's /etc/dhcp or fallback
-     *       to whatever dhclient uses by default.
-     *   We do it this way, because for dhclient the user may configure a default
-     *   outside of NM, and we want to honor that. Worse, dhclient could be a wapper
-     *   script where the wrapper script overwrites the client-id. We need to distinguish
-     *   between: force a particular client-id and leave it unspecified to whatever dhclient
-     *   wants.
-     *
-     * - for IPv6, the calling code always determines a client-id. It also specifies @enforce_duid,
-     *   to determine whether the given client-id must be used.
-     *     - for "internal" plugin @enforce_duid doesn't matter and the given client-id is
-     *       always used.
-     *     - for "dhclient", @enforce_duid FALSE means to first try to load the DUID from the
-     *       lease file, and only otherwise fallback to the given client-id.
-     *     - other plugins don't support DHCPv6.
-     *   It's done this way, so that existing dhclient setups don't change behavior on upgrade.
+    /* - for IPv4, the calling code may determine a client-id (from NM's connection profile).
+     *   If present, it is taken. If not present, the default is just "mac".
      *
-     * This difference is cumbersome and only exists because of "dhclient" which supports hacking the
-     * default outside of NetworkManager API.
+     * - for IPv6, the calling code always determines a client-id.
      */
 
     if (!nm_dhcp_client_start(client, error))
@@ -289,8 +264,10 @@ nm_dhcp_manager_init(NMDhcpManager *self)
                                  NM_CONFIG_GET_VALUE_STRIP | NM_CONFIG_GET_VALUE_NO_EMPTY);
     client = client_free;
     if (client) {
-        client_factory = _client_factory_available(_client_factory_find_by_name(client));
+        client_factory = _client_factory_find_by_name(client);
         if (!client_factory)
+            _LOGW(AF_UNSPEC, "init: unknown DHCP client '%s', ignoring", client);
+        else if (!(client_factory = _client_factory_available(client_factory)))
             _LOGW(AF_UNSPEC, "init: DHCP client '%s' not available", client);
     }
     if (!client_factory) {
diff --git a/src/core/dhcp/nm-dhcp-nettools.c b/src/core/dhcp/nm-dhcp-nettools.c
index 27bb136b..ad9cb893 100644
--- a/src/core/dhcp/nm-dhcp-nettools.c
+++ b/src/core/dhcp/nm-dhcp-nettools.c
@@ -269,7 +269,7 @@ lease_parse_address(NMDhcpNettools    *self /* for logging context only */,
         char str2[NM_INET_ADDRSTRLEN];
 
         /* Some DHCP servers may not set the subnet-mask (issue#1037).
-         * Do the same as the dhclient plugin and use a default. */
+         * Use a default. */
         a_plen    = nm_ip4_addr_get_default_prefix(a_address.s_addr);
         a_netmask = nm_ip4_addr_netmask_from_prefix(a_plen);
         _LOGT("missing subnet mask (option 1). Guess %s based on IP address %s",
@@ -418,7 +418,6 @@ lease_parse_routes(NDhcp4ClientLease *lease,
     in_addr_t     gateway;
     uint8_t       plen;
     guint32       m;
-    gboolean      has_router_from_classless   = FALSE;
     gboolean      has_classless               = FALSE;
     guint32       default_route_metric_offset = 0;
     const guint8 *l_data;
@@ -434,7 +433,7 @@ lease_parse_routes(NDhcp4ClientLease *lease,
      * We will however also parse one of the options into the "l3cd" for configuring routing.
      * Thereby we prefer 121 over 249 over 33.
      *
-     * Preferring 121 over 33 is defined by RFC 3443.
+     * Preferring 121 over 33 is defined by RFC 3442.
      * Preferring 121 over 249 over 33 is made up as it makes sense (the MS docs are not very clear).
      */
     for (i = 0; i < 2; i++) {
@@ -460,8 +459,7 @@ lease_parse_routes(NDhcp4ClientLease *lease,
             if (plen == 0) {
                 /* if there are multiple default routes, we add them with differing
                  * metrics. */
-                m                         = default_route_metric_offset++;
-                has_router_from_classless = TRUE;
+                m = default_route_metric_offset++;
             } else
                 m = 0;
 
@@ -495,7 +493,7 @@ lease_parse_routes(NDhcp4ClientLease *lease,
             nm_str_buf_append_printf(sbuf, "%s/%d %s", dest_str, (int) plen, gateway_str);
 
             if (has_classless) {
-                /* RFC 3443: if the DHCP server returns both a Classless Static Routes
+                /* RFC 3442: if the DHCP server returns both a Classless Static Routes
                  * option and a Static Routes option, the DHCP client MUST ignore the
                  * Static Routes option. */
                 continue;
@@ -539,13 +537,10 @@ lease_parse_routes(NDhcp4ClientLease *lease,
                 continue;
             }
 
-            if (has_router_from_classless) {
-                /* If the DHCP server returns both a Classless Static Routes option and a
-                 * Router option, the DHCP client MUST ignore the Router option [RFC 3442].
-                 *
-                 * Be more lenient and ignore the Router option only if Classless Static
-                 * Routes contain a default gateway (as other DHCP backends do).
-                 */
+            if (has_classless) {
+                /* RFC 3442: if the DHCP server returns both a Classless Static Routes
+                 * option and a Router option, the DHCP client MUST ignore the Router
+                 * option. */
                 continue;
             }
 
@@ -1475,7 +1470,9 @@ ip4_start(NMDhcpClient *client, GError **error)
             } else {
                 fqdn_len = strlen(client_config->hostname);
                 if (fqdn_len > sizeof(buffer) - 3) {
-                    nm_utils_error_set(error, r, "failed to set DHCP FQDN: name too long");
+                    nm_utils_error_set_literal(error,
+                                               NM_UTILS_ERROR_UNKNOWN,
+                                               "failed to set DHCP FQDN: name too long");
                     return FALSE;
                 }
                 memcpy(buffer + 3, client_config->hostname, fqdn_len);
@@ -1530,7 +1527,8 @@ ip4_start(NMDhcpClient *client, GError **error)
 
     _LOGT("dhcp-client4: start " NM_HASH_OBFUSCATE_PTR_FMT, NM_HASH_OBFUSCATE_PTR(priv->client));
 
-    nm_dhcp_client_set_effective_client_id(client, effective_client_id);
+    if (effective_client_id)
+        nm_dhcp_client_set_effective_client_id(client, effective_client_id);
 
     return TRUE;
 }
diff --git a/src/core/dhcp/nm-dhcp-systemd.c b/src/core/dhcp/nm-dhcp-systemd.c
index b570f7e5..547e730b 100644
--- a/src/core/dhcp/nm-dhcp-systemd.c
+++ b/src/core/dhcp/nm-dhcp-systemd.c
@@ -92,6 +92,7 @@ lease_to_ip6_config(NMDhcpSystemd *self, sd_dhcp6_lease *lease, gint32 ts, GErro
     const char                             *s;
     nm_auto_free_gstring GString           *str = NULL;
     int                                     num, i;
+    gboolean                                has_any_prefix_delegated = FALSE;
 
     nm_assert(lease);
 
@@ -107,6 +108,28 @@ lease_to_ip6_config(NMDhcpSystemd *self, sd_dhcp6_lease *lease, gint32 ts, GErro
                               NM_DHCP_OPTION_DHCP6_NM_IAID,
                               nm_dhcp_iaid_to_hexstr(config->v6.iaid, iaid_buf));
 
+    {
+        struct in6_addr prefix;
+        uint8_t         prefix_len;
+
+        nm_gstring_prepare(&str);
+        sd_dhcp6_lease_pd_iterator_reset(lease);
+        while (!sd_dhcp6_lease_get_pd_prefix(lease, &prefix, &prefix_len)) {
+            nm_gstring_add_space_delimiter(str);
+            nm_inet6_ntop(&prefix, addr_str);
+            g_string_append_printf(str, "%s/%u", addr_str, prefix_len);
+            sd_dhcp6_lease_pd_iterator_next(lease);
+        }
+        if (str->len > 0) {
+            nm_dhcp_option_add_option(options,
+                                      TRUE,
+                                      AF_INET6,
+                                      NM_DHCP_OPTION_DHCP6_IA_PD,
+                                      str->str);
+            has_any_prefix_delegated = TRUE;
+        }
+    }
+
     if (!config->v6.info_only) {
         gboolean has_any_addresses = FALSE;
         uint64_t lft_pref;
@@ -142,11 +165,11 @@ lease_to_ip6_config(NMDhcpSystemd *self, sd_dhcp6_lease *lease, gint32 ts, GErro
                                       str->str);
         }
 
-        if (!has_any_addresses) {
+        if (!has_any_addresses && !has_any_prefix_delegated) {
             g_set_error_literal(error,
                                 NM_MANAGER_ERROR,
                                 NM_MANAGER_ERROR_FAILED,
-                                "no address received in managed mode");
+                                "no address or prefix delegation received in managed mode");
             return NULL;
         }
     }
@@ -166,27 +189,6 @@ lease_to_ip6_config(NMDhcpSystemd *self, sd_dhcp6_lease *lease, gint32 ts, GErro
                                   str->str);
     }
 
-    {
-        struct in6_addr prefix;
-        uint8_t         prefix_len;
-
-        nm_gstring_prepare(&str);
-        sd_dhcp6_lease_pd_iterator_reset(lease);
-        while (!sd_dhcp6_lease_get_pd_prefix(lease, &prefix, &prefix_len)) {
-            nm_gstring_add_space_delimiter(str);
-            nm_inet6_ntop(&prefix, addr_str);
-            g_string_append_printf(str, "%s/%u", addr_str, prefix_len);
-            sd_dhcp6_lease_pd_iterator_next(lease);
-        }
-        if (str->len > 0) {
-            nm_dhcp_option_add_option(options,
-                                      TRUE,
-                                      AF_INET6,
-                                      NM_DHCP_OPTION_DHCP6_IA_PD,
-                                      str->str);
-        }
-    }
-
     num = sd_dhcp6_lease_get_domains(lease, &domains);
     if (num > 0) {
         nm_gstring_prepare(&str);
diff --git a/src/core/dhcp/nm-dhcp-utils.c b/src/core/dhcp/nm-dhcp-utils.c
index 8a9bd58c..8c3001f2 100644
--- a/src/core/dhcp/nm-dhcp-utils.c
+++ b/src/core/dhcp/nm-dhcp-utils.c
@@ -827,64 +827,6 @@ nm_dhcp_utils_get_leasefile_path(int         addr_family,
     return FALSE;
 }
 
-gboolean
-nm_dhcp_utils_merge_new_dhcp6_lease(const NML3ConfigData  *l3cd_old,
-                                    const NML3ConfigData  *l3cd_new,
-                                    const NML3ConfigData **out_l3cd_merged)
-{
-    nm_auto_unref_l3cd_init NML3ConfigData *l3cd_merged = NULL;
-    const NMPlatformIP6Address             *addr;
-    NMDhcpLease                            *lease_old;
-    NMDhcpLease                            *lease_new;
-    NMDedupMultiIter                        iter;
-    const char                             *start;
-    const char                             *iaid;
-
-    nm_assert(out_l3cd_merged && !*out_l3cd_merged);
-
-    if (!l3cd_old)
-        return FALSE;
-    if (!l3cd_new)
-        return FALSE;
-
-    lease_new = nm_l3_config_data_get_dhcp_lease(l3cd_new, AF_INET6);
-    if (!lease_new)
-        return FALSE;
-
-    lease_old = nm_l3_config_data_get_dhcp_lease(l3cd_old, AF_INET6);
-    if (!lease_old)
-        return FALSE;
-
-    start = nm_dhcp_lease_lookup_option(lease_new, "life_starts");
-    if (!start)
-        return FALSE;
-    iaid = nm_dhcp_lease_lookup_option(lease_new, "iaid");
-    if (!iaid)
-        return FALSE;
-
-    if (!nm_streq0(start, nm_dhcp_lease_lookup_option(lease_old, "life_starts")))
-        return FALSE;
-    if (!nm_streq0(iaid, nm_dhcp_lease_lookup_option(lease_old, "iaid")))
-        return FALSE;
-
-    /* If the server sends multiple IPv6 addresses, we receive a state
-     * changed event for each of them. Use the event ID to merge IPv6
-     * addresses from the same transaction into a single configuration.
-     **/
-
-    l3cd_merged = nm_l3_config_data_new_clone(l3cd_old, 0);
-
-    nm_l3_config_data_iter_ip6_address_for_each (&iter, l3cd_new, &addr)
-        nm_l3_config_data_add_address_6(l3cd_merged, addr);
-
-    /* FIXME(l3cfg): Note that we keep the original NMDhcpLease. All we take from the new lease are the
-     * addresses. Maybe this is not right and we should merge the leases too?? */
-    nm_l3_config_data_set_dhcp_lease(l3cd_merged, AF_INET6, lease_old);
-
-    *out_l3cd_merged = nm_l3_config_data_ref_and_seal(g_steal_pointer(&l3cd_merged));
-    return TRUE;
-}
-
 /*****************************************************************************/
 
 void
diff --git a/src/core/dhcp/nm-dhcp-utils.h b/src/core/dhcp/nm-dhcp-utils.h
index 99898524..a2dde94e 100644
--- a/src/core/dhcp/nm-dhcp-utils.h
+++ b/src/core/dhcp/nm-dhcp-utils.h
@@ -33,12 +33,6 @@ gboolean nm_dhcp_utils_get_leasefile_path(int         addr_family,
                                           const char *uuid,
                                           char      **out_leasefile_path);
 
-char *nm_dhcp_utils_get_dhcp6_event_id(GHashTable *lease);
-
-gboolean nm_dhcp_utils_merge_new_dhcp6_lease(const NML3ConfigData  *l3cd_old,
-                                             const NML3ConfigData  *l3cd_new,
-                                             const NML3ConfigData **out_l3cd_merged);
-
 /*****************************************************************************/
 
 static inline gboolean
diff --git a/src/core/dhcp/tests/meson.build b/src/core/dhcp/tests/meson.build
index e43c8cab..8b2a7b76 100644
--- a/src/core/dhcp/tests/meson.build
+++ b/src/core/dhcp/tests/meson.build
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 test_units = [
-  'test-dhcp-dhclient',
   'test-dhcp-utils',
 ]
 
diff --git a/src/core/dhcp/tests/test-dhclient-commented-duid.leases b/src/core/dhcp/tests/test-dhclient-commented-duid.leases
deleted file mode 100644
index 3e46ae7d..00000000
--- a/src/core/dhcp/tests/test-dhclient-commented-duid.leases
+++ /dev/null
@@ -1,2 +0,0 @@
-#default-duid "\000\001\000\001\030y\246\023`g \354Lp";
-
diff --git a/src/core/dhcp/tests/test-dhclient-duid.leases b/src/core/dhcp/tests/test-dhclient-duid.leases
deleted file mode 100644
index 229331d4..00000000
--- a/src/core/dhcp/tests/test-dhclient-duid.leases
+++ /dev/null
@@ -1,2 +0,0 @@
-default-duid "\000\001\000\001\030y\246\023`g \354Lp";
-
diff --git a/src/core/dhcp/tests/test-dhcp-dhclient.c b/src/core/dhcp/tests/test-dhcp-dhclient.c
deleted file mode 100644
index 6a7b7185..00000000
--- a/src/core/dhcp/tests/test-dhcp-dhclient.c
+++ /dev/null
@@ -1,1478 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (C) 2010 Red Hat, Inc.
- */
-
-#include "src/core/nm-default-daemon.h"
-
-#include <unistd.h>
-#include <arpa/inet.h>
-#include <linux/rtnetlink.h>
-
-#include "libnm-glib-aux/nm-dedup-multi.h"
-
-#include "NetworkManagerUtils.h"
-#include "dhcp/nm-dhcp-dhclient-utils.h"
-#include "dhcp/nm-dhcp-utils.h"
-#include "nm-utils.h"
-#include "libnm-platform/nm-platform.h"
-
-#include "nm-test-utils-core.h"
-
-#define TEST_DIR    NM_BUILD_SRCDIR "/src/core/dhcp/tests"
-#define TEST_MUDURL "https://example.com/mud.json"
-
-static void
-test_config(const char         *orig,
-            const char         *expected,
-            int                 addr_family,
-            const char         *hostname,
-            guint32             timeout,
-            gboolean            use_fqdn,
-            NMDhcpHostnameFlags hostname_flags,
-            const char         *dhcp_client_id,
-            GBytes             *expected_new_client_id,
-            const char         *iface,
-            const char         *anycast_addr,
-            const char         *mud_url)
-{
-    gs_free char *new                     = NULL;
-    gs_unref_bytes GBytes *client_id      = NULL;
-    gs_unref_bytes GBytes *new_client_id  = NULL;
-    gboolean               send_client_id = TRUE;
-
-    if (nm_streq0(dhcp_client_id, "none")) {
-        send_client_id = FALSE;
-    } else if (dhcp_client_id) {
-        client_id = nm_dhcp_utils_client_id_string_to_bytes(dhcp_client_id);
-        g_assert(client_id);
-    }
-
-    new = nm_dhcp_dhclient_create_config(iface,
-                                         addr_family,
-                                         client_id,
-                                         send_client_id,
-                                         anycast_addr,
-                                         hostname,
-                                         timeout,
-                                         use_fqdn,
-                                         hostname_flags,
-                                         mud_url,
-                                         NULL,
-                                         "/path/to/dhclient.conf",
-                                         orig,
-                                         &new_client_id);
-    g_assert(new != NULL);
-
-    if (!nm_streq(new, expected)) {
-        g_message("\n* OLD ---------------------------------\n"
-                  "%s"
-                  "\n- NEW -----------------------------------\n"
-                  "%s"
-                  "\n+ EXPECTED ++++++++++++++++++++++++++++++\n"
-                  "%s"
-                  "\n^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n",
-                  orig,
-                  new,
-                  expected);
-    }
-    g_assert_cmpstr(new, ==, expected);
-
-    if (expected_new_client_id) {
-        g_assert(new_client_id);
-        g_assert(g_bytes_equal(new_client_id, expected_new_client_id));
-    } else
-        g_assert(new_client_id == NULL);
-}
-
-/*****************************************************************************/
-
-static const char *orig_missing_expected =
-    "# Created by NetworkManager\n"
-    "\n\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n"
-    "\n";
-
-static void
-test_orig_missing(void)
-{
-    test_config(NULL,
-                orig_missing_expected,
-                AF_INET,
-                NULL,
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                NULL,
-                NULL,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-static const char *orig_missing_add_mud_url_expected =
-    "# Created by NetworkManager\n"
-    "\n"
-    "option mudurl code 161 = text;\n"
-    "send mudurl \"https://example.com/mud.json\";\n\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n"
-    "\n";
-
-static void
-test_orig_missing_add_mud_url(void)
-{
-    test_config(NULL,
-                orig_missing_add_mud_url_expected,
-                AF_INET,
-                NULL,
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                NULL,
-                NULL,
-                "eth0",
-                NULL,
-                TEST_MUDURL);
-}
-
-/*****************************************************************************/
-
-static const char *override_client_id_orig = "send dhcp-client-identifier 00:30:04:20:7A:08;\n";
-
-static const char *override_client_id_expected =
-    "# Created by NetworkManager\n"
-    "# Merged from /path/to/dhclient.conf\n"
-    "\n"
-    "send dhcp-client-identifier 11:22:33:44:55:66; # added by NetworkManager\n"
-    "\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n"
-    "\n";
-
-static void
-test_override_client_id(void)
-{
-    test_config(override_client_id_orig,
-                override_client_id_expected,
-                AF_INET,
-                NULL,
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                "11:22:33:44:55:66",
-                NULL,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-static const char *quote_client_id_expected =
-    "# Created by NetworkManager\n"
-    "\n"
-    "send dhcp-client-identifier \"\\x00abcd\"; # added by NetworkManager\n"
-    "\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n"
-    "\n";
-
-static void
-test_quote_client_id(void)
-{
-    test_config(NULL,
-                quote_client_id_expected,
-                AF_INET,
-                NULL,
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                "abcd",
-                NULL,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-static const char *quote_client_id_expected_2 =
-    "# Created by NetworkManager\n"
-    "\n"
-    "send dhcp-client-identifier 00:61:5c:62:63; # added by NetworkManager\n"
-    "\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n"
-    "\n";
-
-static void
-test_quote_client_id_2(void)
-{
-    test_config(NULL,
-                quote_client_id_expected_2,
-                AF_INET,
-                NULL,
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                "a\\bc",
-                NULL,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-static const char *hex_zero_client_id_expected =
-    "# Created by NetworkManager\n"
-    "\n"
-    "send dhcp-client-identifier 00:11:22:33; # added by NetworkManager\n"
-    "\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n"
-    "\n";
-
-static void
-test_hex_zero_client_id(void)
-{
-    test_config(NULL,
-                hex_zero_client_id_expected,
-                AF_INET,
-                NULL,
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                "00:11:22:33",
-                NULL,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-static const char *ascii_client_id_expected =
-    "# Created by NetworkManager\n"
-    "\n"
-    "send dhcp-client-identifier \"\\x00qb:cd:ef:12:34:56\"; # added by NetworkManager\n"
-    "\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n"
-    "\n";
-
-static void
-test_ascii_client_id(void)
-{
-    test_config(NULL,
-                ascii_client_id_expected,
-                AF_INET,
-                NULL,
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                "qb:cd:ef:12:34:56",
-                NULL,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-static const char *hex_single_client_id_expected =
-    "# Created by NetworkManager\n"
-    "\n"
-    "send dhcp-client-identifier ab:cd:0e:12:34:56; # added by NetworkManager\n"
-    "\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n"
-    "\n";
-
-static void
-test_hex_single_client_id(void)
-{
-    test_config(NULL,
-                hex_single_client_id_expected,
-                AF_INET,
-                NULL,
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                "ab:cd:e:12:34:56",
-                NULL,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-static const char *existing_hex_client_id_orig = "send dhcp-client-identifier 10:30:04:20:7A:08;\n";
-
-static const char *existing_hex_client_id_expected =
-    "# Created by NetworkManager\n"
-    "# Merged from /path/to/dhclient.conf\n"
-    "\n"
-    "send dhcp-client-identifier 10:30:04:20:7A:08;\n"
-    "\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n"
-    "\n";
-
-static void
-test_existing_hex_client_id(void)
-{
-    gs_unref_bytes GBytes *new_client_id = NULL;
-    const guint8           bytes[]       = {0x10, 0x30, 0x04, 0x20, 0x7A, 0x08};
-
-    new_client_id = g_bytes_new(bytes, sizeof(bytes));
-    test_config(existing_hex_client_id_orig,
-                existing_hex_client_id_expected,
-                AF_INET,
-                NULL,
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                NULL,
-                new_client_id,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-static const char *existing_escaped_client_id_orig =
-    "send dhcp-client-identifier \"\\044test\\xfe\";\n";
-
-static const char *existing_escaped_client_id_expected =
-    "# Created by NetworkManager\n"
-    "# Merged from /path/to/dhclient.conf\n"
-    "\n"
-    "send dhcp-client-identifier \"\\044test\\xfe\";\n"
-    "\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n"
-    "\n";
-
-static void
-test_existing_escaped_client_id(void)
-{
-    gs_unref_bytes GBytes *new_client_id = NULL;
-
-    new_client_id = g_bytes_new("$test\xfe", 6);
-    test_config(existing_escaped_client_id_orig,
-                existing_escaped_client_id_expected,
-                AF_INET,
-                NULL,
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                NULL,
-                new_client_id,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-#define EACID "qb:cd:ef:12:34:56"
-
-static const char *existing_ascii_client_id_orig =
-    "send dhcp-client-identifier \"\\x00" EACID "\";\n";
-
-static const char *existing_ascii_client_id_expected =
-    "# Created by NetworkManager\n"
-    "# Merged from /path/to/dhclient.conf\n"
-    "\n"
-    "send dhcp-client-identifier \"\\x00" EACID "\";\n"
-    "\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n"
-    "\n";
-
-static void
-test_existing_ascii_client_id(void)
-{
-    gs_unref_bytes GBytes *new_client_id             = NULL;
-    char                   buf[NM_STRLEN(EACID) + 1] = {0};
-
-    memcpy(buf + 1, EACID, NM_STRLEN(EACID));
-    new_client_id = g_bytes_new(buf, sizeof(buf));
-    test_config(existing_ascii_client_id_orig,
-                existing_ascii_client_id_expected,
-                AF_INET,
-                NULL,
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                NULL,
-                new_client_id,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-static const char *none_client_id_orig = "send dhcp-client-identifier 10:30:04:20:7A:08;\n";
-
-static const char *none_client_id_expected =
-    "# Created by NetworkManager\n"
-    "# Merged from /path/to/dhclient.conf\n"
-    "\n"
-    "send dhcp-client-identifier \"\"; # added by NetworkManager\n"
-    "\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n"
-    "\n";
-
-static void
-test_none_client_id(void)
-{
-    const char            *connection_client_id = "none";
-    gs_unref_bytes GBytes *expected_client_id   = NULL;
-
-    test_config(none_client_id_orig,
-                none_client_id_expected,
-                AF_INET,
-                NULL,
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                connection_client_id,
-                expected_client_id,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-static const char *missing_client_id_orig = "";
-
-static const char *missing_client_id_expected =
-    "# Created by NetworkManager\n"
-    "# Merged from /path/to/dhclient.conf\n"
-    "\n"
-    "\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n"
-    "\n";
-
-static void
-test_missing_client_id(void)
-{
-    const char            *connection_client_id = NULL;
-    gs_unref_bytes GBytes *expected_client_id   = NULL;
-
-    test_config(missing_client_id_orig,
-                missing_client_id_expected,
-                AF_INET,
-                NULL,
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                connection_client_id,
-                expected_client_id,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-static const char *fqdn_expected =
-    "# Created by NetworkManager\n"
-    "\n"
-    "send fqdn.fqdn \"foo.bar.com\"; # added by NetworkManager\n"
-    "send fqdn.encoded on;\n"
-    "send fqdn.server-update off;\n"
-    "send fqdn.no-client-update on;\n"
-    "\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n\n";
-
-static void
-test_fqdn(void)
-{
-    test_config(NULL,
-                fqdn_expected,
-                AF_INET,
-                "foo.bar.com",
-                0,
-                TRUE,
-                NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED | NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE,
-                NULL,
-                NULL,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-static const char *fqdn_options_override_orig =
-    "\n"
-    "send fqdn.fqdn \"foobar.com\"\n" /* NM must ignore this ... */
-    "send fqdn.encoded off;\n"        /* ... and honor these */
-    "send fqdn.server-update off;\n";
-
-static const char *fqdn_options_override_expected =
-    "# Created by NetworkManager\n"
-    "# Merged from /path/to/dhclient.conf\n"
-    "\n"
-    "send fqdn.fqdn \"example2.com\"; # added by NetworkManager\n"
-    "send fqdn.encoded off;\n"
-    "send fqdn.server-update on;\n"
-    "send fqdn.no-client-update off;\n"
-    "\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n"
-    "\n"
-    "# FQDN options from /path/to/dhclient.conf\n"
-    "send fqdn.encoded off;\n"
-    "send fqdn.server-update off;\n\n";
-
-static void
-test_fqdn_options_override(void)
-{
-    test_config(fqdn_options_override_orig,
-                fqdn_options_override_expected,
-                AF_INET,
-                "example2.com",
-                0,
-                NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE,
-                TRUE,
-                NULL,
-                NULL,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-static const char *override_hostname_orig = "send host-name \"foobar\";\n";
-
-static const char *override_hostname_expected =
-    "# Created by NetworkManager\n"
-    "# Merged from /path/to/dhclient.conf\n"
-    "\n"
-    "send host-name \"blahblah\"; # added by NetworkManager\n"
-    "\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n"
-    "\n";
-
-static void
-test_override_hostname(void)
-{
-    test_config(override_hostname_orig,
-                override_hostname_expected,
-                AF_INET,
-                "blahblah",
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                NULL,
-                NULL,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-static const char *override_hostname6_orig = "send fqdn.fqdn \"foobar\";\n";
-
-static const char *override_hostname6_expected =
-    "# Created by NetworkManager\n"
-    "# Merged from /path/to/dhclient.conf\n"
-    "\n"
-    "send fqdn.fqdn \"blahblah.local\"; # added by NetworkManager\n"
-    "send fqdn.server-update on;\n"
-    "\n"
-    "also request dhcp6.name-servers;\n"
-    "also request dhcp6.domain-search;\n"
-    "also request dhcp6.client-id;\n"
-    "\n";
-
-static void
-test_override_hostname6(void)
-{
-    test_config(override_hostname6_orig,
-                override_hostname6_expected,
-                AF_INET6,
-                "blahblah.local",
-                0,
-                TRUE,
-                NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE,
-                NULL,
-                NULL,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-static const char *nonfqdn_hostname6_expected =
-    "# Created by NetworkManager\n"
-    "\n"
-    "send fqdn.fqdn \"blahblah\"; # added by NetworkManager\n"
-    "send fqdn.no-client-update on;\n"
-    "\n"
-    "also request dhcp6.name-servers;\n"
-    "also request dhcp6.domain-search;\n"
-    "also request dhcp6.client-id;\n"
-    "\n";
-
-static void
-test_nonfqdn_hostname6(void)
-{
-    /* Non-FQDN hostname can now be used with dhclient */
-    test_config(NULL,
-                nonfqdn_hostname6_expected,
-                AF_INET6,
-                "blahblah",
-                0,
-                TRUE,
-                NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE,
-                NULL,
-                NULL,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-static const char *existing_alsoreq_orig = "also request something;\n"
-                                           "also request another-thing;\n";
-
-static const char *existing_alsoreq_expected =
-    "# Created by NetworkManager\n"
-    "# Merged from /path/to/dhclient.conf\n"
-    "\n\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "also request something;\n"
-    "also request another-thing;\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n"
-    "\n";
-
-static void
-test_existing_alsoreq(void)
-{
-    test_config(existing_alsoreq_orig,
-                existing_alsoreq_expected,
-                AF_INET,
-                NULL,
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                NULL,
-                NULL,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-static const char *existing_req_orig = "request something;\n"
-                                       "also request some-other-thing;\n"
-                                       "request another-thing;\n"
-                                       "also request yet-another-thing;\n";
-
-static const char *existing_req_expected =
-    "# Created by NetworkManager\n"
-    "# Merged from /path/to/dhclient.conf\n"
-    "\n\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "request; # override dhclient defaults\n"
-    "also request another-thing;\n"
-    "also request yet-another-thing;\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n"
-    "\n";
-
-static void
-test_existing_req(void)
-{
-    test_config(existing_req_orig,
-                existing_req_expected,
-                AF_INET,
-                NULL,
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                NULL,
-                NULL,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-static const char *existing_multiline_alsoreq_orig =
-    "also request something another-thing yet-another-thing\n"
-    "    foobar baz blah;\n";
-
-static const char *existing_multiline_alsoreq_expected =
-    "# Created by NetworkManager\n"
-    "# Merged from /path/to/dhclient.conf\n"
-    "\n\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "also request something;\n"
-    "also request another-thing;\n"
-    "also request yet-another-thing;\n"
-    "also request foobar;\n"
-    "also request baz;\n"
-    "also request blah;\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n"
-    "\n";
-
-static void
-test_existing_multiline_alsoreq(void)
-{
-    test_config(existing_multiline_alsoreq_orig,
-                existing_multiline_alsoreq_expected,
-                AF_INET,
-                NULL,
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                NULL,
-                NULL,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-static void
-test_one_duid(const char *escaped, const guint8 *unescaped, guint len)
-{
-    gs_unref_bytes GBytes *t1 = NULL;
-    gs_unref_bytes GBytes *t2 = NULL;
-    gs_free char          *w  = NULL;
-
-    t1 = nm_dhcp_dhclient_unescape_duid(escaped);
-    g_assert(t1);
-    g_assert(nm_g_bytes_equal_mem(t1, unescaped, len));
-
-    t2 = g_bytes_new(unescaped, len);
-    w  = nm_dhcp_dhclient_escape_duid(t2);
-    g_assert(w);
-    g_assert_cmpstr(escaped, ==, w);
-}
-
-static void
-test_duids(void)
-{
-    const guint8 test1_u[] =
-        {0x00, 0x01, 0x00, 0x01, 0x13, 0x6f, 0x13, 0x6e, 0x00, 0x22, 0xfa, 0x8c, 0xd6, 0xc2};
-    const char *test1_s = "\\000\\001\\000\\001\\023o\\023n\\000\\\"\\372\\214\\326\\302";
-
-    const guint8 test2_u[] =
-        {0x00, 0x01, 0x00, 0x01, 0x17, 0x57, 0xee, 0x39, 0x00, 0x23, 0x15, 0x08, 0x7E, 0xac};
-    const char *test2_s = "\\000\\001\\000\\001\\027W\\3569\\000#\\025\\010~\\254";
-
-    const guint8 test3_u[] =
-        {0x00, 0x01, 0x00, 0x01, 0x17, 0x58, 0xe8, 0x58, 0x00, 0x23, 0x15, 0x08, 0x7e, 0xac};
-    const char *test3_s = "\\000\\001\\000\\001\\027X\\350X\\000#\\025\\010~\\254";
-
-    const guint8 test4_u[] =
-        {0x00, 0x01, 0x00, 0x01, 0x15, 0xd5, 0x31, 0x97, 0x00, 0x16, 0xeb, 0x04, 0x45, 0x18};
-    const char *test4_s = "\\000\\001\\000\\001\\025\\3251\\227\\000\\026\\353\\004E\\030";
-
-    const char *bad_s = "\\000\\001\\000\\001\\425\\3251\\227\\000\\026\\353\\004E\\030";
-
-    test_one_duid(test1_s, test1_u, sizeof(test1_u));
-    test_one_duid(test2_s, test2_u, sizeof(test2_u));
-    test_one_duid(test3_s, test3_u, sizeof(test3_u));
-    test_one_duid(test4_s, test4_u, sizeof(test4_u));
-
-    /* Invalid octal digit */
-    g_assert(nm_dhcp_dhclient_unescape_duid(bad_s) == NULL);
-}
-
-static void
-test_read_duid_from_leasefile(void)
-{
-    const guint8 expected[] =
-        {0x00, 0x01, 0x00, 0x01, 0x18, 0x79, 0xa6, 0x13, 0x60, 0x67, 0x20, 0xec, 0x4c, 0x70};
-    gs_unref_bytes GBytes *duid  = NULL;
-    GError                *error = NULL;
-
-    duid = nm_dhcp_dhclient_read_duid(TEST_DIR "/test-dhclient-duid.leases", &error);
-    nmtst_assert_success(duid, error);
-
-    g_assert(nm_g_bytes_equal_mem(duid, expected, G_N_ELEMENTS(expected)));
-}
-
-static void
-test_read_commented_duid_from_leasefile(void)
-{
-    GBytes *duid;
-    GError *error = NULL;
-
-    duid = nm_dhcp_dhclient_read_duid(TEST_DIR "/test-dhclient-commented-duid.leases", &error);
-    g_assert_no_error(error);
-    g_assert(duid == NULL);
-}
-
-/*****************************************************************************/
-
-static void
-_check_duid_impl(const guint8 *duid_bin,
-                 gsize         duid_len,
-                 gboolean      enforce_duid,
-                 const char   *old_content,
-                 const char   *new_content)
-{
-    gs_free_error GError  *error    = NULL;
-    gs_free char          *contents = NULL;
-    gboolean               success;
-    const char            *path = NM_BUILD_BUILDDIR "/src/core/dhcp/tests/check-duid.lease";
-    gs_unref_bytes GBytes *duid = NULL;
-    gsize                  contents_len;
-
-    g_assert(duid_bin);
-    g_assert(duid_len > 0);
-
-    if (!nm_str_is_empty(old_content) || nmtst_get_rand_bool()) {
-        success = g_file_set_contents(path, old_content ?: "", -1, &error);
-        nmtst_assert_success(success, error);
-    } else
-        nmtst_file_unlink_if_exists(path);
-
-    duid = g_bytes_new(duid_bin, duid_len);
-
-    success = nm_dhcp_dhclient_save_duid(path, duid, enforce_duid, &error);
-    nmtst_assert_success(success, error);
-
-    success = g_file_get_contents(path, &contents, &contents_len, &error);
-    nmtst_assert_success(success, error);
-    g_assert(contents);
-
-    nmtst_file_unlink(path);
-
-    if (!nm_streq0(new_content, contents))
-        g_error("FAILING:\n\nEXPECTED:\n%s\nACTUAL:\n%s\n\n", new_content, contents);
-
-    g_assert_cmpstr(new_content, ==, contents);
-    g_assert_cmpint(contents_len, ==, strlen(contents));
-}
-
-#define _DUID(...) ((const guint8[]) {__VA_ARGS__})
-
-#define _check_duid(duid, enforce_duid, old_content, new_content) \
-    _check_duid_impl((duid), sizeof(duid), (enforce_duid), (old_content), (new_content))
-
-static void
-test_write_duid(void)
-{
-    _check_duid(_DUID(000, 001, 000, 001, 027, 'X', 0350, 'X', 0, '#', 025, 010, '~', 0254),
-                FALSE,
-                NULL,
-                "default-duid \"\\000\\001\\000\\001\\027X\\350X\\000#\\025\\010~\\254\";\n");
-
-    _check_duid(
-        _DUID(000, 001, 000, 001, 023, 'o', 023, 'n', 000, '"', 0372, 0214, 0326, 0302),
-        FALSE,
-        "default-duid \"\\000\\001\\000\\001\\027X\\350X\\000#\\025\\010~\\254\";\n",
-        "default-duid \"\\000\\001\\000\\001\\023o\\023n\\000\\\"\\372\\214\\326\\302\";\n");
-
-    _check_duid(_DUID(000, 001, 000, 001, 023, 'o', 023, 'n', 000, '"', 0372, 0214, 0326, 0302),
-                FALSE,
-                "#default-duid \"\\000\\001\\000\\001\\027X\\350X\\000#\\025\\010~\\254\";\n",
-                "default-duid "
-                "\"\\000\\001\\000\\001\\023o\\023n\\000\\\"\\372\\214\\326\\302\";\n#default-duid "
-                "\"\\000\\001\\000\\001\\027X\\350X\\000#\\025\\010~\\254\";\n");
-    _check_duid(
-        _DUID(000, 001, 000, 001, 023, 'o', 023, 'n', 000, '"', 0372, 0214, 0326, 0302),
-        FALSE,
-        "### Commented old DUID ###\n#default-duid "
-        "\"\\000\\001\\000\\001\\027X\\350X\\000#\\025\\010~\\254\";\n",
-        "default-duid \"\\000\\001\\000\\001\\023o\\023n\\000\\\"\\372\\214\\326\\302\";\n### "
-        "Commented old DUID ###\n#default-duid "
-        "\"\\000\\001\\000\\001\\027X\\350X\\000#\\025\\010~\\254\";\n");
-
-    _check_duid(
-        _DUID(0xaa, 0xb, 0xcc, 0xd, 0xee, 0xf),
-        FALSE,
-        "default-duid \"\\252\\013\\314\\015\\356\\017\";\nlease6 {\n  interface \"eth1\";\n "
-        " ia-na f1:ce:00:01 {\n    starts 1671015678;\n    renew 60;\n    rebind 105;\n    "
-        "iaaddr 192:168:121::1:112c {\n      starts 1671015678;\n      preferred-life 120;\n "
-        "     max-life 120;\n    }\n  }\n  option fqdn.encoded true;\n  option "
-        "fqdn.server-update true;\n  option fqdn.no-client-update false;\n  option fqdn.fqdn "
-        "\"dff6de4fcb0f\";\n  option fqdn.hostname \"dff6de4fcb0f\";\n  option dhcp6.client-id "
-        "aa:b:cc:d:ee:f;\n  option dhcp6.server-id 0:1:0:1:2b:2c:4d:1d:0:0:0:0:0:0;\n  option "
-        "dhcp6.name-servers 192:168:121:0:ce0f:f1ff:fece:1;\n  option dhcp6.fqdn "
-        "1:c:64:66:66:36:64:65:34:66:63:62:30:66;\n  option dhcp6.status-code success "
-        "\"success\";\n}\n",
-        "default-duid \"\\252\\013\\314\\015\\356\\017\";\nlease6 {\n  interface \"eth1\";\n "
-        " ia-na f1:ce:00:01 {\n    starts 1671015678;\n    renew 60;\n    rebind 105;\n    "
-        "iaaddr 192:168:121::1:112c {\n      starts 1671015678;\n      preferred-life 120;\n "
-        "     max-life 120;\n    }\n  }\n  option fqdn.encoded true;\n  option "
-        "fqdn.server-update true;\n  option fqdn.no-client-update false;\n  option fqdn.fqdn "
-        "\"dff6de4fcb0f\";\n  option fqdn.hostname \"dff6de4fcb0f\";\n  option dhcp6.client-id "
-        "aa:b:cc:d:ee:f;\n  option dhcp6.server-id 0:1:0:1:2b:2c:4d:1d:0:0:0:0:0:0;\n  option "
-        "dhcp6.name-servers 192:168:121:0:ce0f:f1ff:fece:1;\n  option dhcp6.fqdn "
-        "1:c:64:66:66:36:64:65:34:66:63:62:30:66;\n  option dhcp6.status-code success "
-        "\"success\";\n}\n");
-
-    _check_duid(
-        _DUID(0xaa, 0xb, 0xcc, 0xd, 0xee, 0xf),
-        FALSE,
-        "default-duid \"\\252\\013\\314\\015\\356\\017\";\nlease6 {\n  interface \"eth1\";\n "
-        " ia-na f1:ce:00:01 {\n    starts 1671015678;\n    renew 60;\n    rebind 105;\n    "
-        "iaaddr 192:168:121::1:112c {\n      starts 1671015678;\n      preferred-life 120;\n "
-        "     max-life 120;\n    }\n  }\n  option fqdn.encoded true;\n  option "
-        "fqdn.server-update true;\n  option fqdn.no-client-update false;\n  option fqdn.fqdn "
-        "\"dff6de4fcb0f\";\n  option fqdn.hostname \"dff6de4fcb0f\";\n  option dhcp6.client-id "
-        "aa:b:cc:d:ee:f;\n  option dhcp6.server-id 0:1:0:1:2b:2c:4d:1d:0:0:0:0:0:0;\n  option "
-        "dhcp6.name-servers 192:168:121:0:ce0f:f1ff:fece:1;\n  option dhcp6.fqdn "
-        "1:c:64:66:66:36:64:65:34:66:63:62:30:66;\n  option dhcp6.status-code success "
-        "\"success\";\r\n}\n",
-        "default-duid \"\\252\\013\\314\\015\\356\\017\";\nlease6 {\n  interface \"eth1\";\n "
-        " ia-na f1:ce:00:01 {\n    starts 1671015678;\n    renew 60;\n    rebind 105;\n    "
-        "iaaddr 192:168:121::1:112c {\n      starts 1671015678;\n      preferred-life 120;\n "
-        "     max-life 120;\n    }\n  }\n  option fqdn.encoded true;\n  option "
-        "fqdn.server-update true;\n  option fqdn.no-client-update false;\n  option fqdn.fqdn "
-        "\"dff6de4fcb0f\";\n  option fqdn.hostname \"dff6de4fcb0f\";\n  option dhcp6.client-id "
-        "aa:b:cc:d:ee:f;\n  option dhcp6.server-id 0:1:0:1:2b:2c:4d:1d:0:0:0:0:0:0;\n  option "
-        "dhcp6.name-servers 192:168:121:0:ce0f:f1ff:fece:1;\n  option dhcp6.fqdn "
-        "1:c:64:66:66:36:64:65:34:66:63:62:30:66;\n  option dhcp6.status-code success "
-        "\"success\";\r\n}\n");
-
-    _check_duid(
-        _DUID(0xaa, 0xb, 0xcc, 0xd, 0xee, 0xe),
-        FALSE,
-        "default-duid \"\\252\\013\\314\\015\\356\\017\";\nlease6 {\n  interface \"eth1\";\n "
-        " ia-na f1:ce:00:01 {\n    starts 1671015678;\n    renew 60;\n    rebind 105;\n    "
-        "iaaddr 192:168:121::1:112c {\n      starts 1671015678;\n      preferred-life 120;\n "
-        "     max-life 120;\n    }\n  }\n  option fqdn.encoded true;\n  option "
-        "fqdn.server-update true;\n  option fqdn.no-client-update false;\n  option fqdn.fqdn "
-        "\"dff6de4fcb0f\";\n  option fqdn.hostname \"dff6de4fcb0f\";\n  option dhcp6.client-id "
-        "aa:b:cc:d:ee:f;\n  option dhcp6.server-id 0:1:0:1:2b:2c:4d:1d:0:0:0:0:0:0;\n  option "
-        "dhcp6.name-servers 192:168:121:0:ce0f:f1ff:fece:1;\n  option dhcp6.fqdn "
-        "1:c:64:66:66:36:64:65:34:66:63:62:30:66;\n  option dhcp6.status-code success "
-        "\"success\";\r\n}\n",
-        "default-duid \"\\252\\013\\314\\015\\356\\016\";\nlease6 {\n  interface \"eth1\";\n "
-        " ia-na f1:ce:00:01 {\n    starts 1671015678;\n    renew 60;\n    rebind 105;\n    "
-        "iaaddr 192:168:121::1:112c {\n      starts 1671015678;\n      preferred-life 120;\n "
-        "     max-life 120;\n    }\n  }\n  option fqdn.encoded true;\n  option "
-        "fqdn.server-update true;\n  option fqdn.no-client-update false;\n  option fqdn.fqdn "
-        "\"dff6de4fcb0f\";\n  option fqdn.hostname \"dff6de4fcb0f\";\n  option dhcp6.client-id "
-        "aa:b:cc:d:ee:f;\n  option dhcp6.server-id 0:1:0:1:2b:2c:4d:1d:0:0:0:0:0:0;\n  option "
-        "dhcp6.name-servers 192:168:121:0:ce0f:f1ff:fece:1;\n  option dhcp6.fqdn "
-        "1:c:64:66:66:36:64:65:34:66:63:62:30:66;\n  option dhcp6.status-code success "
-        "\"success\";\r\n}\n");
-
-    _check_duid(
-        _DUID(0xaa, 0xb, 0xcc, 0xd, 0xee, 0xe),
-        TRUE,
-        "default-duid \"\\252\\013\\314\\015\\356\\017\";\nlease6 {\n  interface \"eth1\";\n "
-        " ia-na f1:ce:00:01 {\n    starts 1671015678;\n    renew 60;\n    rebind 105;\n    "
-        "iaaddr 192:168:121::1:112c {\n      starts 1671015678;\n      preferred-life 120;\n "
-        "     max-life 120;\n    }\n  }\n  option fqdn.encoded true;\n  option "
-        "fqdn.server-update true;\n  option fqdn.no-client-update false;\n  option fqdn.fqdn "
-        "\"dff6de4fcb0f\";\n  option fqdn.hostname \"dff6de4fcb0f\";\n  option dhcp6.client-id "
-        "aa:b:cc:d:ee:f;\n  option dhcp6.server-id 0:1:0:1:2b:2c:4d:1d:0:0:0:0:0:0;\n  option "
-        "dhcp6.name-servers 192:168:121:0:ce0f:f1ff:fece:1;\n  option dhcp6.fqdn "
-        "1:c:64:66:66:36:64:65:34:66:63:62:30:66;\n  option dhcp6.status-code success "
-        "\"success\";\n}\n",
-        "default-duid \"\\252\\013\\314\\015\\356\\016\";\nlease6 {\n  interface \"eth1\";\n "
-        " ia-na f1:ce:00:01 {\n    starts 1671015678;\n    renew 60;\n    rebind 105;\n    "
-        "iaaddr 192:168:121::1:112c {\n      starts 1671015678;\n      preferred-life 120;\n "
-        "     max-life 120;\n    }\n  }\n  option fqdn.encoded true;\n  option "
-        "fqdn.server-update true;\n  option fqdn.no-client-update false;\n  option fqdn.fqdn "
-        "\"dff6de4fcb0f\";\n  option fqdn.hostname \"dff6de4fcb0f\";\n  option dhcp6.client-id "
-        "aa:b:cc:d:ee:e;\n  option dhcp6.server-id 0:1:0:1:2b:2c:4d:1d:0:0:0:0:0:0;\n  option "
-        "dhcp6.name-servers 192:168:121:0:ce0f:f1ff:fece:1;\n  option dhcp6.fqdn "
-        "1:c:64:66:66:36:64:65:34:66:63:62:30:66;\n  option dhcp6.status-code success "
-        "\"success\";\n}\n");
-}
-
-/*****************************************************************************/
-
-static const char *interface1_orig = "interface \"eth0\" {\n"
-                                     "\talso request my-option;\n"
-                                     "\tinitial-delay 5;\n"
-                                     "}\n"
-                                     "interface \"eth1\" {\n"
-                                     "\talso request another-option;\n"
-                                     "\tinitial-delay 0;\n"
-                                     "}\n"
-                                     "\n"
-                                     "also request yet-another-option;\n";
-
-static const char *interface1_expected =
-    "# Created by NetworkManager\n"
-    "# Merged from /path/to/dhclient.conf\n"
-    "\n"
-    "initial-delay 5;\n"
-    "\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "also request my-option;\n"
-    "also request yet-another-option;\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n"
-    "\n";
-
-static void
-test_interface1(void)
-{
-    test_config(interface1_orig,
-                interface1_expected,
-                AF_INET,
-                NULL,
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                NULL,
-                NULL,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-static const char *interface2_orig = "interface eth0 {\n"
-                                     "\talso request my-option;\n"
-                                     "\tinitial-delay 5;\n"
-                                     " }\n"
-                                     "interface eth1 {\n"
-                                     "\tinitial-delay 0;\n"
-                                     "\trequest another-option;\n"
-                                     " } \n"
-                                     "\n"
-                                     "also request yet-another-option;\n";
-
-static const char *interface2_expected =
-    "# Created by NetworkManager\n"
-    "# Merged from /path/to/dhclient.conf\n"
-    "\n"
-    "initial-delay 0;\n"
-    "\n"
-    "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-    "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-    "option wpad code 252 = string;\n"
-    "\n"
-    "request; # override dhclient defaults\n"
-    "also request another-option;\n"
-    "also request yet-another-option;\n"
-    "also request rfc3442-classless-static-routes;\n"
-    "also request ms-classless-static-routes;\n"
-    "also request static-routes;\n"
-    "also request wpad;\n"
-    "also request ntp-servers;\n"
-    "also request root-path;\n"
-    "\n";
-
-static void
-test_interface2(void)
-{
-    test_config(interface2_orig,
-                interface2_expected,
-                AF_INET,
-                NULL,
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                NULL,
-                NULL,
-                "eth1",
-                NULL,
-                NULL);
-}
-
-static void
-test_structured(void)
-{
-    gs_unref_bytes GBytes *new_client_id = NULL;
-    const guint8           bytes[]       = "sad-and-useless";
-
-    static const char *const orig =
-        "interface \"eth0\"   {  \n"
-        "    send host-name \"useless.example.com\";\n"
-        "    hardware ethernet de:ad:80:86:ba:be;\n"
-        "    send dhcp-client-identifier \"sad-and-useless\";\n"
-        "    script \"/bin/useless\";\n"
-        "    send dhcp-lease-time 8086;\n"
-        "    request subnet-mask, broadcast-address, time-offset, routers,\n"
-        "        domain-search, domain-name, host-name;\n"
-        "    require subnet-mask;\n"
-        "}  \n"
-        "\n"
-        "    interface \"eth1\"   {  \n"
-        "    send host-name \"sad.example.com\";\n"
-        "    hardware ethernet de:ca:f6:66:ca:fe;\n"
-        "    send dhcp-client-identifier \"useless-and-miserable\";\n"
-        "    script \"/bin/miserable\";\n"
-        "    send dhcp-lease-time 1337;\n"
-        "    request subnet-mask, broadcast-address, time-offset, routers,\n"
-        "        domain-search, domain-name, domain-name-servers, host-name;\n"
-        "    require subnet-mask, domain-name-servers;\n"
-        "    if not option domain-name = \"example.org\" {\n"
-        "        prepend domain-name-servers 127.0.0.1;\n"
-        "    } else {\n"
-        "        prepend domain-name-servers 127.0.0.2;\n"
-        "    }  \n"
-        "    }  \n"
-        "\n"
-        "pseudo \"secondary\" \"eth0\"   {  \n"
-        "    send dhcp-client-identifier \"sad-useless-and-secondary\";\n"
-        "    script \"/bin/secondary\";\n"
-        "    send host-name \"secondary.useless.example.com\";\n"
-        "    send dhcp-lease-time 666;\n"
-        "    request routers;\n"
-        "    require routers;\n"
-        "    }  \n"
-        "\n"
-        "    pseudo \"tertiary\" \"eth0\"   {  \n"
-        "   send dhcp-client-identifier \"sad-useless-and-tertiary\";\n"
-        "  script \"/bin/tertiary\";\n"
-        " send host-name \"tertiary.useless.example.com\";\n"
-        "}  \n"
-        "\n"
-        "  alias{  \n"
-        "    interface \"eth0\";\n"
-        "    fixed-address 192.0.2.1;\n"
-        "    option subnet-mask 255.255.255.0;\n"
-        "  }  \n"
-        "  lease   {  \n"
-        "    interface \"eth0\";\n"
-        "    fixed-address 192.0.2.2;\n"
-        "    option subnet-mask 255.255.255.0;\n"
-        "  }  \n"
-        "if not option domain-name = \"example.org\" {\n"
-        "  prepend domain-name-servers 127.0.0.1;\n"
-        "  if not option domain-name = \"useless.example.com\" {\n"
-        "    prepend domain-name-servers 127.0.0.2;\n"
-        "  }\n"
-        "}\n";
-
-    static const char *const expected =
-        "# Created by NetworkManager\n"
-        "# Merged from /path/to/dhclient.conf\n"
-        "\n"
-        "send host-name \"useless.example.com\";\n"
-        "hardware ethernet de:ad:80:86:ba:be;\n"
-        "send dhcp-client-identifier \"sad-and-useless\";\n"
-        "send dhcp-lease-time 8086;\n"
-        "require subnet-mask;\n"
-        "if not option domain-name = \"example.org\" {\n"
-        "prepend domain-name-servers 127.0.0.1;\n"
-        "if not option domain-name = \"useless.example.com\" {\n"
-        "prepend domain-name-servers 127.0.0.2;\n"
-        "}\n"
-        "}\n"
-        "\n"
-        "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-        "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-        "option wpad code 252 = string;\n"
-        "\n"
-        "request; # override dhclient defaults\n"
-        "also request subnet-mask;\n"
-        "also request broadcast-address;\n"
-        "also request time-offset;\n"
-        "also request routers;\n"
-        "also request domain-search;\n"
-        "also request domain-name;\n"
-        "also request host-name;\n"
-        "also request rfc3442-classless-static-routes;\n"
-        "also request ms-classless-static-routes;\n"
-        "also request static-routes;\n"
-        "also request wpad;\n"
-        "also request ntp-servers;\n"
-        "also request root-path;\n"
-        "\n";
-
-    new_client_id = g_bytes_new(bytes, sizeof(bytes) - 1);
-    test_config(orig,
-                expected,
-                AF_INET,
-                NULL,
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                NULL,
-                new_client_id,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-static void
-test_config_req_intf(void)
-{
-    static const char *const orig = "request subnet-mask, broadcast-address, routers,\n"
-                                    "\trfc3442-classless-static-routes,\n"
-                                    "\tinterface-mtu, host-name, domain-name, domain-search,\n"
-                                    "\tdomain-name-servers, nis-domain, nis-servers,\n"
-                                    "\tnds-context, nds-servers, nds-tree-name,\n"
-                                    "\tnetbios-name-servers, netbios-dd-server,\n"
-                                    "\tnetbios-node-type, netbios-scope, ntp-servers;\n"
-                                    "";
-    static const char *const expected =
-        "# Created by NetworkManager\n"
-        "# Merged from /path/to/dhclient.conf\n"
-        "\n"
-        "\n"
-        "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-        "option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-        "option wpad code 252 = string;\n"
-        "\n"
-        "request; # override dhclient defaults\n"
-        "also request subnet-mask;\n"
-        "also request broadcast-address;\n"
-        "also request routers;\n"
-        "also request rfc3442-classless-static-routes;\n"
-        "also request interface-mtu;\n"
-        "also request host-name;\n"
-        "also request domain-name;\n"
-        "also request domain-search;\n"
-        "also request domain-name-servers;\n"
-        "also request nis-domain;\n"
-        "also request nis-servers;\n"
-        "also request nds-context;\n"
-        "also request nds-servers;\n"
-        "also request nds-tree-name;\n"
-        "also request netbios-name-servers;\n"
-        "also request netbios-dd-server;\n"
-        "also request netbios-node-type;\n"
-        "also request netbios-scope;\n"
-        "also request ntp-servers;\n"
-        "also request ms-classless-static-routes;\n"
-        "also request static-routes;\n"
-        "also request wpad;\n"
-        "also request root-path;\n"
-        "\n";
-
-    test_config(orig,
-                expected,
-                AF_INET,
-                NULL,
-                0,
-                FALSE,
-                NM_DHCP_HOSTNAME_FLAG_NONE,
-                NULL,
-                NULL,
-                "eth0",
-                NULL,
-                NULL);
-}
-
-/*****************************************************************************/
-
-NMTST_DEFINE();
-
-int
-main(int argc, char **argv)
-{
-    nmtst_init_with_logging(&argc, &argv, NULL, "DEFAULT");
-
-    g_test_add_func("/dhcp/dhclient/orig_missing", test_orig_missing);
-    g_test_add_func("/dhcp/dhclient/orig_missing_add_mud_url", test_orig_missing_add_mud_url);
-    g_test_add_func("/dhcp/dhclient/override_client_id", test_override_client_id);
-    g_test_add_func("/dhcp/dhclient/quote_client_id/1", test_quote_client_id);
-    g_test_add_func("/dhcp/dhclient/quote_client_id/2", test_quote_client_id_2);
-    g_test_add_func("/dhcp/dhclient/hex_zero_client_id", test_hex_zero_client_id);
-    g_test_add_func("/dhcp/dhclient/ascii_client_id", test_ascii_client_id);
-    g_test_add_func("/dhcp/dhclient/hex_single_client_id", test_hex_single_client_id);
-    g_test_add_func("/dhcp/dhclient/existing-hex-client-id", test_existing_hex_client_id);
-    g_test_add_func("/dhcp/dhclient/existing-client-id", test_existing_escaped_client_id);
-    g_test_add_func("/dhcp/dhclient/existing-ascii-client-id", test_existing_ascii_client_id);
-    g_test_add_func("/dhcp/dhclient/none-client-id", test_none_client_id);
-    g_test_add_func("/dhcp/dhclient/missing-client-id", test_missing_client_id);
-    g_test_add_func("/dhcp/dhclient/fqdn", test_fqdn);
-    g_test_add_func("/dhcp/dhclient/fqdn_options_override", test_fqdn_options_override);
-    g_test_add_func("/dhcp/dhclient/override_hostname", test_override_hostname);
-    g_test_add_func("/dhcp/dhclient/override_hostname6", test_override_hostname6);
-    g_test_add_func("/dhcp/dhclient/nonfqdn_hostname6", test_nonfqdn_hostname6);
-    g_test_add_func("/dhcp/dhclient/existing_req", test_existing_req);
-    g_test_add_func("/dhcp/dhclient/existing_alsoreq", test_existing_alsoreq);
-    g_test_add_func("/dhcp/dhclient/existing_multiline_alsoreq", test_existing_multiline_alsoreq);
-    g_test_add_func("/dhcp/dhclient/duids", test_duids);
-    g_test_add_func("/dhcp/dhclient/interface/1", test_interface1);
-    g_test_add_func("/dhcp/dhclient/interface/2", test_interface2);
-    g_test_add_func("/dhcp/dhclient/config/req_intf", test_config_req_intf);
-    g_test_add_func("/dhcp/dhclient/structured", test_structured);
-
-    g_test_add_func("/dhcp/dhclient/read_duid_from_leasefile", test_read_duid_from_leasefile);
-    g_test_add_func("/dhcp/dhclient/read_commented_duid_from_leasefile",
-                    test_read_commented_duid_from_leasefile);
-
-    g_test_add_func("/dhcp/dhclient/test_write_duid", test_write_duid);
-
-    return g_test_run();
-}
diff --git a/src/core/dns/nm-dns-manager.c b/src/core/dns/nm-dns-manager.c
index ec33c464..f1a19d01 100644
--- a/src/core/dns/nm-dns-manager.c
+++ b/src/core/dns/nm-dns-manager.c
@@ -371,7 +371,7 @@ _ASSERT_dns_config_ip_data(const NMDnsConfigIPData *ip_data)
         gboolean has_default = FALSE;
         gsize    i;
 
-        for (i = 0; ip_data->domains.search && ip_data->domains.search; i++) {
+        for (i = 0; ip_data->domains.search && ip_data->domains.search[i]; i++) {
             const char *d = ip_data->domains.search[i];
 
             d = nm_utils_parse_dns_domain(d, NULL);
diff --git a/src/core/main.c b/src/core/main.c
index 8d519c00..7299a91c 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -298,12 +298,6 @@ main(int argc, char *argv[])
 
     _nm_utils_is_manager_process = TRUE;
 
-    /* Known to cause a possible deadlock upon GDBus initialization:
-     * https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
-    g_type_ensure(G_TYPE_SOCKET);
-    g_type_ensure(G_TYPE_DBUS_CONNECTION);
-    g_type_ensure(NM_TYPE_DBUS_MANAGER);
-
     /* we determine a first-start (contrary to a restart during the same boot)
      * based on the existence of NM_CONFIG_DEVICE_STATE_DIR directory. */
     config_cli = nm_config_cmd_line_options_new(
@@ -328,6 +322,12 @@ main(int argc, char *argv[])
         exit(result);
     }
 
+    /* Known to cause a possible deadlock upon GDBus initialization:
+     * https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
+    g_type_ensure(G_TYPE_SOCKET);
+    g_type_ensure(G_TYPE_DBUS_CONNECTION);
+    g_type_ensure(NM_TYPE_DBUS_MANAGER);
+
     nm_main_utils_ensure_not_running_pidfile(global_opt.pidfile);
 
     nm_main_utils_ensure_statedir();
@@ -461,14 +461,8 @@ main(int argc, char *argv[])
     /* the first access to State causes the file to be read (and possibly print a warning) */
     nm_config_state_get(config);
 
-    nm_log_dbg(LOGD_CORE,
-               "WEXT support is %s",
-#if HAVE_WEXT
-               "enabled"
-#else
-               "disabled"
-#endif
-    );
+    nm_log_dbg(LOGD_CORE, "WEXT support is %s", HAVE_WEXT ? "enabled" : "disabled");
+    nm_log_dbg(LOGD_CORE, "CLAT support is %s", HAVE_CLAT ? "enabled" : "disabled");
 
     if (!_dbus_manager_init(config))
         goto done_no_manager;
diff --git a/src/core/meson.build b/src/core/meson.build
index b1d7f2e7..8ff3d9f9 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -32,6 +32,15 @@ install_data(
 
 core_plugins = []
 
+subdir('bpf')
+
+base_sources_addon = []
+base_deps_addon = []
+if enable_clat
+  base_sources_addon += [clat_skel_h]
+  base_deps_addon += [libbpf]
+endif
+
 libNetworkManagerBase = static_library(
   'NetworkManagerBase',
   sources: files(
@@ -55,20 +64,20 @@ libNetworkManagerBase = static_library(
     'nm-l3cfg.c',
     'nm-bond-manager.c',
     'nm-ip-config.c',
-  ),
+  ) + base_sources_addon,
   dependencies: [
     core_default_dep,
     libnm_core_public_dep,
+    libndp_dep,
     libsystemd_dep,
     libudev_dep,
-  ],
+  ] + base_deps_addon,
 )
 
 nm_deps = [
   libnm_core_public_dep,
   core_default_dep,
   dl_dep,
-  libndp_dep,
   libudev_dep,
   logind_dep,
 ]
@@ -119,8 +128,6 @@ libNetworkManager = static_library(
     'devices/nm-device-wireguard.c',
     'devices/nm-device-wpan.c',
     'devices/nm-lldp-listener.c',
-    'dhcp/nm-dhcp-dhclient.c',
-    'dhcp/nm-dhcp-dhclient-utils.c',
     'dhcp/nm-dhcp-dhcpcd.c',
     'dhcp/nm-dhcp-listener.c',
     'dns/nm-dns-dnsmasq.c',
diff --git a/src/core/ndisc/nm-lndp-ndisc.c b/src/core/ndisc/nm-lndp-ndisc.c
index c19dcc91..69213da6 100644
--- a/src/core/ndisc/nm-lndp-ndisc.c
+++ b/src/core/ndisc/nm-lndp-ndisc.c
@@ -401,6 +401,30 @@ receive_ra(struct ndp *ndp, struct ndp_msg *msg, gpointer user_data)
         }
     }
 
+#if HAVE_CLAT
+    /* PREF64 */
+    ndp_msg_opt_for_each_offset (offset, msg, NDP_MSG_OPT_PREF64) {
+        NMNDiscPref64 pref64;
+
+        pref64 = (NMNDiscPref64) {
+            .prefix             = *ndp_msg_opt_pref64_prefix(msg, offset),
+            .plen               = ndp_msg_opt_pref64_prefix_length(msg, offset),
+            .gateway            = gateway.address,
+            .gateway_preference = gateway.preference,
+            .expiry_msec =
+                _nm_ndisc_lifetime_to_expiry(now_msec, ndp_msg_opt_pref64_lifetime(msg, offset)),
+            .gateway_expiry_msec = gateway.expiry_msec,
+        };
+
+        /* libndp should only return lengths defined in RFC 8781 */
+        nm_assert(NM_IN_SET(pref64.plen, 96, 64, 56, 48, 40, 32));
+
+        if (nm_ndisc_add_pref64(ndisc, &pref64, now_msec)) {
+            changed |= NM_NDISC_CONFIG_PREF64;
+        }
+    }
+#endif
+
     nm_ndisc_ra_received(ndisc, now_msec, changed);
     return 0;
 }
@@ -463,7 +487,8 @@ send_ra(NMNDisc *ndisc, GError **error)
     struct in6_addr         *addr;
     struct ndp_msg          *msg;
     guint                    i;
-    nm_auto_str_buf NMStrBuf sbuf = NM_STR_BUF_INIT(0, FALSE);
+    nm_auto_str_buf NMStrBuf sbuf     = NM_STR_BUF_INIT(0, FALSE);
+    gint64                   now_msec = nm_utils_get_monotonic_timestamp_msec();
 
     errsv = ndp_msg_new(&msg, NDP_MSG_RA);
     if (errsv) {
@@ -507,13 +532,9 @@ send_ra(NMNDisc *ndisc, GError **error)
         prefix->nd_opt_pi_flags_reserved |= ND_OPT_PI_FLAG_ONLINK;
         prefix->nd_opt_pi_flags_reserved |= ND_OPT_PI_FLAG_AUTO;
         prefix->nd_opt_pi_valid_time =
-            htonl(_nm_ndisc_lifetime_from_expiry(NM_NDISC_EXPIRY_BASE_TIMESTAMP,
-                                                 address->expiry_msec,
-                                                 TRUE));
+            htonl(_nm_ndisc_lifetime_from_expiry(now_msec, address->expiry_msec, TRUE));
         prefix->nd_opt_pi_preferred_time =
-            htonl(_nm_ndisc_lifetime_from_expiry(NM_NDISC_EXPIRY_BASE_TIMESTAMP,
-                                                 address->expiry_preferred_msec,
-                                                 TRUE));
+            htonl(_nm_ndisc_lifetime_from_expiry(now_msec, address->expiry_preferred_msec, TRUE));
         prefix->nd_opt_pi_prefix.s6_addr32[0] = address->address.s6_addr32[0];
         prefix->nd_opt_pi_prefix.s6_addr32[1] = address->address.s6_addr32[1];
         prefix->nd_opt_pi_prefix.s6_addr32[2] = 0;
diff --git a/src/core/ndisc/nm-ndisc-private.h b/src/core/ndisc/nm-ndisc-private.h
index 1479e566..90ec032d 100644
--- a/src/core/ndisc/nm-ndisc-private.h
+++ b/src/core/ndisc/nm-ndisc-private.h
@@ -14,6 +14,7 @@ struct _NMNDiscDataInternal {
     NMNDiscData public;
     GArray *gateways;
     GArray *addresses;
+    GArray *pref64;
     GArray *routes;
     GArray *dns_servers;
     GArray *dns_domains;
@@ -28,6 +29,7 @@ gboolean nm_ndisc_add_gateway(NMNDisc *ndisc, const NMNDiscGateway *new_item, gi
 gboolean
 nm_ndisc_complete_and_add_address(NMNDisc *ndisc, const NMNDiscAddress *new_item, gint64 now_msec);
 gboolean nm_ndisc_add_route(NMNDisc *ndisc, const NMNDiscRoute *new_item, gint64 now_msec);
+gboolean nm_ndisc_add_pref64(NMNDisc *ndisc, const NMNDiscPref64 *new_item, gint64 now_msec);
 gboolean nm_ndisc_add_dns_server(NMNDisc *ndisc, const NMNDiscDNSServer *new_item, gint64 now_msec);
 gboolean nm_ndisc_add_dns_domain(NMNDisc *ndisc, const NMNDiscDNSDomain *new_item, gint64 now_msec);
 
diff --git a/src/core/ndisc/nm-ndisc.c b/src/core/ndisc/nm-ndisc.c
index 1a2bf480..2056b5f8 100644
--- a/src/core/ndisc/nm-ndisc.c
+++ b/src/core/ndisc/nm-ndisc.c
@@ -34,6 +34,7 @@
 #define _SIZE_MAX_ROUTES      1000u
 #define _SIZE_MAX_DNS_SERVERS 64u
 #define _SIZE_MAX_DNS_DOMAINS 64u
+#define _SIZE_MAX_PREF64      8u
 
 /*****************************************************************************/
 
@@ -109,7 +110,8 @@ nm_ndisc_data_to_l3cd(NMDedupMultiIndex        *multi_idx,
                       int                       ifindex,
                       const NMNDiscData        *rdata,
                       NMSettingIP6ConfigPrivacy ip6_privacy,
-                      NMUtilsIPv6IfaceId       *token)
+                      NMUtilsIPv6IfaceId       *token,
+                      const char               *network_id)
 {
     nm_auto_unref_l3cd_init NML3ConfigData *l3cd = NULL;
     guint32                                 ifa_flags;
@@ -211,13 +213,21 @@ nm_ndisc_data_to_l3cd(NMDedupMultiIndex        *multi_idx,
     for (i = 0; i < rdata->dns_domains_n; i++)
         nm_l3_config_data_add_search(l3cd, AF_INET6, rdata->dns_domains[i].domain);
 
+    if (rdata->pref64_n > 0) {
+        nm_l3_config_data_set_pref64(l3cd, rdata->pref64[0].prefix, rdata->pref64[0].plen);
+    } else {
+        nm_l3_config_data_set_pref64_valid(l3cd, FALSE);
+    }
+
     nm_l3_config_data_set_ndisc_hop_limit(l3cd, rdata->hop_limit);
     nm_l3_config_data_set_ndisc_reachable_time_msec(l3cd, rdata->reachable_time_ms);
     nm_l3_config_data_set_ndisc_retrans_timer_msec(l3cd, rdata->retrans_timer_ms);
 
-    nm_l3_config_data_set_ip6_mtu(l3cd, rdata->mtu);
+    nm_l3_config_data_set_ip6_mtu_ra(l3cd, rdata->mtu);
     if (token)
         nm_l3_config_data_set_ip6_token(l3cd, *token);
+    if (network_id)
+        nm_l3_config_data_set_network_id(l3cd, network_id);
 
     return g_steal_pointer(&l3cd);
 }
@@ -416,6 +426,7 @@ _data_complete(NMNDiscDataInternal *data)
     _SET(data, gateways);
     _SET(data, addresses);
     _SET(data, routes);
+    _SET(data, pref64);
     _SET(data, dns_servers);
     _SET(data, dns_domains);
 #undef _SET
@@ -437,7 +448,8 @@ nm_ndisc_emit_config_change(NMNDisc *self, NMNDiscConfigMap changed)
                                  nm_l3cfg_get_ifindex(priv->config.l3cfg),
                                  rdata,
                                  priv->config.ip6_privacy,
-                                 priv->iid_is_token ? &priv->iid : NULL);
+                                 priv->iid_is_token ? &priv->iid : NULL,
+                                 priv->config.network_id);
     l3cd = nm_l3_config_data_seal(l3cd);
 
     if (!nm_l3_config_data_equal(priv->l3cd, l3cd))
@@ -761,6 +773,59 @@ nm_ndisc_add_route(NMNDisc *ndisc, const NMNDiscRoute *new_item, gint64 now_msec
 }
 
 gboolean
+nm_ndisc_add_pref64(NMNDisc *ndisc, const NMNDiscPref64 *new_item, gint64 now_msec)
+{
+    NMNDiscDataInternal *rdata = &NM_NDISC_GET_PRIVATE(ndisc)->rdata;
+    guint                i;
+    guint                insert_idx = G_MAXUINT;
+
+    for (i = 0; i < rdata->pref64->len;) {
+        NMNDiscPref64 *item = &nm_g_array_index(rdata->pref64, NMNDiscPref64, i);
+
+        if (item->plen == new_item->plen && IN6_ARE_ADDR_EQUAL(&item->prefix, &new_item->prefix)
+            && IN6_ARE_ADDR_EQUAL(&item->gateway, &new_item->gateway)) {
+            if (new_item->expiry_msec <= now_msec) {
+                g_array_remove_index(rdata->pref64, i);
+                return TRUE;
+            }
+
+            if (item->gateway_preference != new_item->gateway_preference) {
+                g_array_remove_index(rdata->pref64, i);
+                continue;
+            }
+
+            item->gateway_expiry_msec = new_item->gateway_expiry_msec;
+
+            if (item->expiry_msec == new_item->expiry_msec)
+                return FALSE;
+
+            item->expiry_msec = new_item->expiry_msec;
+            return TRUE;
+        }
+
+        /* Put before less preferable gateways. */
+        if (_preference_to_priority(item->gateway_preference)
+                < _preference_to_priority(new_item->gateway_preference)
+            && insert_idx == G_MAXUINT)
+            insert_idx = i;
+
+        i++;
+    }
+
+    if (rdata->pref64->len >= _SIZE_MAX_PREF64)
+        return FALSE;
+
+    if (new_item->expiry_msec <= now_msec)
+        return FALSE;
+
+    g_array_insert_val(rdata->pref64,
+                       insert_idx == G_MAXUINT ? rdata->pref64->len : insert_idx,
+                       *new_item);
+
+    return TRUE;
+}
+
+gboolean
 nm_ndisc_add_dns_server(NMNDisc *ndisc, const NMNDiscDNSServer *new_item, gint64 now_msec)
 {
     NMNDiscPrivate      *priv;
@@ -1059,7 +1124,8 @@ nm_ndisc_set_config(NMNDisc *ndisc, const NML3ConfigData *l3cd)
     const NMPObject   *obj;
     guint              len;
     guint              i;
-    gint32             fake_now = NM_NDISC_EXPIRY_BASE_TIMESTAMP / 1000;
+    gint64             now_msec = nm_utils_get_monotonic_timestamp_msec();
+    gint32             now      = now_msec / 1000;
 
     nm_assert(NM_IS_NDISC(ndisc));
     nm_assert(nm_ndisc_get_node_type(ndisc) == NM_NDISC_NODE_TYPE_ROUTER);
@@ -1082,16 +1148,15 @@ nm_ndisc_set_config(NMNDisc *ndisc, const NML3ConfigData *l3cd)
         lifetime = nmp_utils_lifetime_get(addr->timestamp,
                                           addr->lifetime,
                                           addr->preferred,
-                                          &fake_now,
+                                          &now,
                                           &preferred);
         if (!lifetime)
             continue;
 
         a = (NMNDiscAddress) {
-            .address     = addr->address,
-            .expiry_msec = _nm_ndisc_lifetime_to_expiry(NM_NDISC_EXPIRY_BASE_TIMESTAMP, lifetime),
-            .expiry_preferred_msec =
-                _nm_ndisc_lifetime_to_expiry(NM_NDISC_EXPIRY_BASE_TIMESTAMP, preferred),
+            .address               = addr->address,
+            .expiry_msec           = _nm_ndisc_lifetime_to_expiry(now_msec, lifetime),
+            .expiry_preferred_msec = _nm_ndisc_lifetime_to_expiry(now_msec, preferred),
         };
 
         if (nm_ndisc_add_address(ndisc, &a, 0, FALSE))
@@ -1111,8 +1176,7 @@ nm_ndisc_set_config(NMNDisc *ndisc, const NML3ConfigData *l3cd)
 
         n = (NMNDiscDNSServer) {
             .address     = a.addr6,
-            .expiry_msec = _nm_ndisc_lifetime_to_expiry(NM_NDISC_EXPIRY_BASE_TIMESTAMP,
-                                                        NM_NDISC_ROUTER_LIFETIME),
+            .expiry_msec = _nm_ndisc_lifetime_to_expiry(now_msec, NM_NDISC_ROUTER_LIFETIME),
         };
         if (nm_ndisc_add_dns_server(ndisc, &n, G_MININT64))
             changed = TRUE;
@@ -1127,8 +1191,7 @@ nm_ndisc_set_config(NMNDisc *ndisc, const NML3ConfigData *l3cd)
 
         n = (NMNDiscDNSDomain) {
             .domain      = (char *) strvarr[i],
-            .expiry_msec = _nm_ndisc_lifetime_to_expiry(NM_NDISC_EXPIRY_BASE_TIMESTAMP,
-                                                        NM_NDISC_ROUTER_LIFETIME),
+            .expiry_msec = _nm_ndisc_lifetime_to_expiry(now_msec, NM_NDISC_ROUTER_LIFETIME),
         };
         if (nm_ndisc_add_dns_domain(ndisc, &n, G_MININT64))
             changed = TRUE;
@@ -1400,6 +1463,17 @@ _config_changed_log(NMNDisc *ndisc, NMNDiscConfigMap changed)
               nm_icmpv6_router_pref_to_string(route->preference, str_pref, sizeof(str_pref)),
               get_exp(str_exp, now_msec, route));
     }
+    for (i = 0; i < rdata->pref64->len; i++) {
+        const NMNDiscPref64 *pref64 = &nm_g_array_index(rdata->pref64, NMNDiscPref64, i);
+        char                 addrstr2[NM_INET_ADDRSTRLEN];
+
+        _LOGD("  pref64 %s/%u via %s exp %s",
+              nm_inet6_ntop(&pref64->prefix, addrstr),
+              pref64->plen,
+              nm_inet6_ntop(&pref64->gateway, addrstr2),
+              get_exp(str_exp, now_msec, pref64));
+    }
+
     for (i = 0; i < rdata->dns_servers->len; i++) {
         const NMNDiscDNSServer *dns_server =
             &nm_g_array_index(rdata->dns_servers, NMNDiscDNSServer, i);
@@ -1486,7 +1560,7 @@ clean_addresses(NMNDisc *ndisc, gint64 now_msec, NMNDiscConfigMap *changed, gint
     }
 
     if (i != j) {
-        *changed = NM_NDISC_CONFIG_ADDRESSES;
+        *changed |= NM_NDISC_CONFIG_ADDRESSES;
         g_array_set_size(rdata->addresses, j);
     }
 
@@ -1520,11 +1594,50 @@ clean_routes(NMNDisc *ndisc, gint64 now_msec, NMNDiscConfigMap *changed, gint64
         g_array_set_size(rdata->routes, j);
     }
 
-    if (_array_set_size_max(rdata->gateways, _SIZE_MAX_ROUTES))
+    if (_array_set_size_max(rdata->routes, _SIZE_MAX_ROUTES))
         *changed |= NM_NDISC_CONFIG_ROUTES;
 }
 
 static void
+clean_pref64(NMNDisc *ndisc, gint64 now_msec, NMNDiscConfigMap *changed, gint64 *next_msec)
+{
+    NMNDiscDataInternal *rdata = &NM_NDISC_GET_PRIVATE(ndisc)->rdata;
+    NMNDiscPref64       *arr;
+    guint                i;
+    guint                j;
+
+    if (rdata->pref64->len == 0)
+        return;
+
+    arr = &nm_g_array_first(rdata->pref64, NMNDiscPref64);
+
+    for (i = 0, j = 0; i < rdata->pref64->len; i++) {
+        if (!expiry_next(now_msec, arr[i].expiry_msec, next_msec)
+            || !expiry_next(now_msec,
+                            arr[i].gateway_expiry_msec,
+                            next_msec)) { /* no gateway no party */
+            if (i == 0) {
+                /* Emit the changed signal only when the first PREF64 expires,
+                 * because only the first item is exported into the l3cd. Changes
+                 * in other PREF64s are not relevant. */
+                *changed |= NM_NDISC_CONFIG_PREF64;
+            }
+            continue;
+        }
+
+        if (i != j)
+            arr[j] = arr[i];
+        j++;
+    }
+
+    if (i != j) {
+        g_array_set_size(rdata->pref64, j);
+    }
+
+    _array_set_size_max(rdata->pref64, _SIZE_MAX_PREF64);
+}
+
+static void
 clean_dns_servers(NMNDisc *ndisc, gint64 now_msec, NMNDiscConfigMap *changed, gint64 *next_msec)
 {
     NMNDiscDataInternal *rdata = &NM_NDISC_GET_PRIVATE(ndisc)->rdata;
@@ -1550,7 +1663,7 @@ clean_dns_servers(NMNDisc *ndisc, gint64 now_msec, NMNDiscConfigMap *changed, gi
         g_array_set_size(rdata->dns_servers, j);
     }
 
-    if (_array_set_size_max(rdata->gateways, _SIZE_MAX_DNS_SERVERS))
+    if (_array_set_size_max(rdata->dns_servers, _SIZE_MAX_DNS_SERVERS))
         *changed |= NM_NDISC_CONFIG_DNS_SERVERS;
 }
 
@@ -1580,12 +1693,12 @@ clean_dns_domains(NMNDisc *ndisc, gint64 now_msec, NMNDiscConfigMap *changed, gi
         j++;
     }
 
-    if (i != 0) {
+    if (i != j) {
         *changed |= NM_NDISC_CONFIG_DNS_DOMAINS;
         g_array_set_size(rdata->dns_domains, j);
     }
 
-    if (_array_set_size_max(rdata->gateways, _SIZE_MAX_DNS_DOMAINS))
+    if (_array_set_size_max(rdata->dns_domains, _SIZE_MAX_DNS_DOMAINS))
         *changed |= NM_NDISC_CONFIG_DNS_DOMAINS;
 }
 
@@ -1600,6 +1713,7 @@ check_timestamps(NMNDisc *ndisc, gint64 now_msec, NMNDiscConfigMap changed)
     clean_gateways(ndisc, now_msec, &changed, &next_msec);
     clean_addresses(ndisc, now_msec, &changed, &next_msec);
     clean_routes(ndisc, now_msec, &changed, &next_msec);
+    clean_pref64(ndisc, now_msec, &changed, &next_msec);
     clean_dns_servers(ndisc, now_msec, &changed, &next_msec);
     clean_dns_domains(ndisc, now_msec, &changed, &next_msec);
 
@@ -1919,6 +2033,7 @@ nm_ndisc_init(NMNDisc *ndisc)
     rdata->gateways    = g_array_new(FALSE, FALSE, sizeof(NMNDiscGateway));
     rdata->addresses   = g_array_new(FALSE, FALSE, sizeof(NMNDiscAddress));
     rdata->routes      = g_array_new(FALSE, FALSE, sizeof(NMNDiscRoute));
+    rdata->pref64      = g_array_new(FALSE, FALSE, sizeof(NMNDiscPref64));
     rdata->dns_servers = g_array_new(FALSE, FALSE, sizeof(NMNDiscDNSServer));
     rdata->dns_domains = g_array_new(FALSE, FALSE, sizeof(NMNDiscDNSDomain));
     g_array_set_clear_func(rdata->dns_domains, dns_domain_free);
@@ -1951,6 +2066,7 @@ finalize(GObject *object)
     g_array_unref(rdata->gateways);
     g_array_unref(rdata->addresses);
     g_array_unref(rdata->routes);
+    g_array_unref(rdata->pref64);
     g_array_unref(rdata->dns_servers);
     g_array_unref(rdata->dns_domains);
 
diff --git a/src/core/ndisc/nm-ndisc.h b/src/core/ndisc/nm-ndisc.h
index 8f1a12a2..cdd9a676 100644
--- a/src/core/ndisc/nm-ndisc.h
+++ b/src/core/ndisc/nm-ndisc.h
@@ -50,18 +50,6 @@ const char *nm_ndisc_dhcp_level_to_string(NMNDiscDHCPLevel level);
  * unit of it is milliseconds. But of course, infinity has not really a unit. */
 #define NM_NDISC_EXPIRY_INFINITY G_MAXINT64
 
-/* in common cases, the expiry_msec tracks the timestamp in nm_utils_get_monotonic_timestamp_mses()
- * timestamp when the item expires.
- *
- * When we configure an NMNDiscAddress to be announced via the router advertisement,
- * then that address does not have a fixed expiry point in time, instead, the expiry
- * really contains the lifetime from the moment when we send the router advertisement.
- * In that case, the expiry_msec is more a "lifetime" that starts counting at timestamp
- * zero.
- *
- * The unit is milliseconds (but of course, the timestamp is zero, so it doesn't really matter). */
-#define NM_NDISC_EXPIRY_BASE_TIMESTAMP ((gint64) 0)
-
 static inline gint64
 _nm_ndisc_lifetime_to_expiry(gint64 now_msec, guint32 lifetime)
 {
@@ -119,6 +107,15 @@ typedef struct _NMNDiscRoute {
     bool               duplicate : 1;
 } NMNDiscRoute;
 
+typedef struct _NMNDiscPref64 {
+    struct in6_addr    prefix;
+    struct in6_addr    gateway;
+    gint64             expiry_msec;
+    gint64             gateway_expiry_msec;
+    NMIcmpv6RouterPref gateway_preference;
+    guint8             plen;
+} NMNDiscPref64;
+
 typedef struct {
     struct in6_addr address;
     gint64          expiry_msec;
@@ -141,6 +138,7 @@ typedef enum {
     NM_NDISC_CONFIG_MTU            = 1 << 7,
     NM_NDISC_CONFIG_REACHABLE_TIME = 1 << 8,
     NM_NDISC_CONFIG_RETRANS_TIMER  = 1 << 9,
+    NM_NDISC_CONFIG_PREF64         = 1 << 10,
 } NMNDiscConfigMap;
 
 typedef enum {
@@ -188,12 +186,14 @@ typedef struct {
     guint gateways_n;
     guint addresses_n;
     guint routes_n;
+    guint pref64_n;
     guint dns_servers_n;
     guint dns_domains_n;
 
     const NMNDiscGateway   *gateways;
     const NMNDiscAddress   *addresses;
     const NMNDiscRoute     *routes;
+    const NMNDiscPref64    *pref64;
     const NMNDiscDNSServer *dns_servers;
     const NMNDiscDNSDomain *dns_domains;
 } NMNDiscData;
@@ -282,6 +282,7 @@ struct _NML3ConfigData *nm_ndisc_data_to_l3cd(NMDedupMultiIndex        *multi_id
                                               int                       ifindex,
                                               const NMNDiscData        *rdata,
                                               NMSettingIP6ConfigPrivacy ip6_privacy,
-                                              NMUtilsIPv6IfaceId       *token);
+                                              NMUtilsIPv6IfaceId       *token,
+                                              const char               *network_id);
 
 #endif /* __NETWORKMANAGER_NDISC_H__ */
diff --git a/src/core/nm-config.c b/src/core/nm-config.c
index d8bf2e3e..85e36ac8 100644
--- a/src/core/nm-config.c
+++ b/src/core/nm-config.c
@@ -892,6 +892,7 @@ static const ConfigGroup config_groups[] = {
         .is_prefix = TRUE,
         .keys      = NM_MAKE_STRV(NM_CONFIG_KEYFILE_KEY_DEVICE_CARRIER_WAIT_TIMEOUT,
                              NM_CONFIG_KEYFILE_KEY_DEVICE_IGNORE_CARRIER,
+                             NM_CONFIG_KEYFILE_KEY_DEVICE_CHECK_CONNECTIVITY,
                              NM_CONFIG_KEYFILE_KEY_DEVICE_MANAGED,
                              NM_CONFIG_KEYFILE_KEY_DEVICE_SRIOV_NUM_VFS,
                              NM_CONFIG_KEYFILE_KEY_DEVICE_KEEP_CONFIGURATION,
@@ -1256,34 +1257,28 @@ read_base_config(GKeyFile   *keyfile,
     return TRUE;
 }
 
+/* We want to use GDir instead of GFile here to avoid loading GVFS modules and
+ * initalizing DBUS infra for communicating with GVFS.
+ * https://redhat.atlassian.net/browse/RHEL-140113
+ */
 static GPtrArray *
 _get_config_dir_files(const char *config_dir)
 {
-    GFile           *dir;
-    GFileEnumerator *direnum;
-    GFileInfo       *info;
-    GPtrArray       *confs;
-    const char      *name;
-
+    GDir       *dir;
+    GPtrArray  *confs;
+    const char *name;
     g_return_val_if_fail(config_dir, NULL);
-
     confs = g_ptr_array_new_with_free_func(g_free);
     if (!*config_dir)
         return confs;
-
-    dir     = g_file_new_for_path(config_dir);
-    direnum = g_file_enumerate_children(dir, G_FILE_ATTRIBUTE_STANDARD_NAME, 0, NULL, NULL);
-    if (direnum) {
-        while ((info = g_file_enumerator_next_file(direnum, NULL, NULL))) {
-            name = g_file_info_get_name(info);
+    dir = g_dir_open(config_dir, 0, NULL);
+    if (dir) {
+        while ((name = g_dir_read_name(dir))) {
             if (NM_STR_HAS_SUFFIX(name, ".conf"))
                 g_ptr_array_add(confs, g_strdup(name));
-            g_object_unref(info);
         }
-        g_object_unref(direnum);
+        g_dir_close(dir);
     }
-    g_object_unref(dir);
-
     g_ptr_array_sort(confs, nm_strcmp_p);
     return confs;
 }
@@ -1339,8 +1334,7 @@ read_entire_config(const NMConfigCmdLineOptions *cli,
         run_config_dir = RUN_CONFIG_DIR;
 
     /* create a default configuration file. */
-    keyfile = nm_config_create_keyfile();
-
+    keyfile      = nm_config_create_keyfile();
     system_confs = _get_config_dir_files(system_config_dir);
     confs        = _get_config_dir_files(config_dir);
     run_confs    = _get_config_dir_files(run_config_dir);
@@ -3292,7 +3286,6 @@ init_sync(GInitable *initable, GCancellable *cancellable, GError **error)
         g_set_error(error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_NOT_FOUND, "unspecified error");
         g_return_val_if_reached(FALSE);
     }
-
     s                = priv->cli.config_dir ?: "" DEFAULT_CONFIG_DIR;
     priv->config_dir = g_strdup(s[0] == '/' ? s : "");
 
@@ -3300,12 +3293,10 @@ init_sync(GInitable *initable, GCancellable *cancellable, GError **error)
     if (s[0] != '/' || nm_streq(s, priv->config_dir))
         s = "";
     priv->system_config_dir = g_strdup(s);
-
     if (priv->cli.intern_config_file)
         priv->intern_config_file = g_strdup(priv->cli.intern_config_file);
     else
         priv->intern_config_file = g_strdup(DEFAULT_INTERN_CONFIG_FILE);
-
     warnings = g_ptr_array_new_with_free_func(g_free);
 
     keyfile = read_entire_config(&priv->cli,
diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c
index deac04e7..ee05bedd 100644
--- a/src/core/nm-core-utils.c
+++ b/src/core/nm-core-utils.c
@@ -21,6 +21,10 @@
 #include <linux/if_infiniband.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
+#include <netinet/ip_icmp.h>
+#include <netinet/icmp6.h>
+#include <netinet/ip6.h>
+#include <linux/if_packet.h>
 
 #include "libnm-glib-aux/nm-uuid.h"
 #include "libnm-platform/nmp-base.h"
@@ -5003,6 +5007,469 @@ NM_UTILS_LOOKUP_STR_DEFINE(nm_activation_type_to_string,
 /*****************************************************************************/
 
 typedef struct {
+    NMIPAddrTyped address;
+    char         *addr_str;
+    GTask        *task;
+    GSource      *timeout_source;
+    GSource      *retry_source;
+    GSource      *input_source;
+    gulong        cancellable_id;
+    int           ifindex;
+    int           socket;
+    guint16       seq;
+} PingInfo;
+
+#define _NMLOG2_PREFIX_NAME "ping"
+#define _NMLOG2_DOMAIN      LOGD_CORE
+#define _NMLOG2(level, info, ...)                                                          \
+    G_STMT_START                                                                           \
+    {                                                                                      \
+        if (nm_logging_enabled((level), (_NMLOG2_DOMAIN))) {                               \
+            PingInfo *_info = (info);                                                      \
+                                                                                           \
+            _nm_log((level),                                                               \
+                    (_NMLOG2_DOMAIN),                                                      \
+                    0,                                                                     \
+                    NULL,                                                                  \
+                    NULL,                                                                  \
+                    _NMLOG2_PREFIX_NAME "[" NM_HASH_OBFUSCATE_PTR_FMT                      \
+                                        ",if=%d,%s]: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \
+                    NM_HASH_OBFUSCATE_PTR(_info),                                          \
+                    _info->ifindex,                                                        \
+                    _info->addr_str _NM_UTILS_MACRO_REST(__VA_ARGS__));                    \
+        }                                                                                  \
+    }                                                                                      \
+    G_STMT_END
+
+static void
+ping_complete(PingInfo *info, GError *error)
+{
+    nm_clear_g_cancellable_disconnect(g_task_get_cancellable(info->task), &info->cancellable_id);
+
+    if (error && !nm_utils_error_is_cancelled(error)) {
+        _LOG2T(info, "terminated with error: %s", error->message);
+    }
+
+    if (error)
+        g_task_return_error(info->task, error);
+    else
+        g_task_return_boolean(info->task, TRUE);
+
+    nm_clear_g_source_inst(&info->timeout_source);
+    nm_clear_g_source_inst(&info->retry_source);
+    nm_clear_g_source_inst(&info->input_source);
+    nm_clear_g_free(&info->addr_str);
+    nm_clear_fd(&info->socket);
+    g_object_unref(info->task);
+
+    g_free(info);
+}
+
+static gboolean
+ping_socket_data_cb(int fd, GIOCondition condition, gpointer user_data)
+{
+    PingInfo *info = user_data;
+    ssize_t   len;
+    union {
+        struct icmphdr   icmph;
+        struct icmp6_hdr icmp6h;
+    } pkt;
+
+    len = recv(fd, &pkt, sizeof(pkt), 0);
+
+    if (len < 0)
+        return G_SOURCE_CONTINUE;
+
+    if (info->address.addr_family == AF_INET) {
+        if (len >= sizeof(struct icmphdr) && pkt.icmph.type == ICMP_ECHOREPLY) {
+            _LOG2T(info, "received echo-reply with seq %hu", ntohs(pkt.icmph.un.echo.sequence));
+            ping_complete(info, NULL);
+            return G_SOURCE_CONTINUE;
+        }
+    } else {
+        if (len >= sizeof(struct icmp6_hdr) && pkt.icmp6h.icmp6_type == ICMP6_ECHO_REPLY) {
+            _LOG2T(info, "received echo-reply with seq %hu", ntohs(pkt.icmp6h.icmp6_seq));
+            ping_complete(info, NULL);
+            return G_SOURCE_CONTINUE;
+        }
+    }
+
+    return G_SOURCE_CONTINUE;
+}
+
+static void
+ping_send(PingInfo *info)
+{
+    const bool IS_IPv4 = NM_IS_IPv4(info->address.addr_family);
+    union {
+        struct sockaddr_in6 sa6;
+        struct sockaddr_in  sa4;
+    } sa;
+    union {
+        struct icmphdr   icmph;
+        struct icmp6_hdr icmp6h;
+    } pkt;
+    socklen_t sa_len;
+    size_t    pkt_len;
+    nm_be32_t ifindex_be;
+    int       errsv;
+
+    info->seq++;
+
+    if (info->socket < 0) {
+        info->socket = socket(info->address.addr_family,
+                              SOCK_DGRAM | SOCK_CLOEXEC,
+                              IS_IPv4 ? IPPROTO_ICMP : IPPROTO_ICMPV6);
+        if (info->socket < 0) {
+            errsv = errno;
+            _LOG2T(info, "socket creation failed: %s", nm_strerror_native(errsv));
+            /* Try again at the next iteration */
+            return;
+        }
+
+        memset(&sa, 0, sizeof(sa));
+        if (IS_IPv4) {
+            sa.sa4.sin_family      = AF_INET;
+            sa.sa4.sin_addr.s_addr = info->address.addr.addr4;
+            sa_len                 = sizeof(struct sockaddr_in);
+        } else {
+            sa.sa6.sin6_family = AF_INET6;
+            sa.sa6.sin6_addr   = info->address.addr.addr6;
+            if (IN6_IS_ADDR_LINKLOCAL(&info->address.addr.addr6))
+                sa.sa6.sin6_scope_id = info->ifindex;
+            sa_len = sizeof(struct sockaddr_in6);
+        }
+
+        /* setsockopt(IP*_UNICAST_IF) must be called *before* connecting
+         * the socket, otherwise it doesn't have any effect */
+        ifindex_be = htonl(info->ifindex);
+        if (setsockopt(info->socket,
+                       IS_IPv4 ? IPPROTO_IP : IPPROTO_IPV6,
+                       IS_IPv4 ? IP_UNICAST_IF : IPV6_UNICAST_IF,
+                       &ifindex_be,
+                       sizeof(ifindex_be))) {
+            errsv = errno;
+            _LOG2T(info,
+                   "failed to bind the socket to the interface: %s",
+                   nm_strerror_native(errsv));
+            /* Try again at the next iteration */
+            nm_clear_fd(&info->socket);
+            return;
+        }
+
+        /* Connect the socket so that the kernel only delivers us packets
+         * coming from the given remote address */
+        if (connect(info->socket, (struct sockaddr *) &sa, sa_len) < 0) {
+            errsv = errno;
+            _LOG2T(info, "failed to connect the socket: %s", nm_strerror_native(errsv));
+            /* try again at the next iteration */
+            nm_clear_fd(&info->socket);
+            return;
+        }
+
+        info->input_source = nm_g_unix_fd_source_new(info->socket,
+                                                     G_IO_IN,
+                                                     G_PRIORITY_DEFAULT,
+                                                     ping_socket_data_cb,
+                                                     info,
+                                                     NULL);
+        g_source_attach(info->input_source, g_task_get_context(info->task));
+    }
+
+    if (IS_IPv4) {
+        memset(&pkt.icmph, 0, sizeof(struct icmphdr));
+        pkt.icmph.type             = ICMP_ECHO;
+        pkt.icmph.un.echo.sequence = htons(info->seq);
+        pkt_len                    = sizeof(struct icmphdr);
+    } else {
+        memset(&pkt.icmp6h, 0, sizeof(struct icmp6_hdr));
+        pkt.icmp6h.icmp6_type = ICMP6_ECHO_REQUEST;
+        pkt.icmp6h.icmp6_seq  = htons(info->seq);
+        pkt_len               = sizeof(struct icmp6_hdr);
+    }
+    /* The kernel will automatically set the ID ICMP field and filter
+     * incoming packets by the same ID */
+
+    if (send(info->socket, &pkt, pkt_len, 0) < 0) {
+        errsv = errno;
+        _LOG2T(info, "error sending echo-request #%u: %s", info->seq, nm_strerror_native(errsv));
+        return;
+    }
+
+    _LOG2T(info, "sent echo-request #%u", info->seq);
+}
+
+static gboolean
+ping_timeout_cb(gpointer user_data)
+{
+    PingInfo *info = user_data;
+
+    _LOG2T(info, "timeout");
+
+    nm_clear_g_source_inst(&info->timeout_source);
+    ping_complete(info, g_error_new_literal(NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN, "timeout"));
+
+    return G_SOURCE_CONTINUE;
+}
+
+static gboolean
+ping_retry_cb(gpointer user_data)
+{
+    PingInfo *info = user_data;
+
+    ping_send(info);
+
+    return G_SOURCE_CONTINUE;
+}
+
+static void
+ping_cancelled(GObject *object, gpointer user_data)
+{
+    PingInfo *info  = user_data;
+    GError   *error = NULL;
+
+    nm_clear_g_signal_handler(g_task_get_cancellable(info->task), &info->cancellable_id);
+    nm_utils_error_set_cancelled(&error, FALSE, NULL);
+    ping_complete(info, error);
+}
+
+void
+nm_utils_ping_host(NMIPAddrTyped       address,
+                   int                 ifindex,
+                   guint               timeout_sec,
+                   GCancellable       *cancellable,
+                   GAsyncReadyCallback callback,
+                   gpointer            cb_data)
+{
+    PingInfo *info;
+    char      buf[NM_INET_ADDRSTRLEN];
+    gulong    signal_id;
+
+    nm_assert(ifindex > 0);
+    nm_assert(G_IS_CANCELLABLE(cancellable));
+    nm_assert(callback);
+    nm_assert(cb_data);
+
+    info          = g_new0(PingInfo, 1);
+    info->address = address;
+    info->ifindex = ifindex;
+    info->task    = nm_g_task_new(NULL, cancellable, nm_utils_ping_host, callback, cb_data);
+    info->socket  = -1;
+
+    nm_inet_ntop(address.addr_family, address.addr.addr_ptr, buf);
+    info->addr_str = g_strdup(buf);
+
+    _LOG2T(info, "started");
+
+    if (timeout_sec > 0) {
+        info->timeout_source = nm_g_timeout_source_new_seconds(timeout_sec,
+                                                               G_PRIORITY_DEFAULT,
+                                                               ping_timeout_cb,
+                                                               info,
+                                                               NULL);
+        g_source_attach(info->timeout_source, g_task_get_context(info->task));
+    }
+
+    info->retry_source =
+        nm_g_timeout_source_new_seconds(1, G_PRIORITY_DEFAULT, ping_retry_cb, info, NULL);
+    g_source_attach(info->retry_source, g_task_get_context(info->task));
+
+    signal_id = g_cancellable_connect(cancellable, G_CALLBACK(ping_cancelled), info, NULL);
+    if (signal_id == 0) {
+        /* the callback was invoked synchronously, which destroyed @info.
+         * We must not touch it anymore. */
+        return;
+    }
+    info->cancellable_id = signal_id;
+
+    ping_send(info);
+}
+
+gboolean
+nm_utils_ping_host_finish(GAsyncResult *result, GError **error)
+{
+    GTask *task = G_TASK(result);
+
+    nm_assert(nm_g_task_is_valid(result, NULL, nm_utils_ping_host));
+
+    return g_task_propagate_boolean(task, error);
+}
+
+/*****************************************************************************/
+
+/*
+ * nm_utils_icmp6_checksum:
+ * @ip6_src: pointer to the IPv6 source address
+ * @data_len: length of the data
+ * @data: the data on which to compute the checksum
+ *
+ * Computes the ICMP6 checksum over @data (with length @data_len) and the IPv6
+ * pseudo-header. @ip6_src points to the source address in the IPv6 header.
+ */
+uint16_t
+nm_utils_icmp6_checksum(const void *ip6_src, size_t data_len, const void *data)
+{
+    uint32_t        sum = 0;
+    const uint16_t *ptr;
+    const uint8_t  *ptr8;
+    size_t          i;
+
+    /* Pseudo-header: source address */
+    ptr = (const uint16_t *) ip6_src;
+    for (i = 0; i < 8; i++)
+        sum += *ptr++;
+
+    /* Pseudo-header: destination address */
+    for (i = 0; i < 8; i++)
+        sum += *ptr++;
+
+    /* Pseudo-header: payload length */
+    sum += htons(data_len);
+
+    /* Pseudo-header: next header */
+    sum += htons(IPPROTO_ICMPV6);
+
+    /* ICMPv6 data */
+    ptr = (const uint16_t *) data;
+    for (i = 0; i < data_len / 2; i++)
+        sum += ptr[i];
+
+    /* Handle odd byte */
+    if (data_len % 2) {
+        ptr8 = &((const uint8_t *) data)[data_len - 1];
+        sum += htons((guint16) (*ptr8) << 8);
+    }
+
+    /* Fold 32-bit sum to 16 bits */
+    while (sum >> 16)
+        sum = (sum & 0xffff) + (sum >> 16);
+
+    return (uint16_t) ~sum;
+}
+
+/*
+ * nm_utils_ipv6_dad_send:
+ * @addr: the target IPv6 address
+ * @ifindex: the interface index
+ * @arptype: the ARP hardware type of the interface (e.g. ARPHRD_ETHER, ARPHRD_NONE)
+ *
+ * Send an IPv6 Duplicate Address Detection (DAD) Neighbor Solicitation
+ * for the given address.
+ *
+ * Returns: %TRUE if the packet was sent successfully, %FALSE on error
+ */
+gboolean
+nm_utils_ipv6_dad_send(const struct in6_addr *addr, int ifindex, int arptype)
+{
+    /* DAD packet: IPv6 header + ICMPv6 NS + nonce option (RFC 3971) */
+    struct _nm_packed {
+        struct ip6_hdr             ip6h;
+        struct nd_neighbor_solicit ns;
+        guint8                     ns_opt_nr;
+        guint8                     ns_opt_len;
+        guint8                     ns_opt_nonce[6];
+    } dad_pkt;
+    nm_auto_close int fd = -1;
+    int               errsv;
+    char              sbuf[NM_INET_ADDRSTRLEN];
+
+    nm_assert(addr);
+    nm_assert(ifindex > 0);
+
+    /* IPv6 header */
+    dad_pkt.ip6h = (struct ip6_hdr) {
+        .ip6_flow        = htonl(6 << 28), /* version 6, tclass 0, flowlabel 0 */
+        .ip6_plen        = htons(sizeof(dad_pkt) - sizeof(struct ip6_hdr)),
+        .ip6_nxt         = IPPROTO_ICMPV6,
+        .ip6_hlim        = 255,
+        .ip6_src         = IN6ADDR_ANY_INIT,
+        .ip6_dst.s6_addr = {0xff,
+                            0x02,
+                            0,
+                            0,
+                            0,
+                            0,
+                            0,
+                            0,
+                            0,
+                            0,
+                            0,
+                            0x01,
+                            0xff,
+                            addr->s6_addr[13],
+                            addr->s6_addr[14],
+                            addr->s6_addr[15]},
+    };
+
+    /* ICMPv6 Neighbor Solicitation */
+    dad_pkt.ns = (struct nd_neighbor_solicit) {
+        .nd_ns_type   = ND_NEIGHBOR_SOLICIT,
+        .nd_ns_target = *addr,
+    };
+
+    /* Nonce option (RFC 3971) */
+    dad_pkt.ns_opt_nr  = 14;
+    dad_pkt.ns_opt_len = 1; /* in units of 8 bytes */
+    nm_random_get_bytes(dad_pkt.ns_opt_nonce, sizeof(dad_pkt.ns_opt_nonce));
+
+    /* Compute the ICMPv6 checksum */
+    dad_pkt.ns.nd_ns_cksum = nm_utils_icmp6_checksum(&dad_pkt.ip6h.ip6_src,
+                                                     sizeof(dad_pkt) - sizeof(struct ip6_hdr),
+                                                     &dad_pkt.ns);
+
+    /* We need a ETH_P_IPV6 socket because we need to use a zero IPv6 source address */
+    fd = socket(AF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC, htons(ETH_P_IPV6));
+    if (fd < 0) {
+        errsv = errno;
+        nm_log_warn(LOGD_CORE,
+                    "ipv6-dad: failed to create socket for %s: %s",
+                    nm_inet6_ntop(addr, sbuf),
+                    nm_strerror_native(errsv));
+        return FALSE;
+    }
+
+    /* Build link-layer destination address. For Ethernet, use the solicited-node
+     * multicast MAC address. For L3-only devices (ARPHRD_NONE, ARPHRD_RAWIP, etc.)
+     * there is no L2 header, so set sll_halen to 0. */
+    {
+        struct sockaddr_ll dst_ll = {
+            .sll_family   = AF_PACKET,
+            .sll_protocol = htons(ETH_P_IPV6),
+            .sll_ifindex  = ifindex,
+        };
+
+        if (arptype == ARPHRD_ETHER) {
+            dst_ll.sll_halen   = ETH_ALEN;
+            dst_ll.sll_addr[0] = 0x33;
+            dst_ll.sll_addr[1] = 0x33;
+            dst_ll.sll_addr[2] = 0xff;
+            dst_ll.sll_addr[3] = addr->s6_addr[13];
+            dst_ll.sll_addr[4] = addr->s6_addr[14];
+            dst_ll.sll_addr[5] = addr->s6_addr[15];
+        }
+
+        if (sendto(fd, &dad_pkt, sizeof(dad_pkt), 0, (struct sockaddr *) &dst_ll, sizeof(dst_ll))
+            < 0) {
+            errsv = errno;
+            nm_log_warn(LOGD_CORE,
+                        "ipv6-dad: failed to send DAD NS for %s: %s",
+                        nm_inet6_ntop(addr, sbuf),
+                        nm_strerror_native(errsv));
+            return FALSE;
+        }
+    }
+
+    nm_log_dbg(LOGD_CORE,
+               "ipv6-dad: sent DAD NS for %s on ifindex %d",
+               nm_inet6_ntop(addr, sbuf),
+               ifindex);
+
+    return TRUE;
+}
+
+/*****************************************************************************/
+
+typedef struct {
     GPid     pid;
     GTask   *task;
     gulong   cancellable_id;
@@ -5023,6 +5490,9 @@ typedef struct {
     gsize    out_buffer_offset;
 } HelperInfo;
 
+#undef _NMLOG2_PREFIX_NAME
+#undef _NMLOG2_DOMAIN
+#undef _NMLOG2
 #define _NMLOG2_PREFIX_NAME "nm-daemon-helper"
 #define _NMLOG2_DOMAIN      LOGD_CORE
 #define _NMLOG2(level, info, ...)                                                    \
diff --git a/src/core/nm-core-utils.h b/src/core/nm-core-utils.h
index cccccae6..a1892b99 100644
--- a/src/core/nm-core-utils.h
+++ b/src/core/nm-core-utils.h
@@ -304,6 +304,7 @@ typedef enum {
     NM_UTILS_STABLE_TYPE_STABLE_ID = 1,
     NM_UTILS_STABLE_TYPE_GENERATED = 2,
     NM_UTILS_STABLE_TYPE_RANDOM    = 3,
+    NM_UTILS_STABLE_TYPE_CLAT      = 4,
 } NMUtilsStableType;
 
 #define NM_UTILS_STABLE_TYPE_NONE ((NMUtilsStableType) - 1)
@@ -520,4 +521,19 @@ void        nm_utils_read_private_files(const char *const  *paths,
                                         gpointer            cb_data);
 GHashTable *nm_utils_read_private_files_finish(GAsyncResult *result, GError **error);
 
+/*****************************************************************************/
+
+void nm_utils_ping_host(NMIPAddrTyped       address,
+                        int                 ifindex,
+                        guint               timeout_sec,
+                        GCancellable       *cancellable,
+                        GAsyncReadyCallback callback,
+                        gpointer            cb_data);
+
+gboolean nm_utils_ping_host_finish(GAsyncResult *result, GError **error);
+
+uint16_t nm_utils_icmp6_checksum(const void *ip6_src, size_t data_len, const void *data);
+
+gboolean nm_utils_ipv6_dad_send(const struct in6_addr *addr, int ifindex, int arptype);
+
 #endif /* __NM_CORE_UTILS_H__ */
diff --git a/src/core/nm-ip-config.c b/src/core/nm-ip-config.c
index 75a75b42..4616f2e4 100644
--- a/src/core/nm-ip-config.c
+++ b/src/core/nm-ip-config.c
@@ -26,6 +26,7 @@ GType nm_ip6_config_get_type(void);
 /*****************************************************************************/
 
 #define NM_IP_CONFIG_ADDRESS_DATA "address-data"
+#define NM_IP_CONFIG_CLAT_ADDRESS "clat-address"
 #define NM_IP_CONFIG_DNS_OPTIONS  "dns-options"
 #define NM_IP_CONFIG_DNS_PRIORITY "dns-priority"
 #define NM_IP_CONFIG_DOMAINS      "domains"
@@ -41,6 +42,7 @@ NM_GOBJECT_PROPERTIES_DEFINE_FULL(_ip,
                                   NMIPConfig,
                                   PROP_IP_L3CFG,
                                   PROP_IP_ADDRESS_DATA,
+                                  PROP_IP_CLAT_ADDRESS,
                                   PROP_IP_GATEWAY,
                                   PROP_IP_ROUTE_DATA,
                                   PROP_IP_DOMAINS,
@@ -164,6 +166,8 @@ get_property_ip(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec
     const int          addr_family = nm_ip_config_get_addr_family(self);
     char             **to_free     = NULL;
     char               sbuf_addr[NM_INET_ADDRSTRLEN];
+    in_addr_t          addr4;
+    struct in6_addr    addr6;
     const char *const *strv;
     guint              len;
     int                v_i;
@@ -218,6 +222,20 @@ get_property_ip(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec
         strv = nm_l3_config_data_get_dns_options(priv->l3cd, addr_family, &len);
         _value_set_variant_as(value, strv, len);
         break;
+    case PROP_IP_CLAT_ADDRESS:
+        if (nm_l3_config_data_get_clat_state(priv->l3cd, &addr6, NULL, NULL, &addr4)) {
+            if (addr_family == AF_INET) {
+                g_value_set_variant(value,
+                                    g_variant_new_string(nm_inet_ntop(AF_INET, &addr4, sbuf_addr)));
+            } else {
+                g_value_set_variant(
+                    value,
+                    g_variant_new_string(nm_inet_ntop(AF_INET6, &addr6, sbuf_addr)));
+            }
+        } else {
+            g_value_set_variant(value, nm_g_variant_singleton_s_empty());
+        }
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
         break;
@@ -336,6 +354,13 @@ nm_ip_config_class_init(NMIPConfigClass *klass)
                              G_VARIANT_TYPE("aa{sv}"),
                              NULL,
                              G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+    obj_properties_ip[PROP_IP_CLAT_ADDRESS] =
+        g_param_spec_variant(NM_IP_CONFIG_CLAT_ADDRESS,
+                             "",
+                             "",
+                             G_VARIANT_TYPE("s"),
+                             NULL,
+                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
     obj_properties_ip[PROP_IP_GATEWAY] =
         g_param_spec_variant(NM_IP_CONFIG_GATEWAY,
                              "",
@@ -512,6 +537,9 @@ static const NMDBusInterfaceInfoExtended interface_info_ip4_config = {
             NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("AddressData",
                                                            "aa{sv}",
                                                            NM_IP_CONFIG_ADDRESS_DATA),
+            NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("ClatAddress",
+                                                           "s",
+                                                           NM_IP_CONFIG_CLAT_ADDRESS),
             NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Gateway", "s", NM_IP_CONFIG_GATEWAY),
             NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
                 "Routes",
@@ -614,6 +642,7 @@ nm_ip4_config_class_init(NMIP4ConfigClass *klass)
 /*****************************************************************************/
 
 /* public */
+#define NM_IP6_CONFIG_CLAT_PREF64 "clat-pref64"
 #define NM_IP6_CONFIG_NAMESERVERS "nameservers"
 
 /* deprecated */
@@ -625,6 +654,7 @@ typedef struct _NMIP6ConfigClass NMIP6ConfigClass;
 
 NM_GOBJECT_PROPERTIES_DEFINE_FULL(_ip6,
                                   NMIP6Config,
+                                  PROP_IP6_CLAT_PREF64,
                                   PROP_IP6_NAMESERVERS,
                                   PROP_IP6_ADDRESSES,
                                   PROP_IP6_ROUTES, );
@@ -651,6 +681,12 @@ static const NMDBusInterfaceInfoExtended interface_info_ip6_config = {
             NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("AddressData",
                                                            "aa{sv}",
                                                            NM_IP_CONFIG_ADDRESS_DATA),
+            NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("ClatAddress",
+                                                           "s",
+                                                           NM_IP_CONFIG_CLAT_ADDRESS),
+            NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("ClatPref64",
+                                                           "s",
+                                                           NM_IP6_CONFIG_CLAT_PREF64),
             NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Gateway", "s", NM_IP_CONFIG_GATEWAY),
             NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
                 "Routes",
@@ -682,11 +718,24 @@ get_property_ip6(GObject *object, guint prop_id, GValue *value, GParamSpec *pspe
     guint              len;
     guint              i;
     const char *const *strarr;
+    guint8             plen;
+    struct in6_addr    addr6;
+    char               sbuf[NM_UTILS_INET_ADDRSTRLEN];
 
     switch (prop_id) {
     case PROP_IP6_ADDRESSES:
         g_value_set_variant(value, priv->v_addresses);
         break;
+    case PROP_IP6_CLAT_PREF64:
+        if (nm_l3_config_data_get_clat_state(priv->l3cd, NULL, &addr6, &plen, NULL)) {
+            nm_inet6_ntop(&addr6, sbuf);
+            g_value_set_variant(value,
+                                g_variant_new_string(
+                                    nm_sprintf_bufa(NM_INET_ADDRSTRLEN + 32, "%s/%u", sbuf, plen)));
+        } else {
+            g_value_set_variant(value, nm_g_variant_singleton_s_empty());
+        }
+        break;
     case PROP_IP6_ROUTES:
         g_value_set_variant(value, priv->v_routes);
         break;
@@ -740,6 +789,13 @@ nm_ip6_config_class_init(NMIP6ConfigClass *klass)
                              G_VARIANT_TYPE("a(ayuay)"),
                              NULL,
                              G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+    obj_properties_ip6[PROP_IP6_CLAT_PREF64] =
+        g_param_spec_variant(NM_IP6_CONFIG_CLAT_PREF64,
+                             "",
+                             "",
+                             G_VARIANT_TYPE("s"),
+                             NULL,
+                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
     obj_properties_ip6[PROP_IP6_ROUTES] =
         g_param_spec_variant(NM_IP6_CONFIG_ROUTES,
                              "",
@@ -787,7 +843,7 @@ _handle_l3cd_changed(NMIPConfig *self, const NML3ConfigData *l3cd)
     const int                                IS_IPv4     = NM_IS_IPv4(addr_family);
     NMIPConfigPrivate                       *priv        = NM_IP_CONFIG_GET_PRIVATE(self);
     nm_auto_unref_l3cd const NML3ConfigData *l3cd_old    = NULL;
-    GParamSpec                              *changed_params[8];
+    GParamSpec                              *changed_params[10];
     guint                                    n_changed_params = 0;
     const char *const                       *strarr;
     const char *const                       *strarr_old;
@@ -840,6 +896,59 @@ _handle_l3cd_changed(NMIPConfig *self, const NML3ConfigData *l3cd)
         }
     }
 
+    /* CLAT state */
+    {
+        struct in6_addr clat_ip6;
+        struct in6_addr clat_pref64;
+        guint8          clat_pref64_plen;
+        in_addr_t       clat_ip4;
+        gboolean        clat_enabled;
+        struct in6_addr clat_ip6_old;
+        struct in6_addr clat_pref64_old;
+        guint8          clat_pref64_plen_old;
+        in_addr_t       clat_ip4_old;
+        gboolean        clat_enabled_old;
+        gboolean        changed;
+
+        clat_enabled_old = nm_l3_config_data_get_clat_state(l3cd_old,
+                                                            &clat_ip6_old,
+                                                            &clat_pref64_old,
+                                                            &clat_pref64_plen_old,
+                                                            &clat_ip4_old);
+        clat_enabled     = nm_l3_config_data_get_clat_state(priv->l3cd,
+                                                        &clat_ip6,
+                                                        &clat_pref64,
+                                                        &clat_pref64_plen,
+                                                        &clat_ip4);
+
+        /* CLAT address */
+        if (clat_enabled != clat_enabled_old) {
+            changed = TRUE;
+        } else if (!clat_enabled) {
+            changed = FALSE;
+        } else if (IS_IPv4) {
+            changed = (clat_ip4 != clat_ip4_old);
+        } else {
+            changed = !IN6_ARE_ADDR_EQUAL(&clat_ip6, &clat_ip6_old);
+        }
+        if (changed)
+            changed_params[n_changed_params++] = obj_properties_ip[PROP_IP_CLAT_ADDRESS];
+
+        /*  PREF64 */
+        if (!IS_IPv4) {
+            if (clat_enabled != clat_enabled_old) {
+                changed = TRUE;
+            } else if (!clat_enabled) {
+                changed = FALSE;
+            } else {
+                changed = (clat_pref64_plen != clat_pref64_plen_old)
+                          || (!IN6_ARE_ADDR_EQUAL(&clat_pref64, &clat_pref64_old));
+            }
+            if (changed)
+                changed_params[n_changed_params++] = obj_properties_ip6[PROP_IP6_CLAT_PREF64];
+        }
+    }
+
     _notify_all(self, changed_params, n_changed_params);
 }
 
diff --git a/src/core/nm-l3-config-data.c b/src/core/nm-l3-config-data.c
index 7500337e..849da7f4 100644
--- a/src/core/nm-l3-config-data.c
+++ b/src/core/nm-l3-config-data.c
@@ -50,6 +50,9 @@ struct _NML3ConfigData {
         const NMPObject *best_default_route_x[2];
     };
 
+    struct in6_addr pref64_prefix;
+    guint32         pref64_plen;
+
     GArray *wins;
     GArray *nis_servers;
 
@@ -122,6 +125,19 @@ struct _NML3ConfigData {
     NMSettingConnectionDnsOverTls dns_over_tls;
     NMSettingConnectionDnssec     dnssec;
     NMUtilsIPv6IfaceId            ip6_token;
+    NMRefString                  *network_id;
+    NMSettingIp4ConfigClat        clat_config; /* this indicates the 'administrative' CLAT
+                                                * state, i.e. whether CLAT will be started
+                                                * once we receive a PREF64 */
+
+    /* The runtime CLAT state */
+    struct {
+        struct in6_addr ip6;
+        struct in6_addr pref64;
+        in_addr_t       ip4;
+        guint8          pref64_plen;
+        bool            enabled;
+    } clat_state;
 
     NML3ConfigDatFlags flags;
 
@@ -130,7 +146,8 @@ struct _NML3ConfigData {
     int ndisc_hop_limit_val;
 
     guint32 mtu;
-    guint32 ip6_mtu;
+    guint32 ip6_mtu_static; /* IPv6 MTU from the connection profile */
+    guint32 ip6_mtu_ra;     /* IPv6 MTU from Router Advertisement */
     guint32 ndisc_reachable_time_msec_val;
     guint32 ndisc_retrans_timer_msec_val;
 
@@ -167,6 +184,8 @@ struct _NML3ConfigData {
 
     bool routed_dns_4 : 1;
     bool routed_dns_6 : 1;
+
+    bool pref64_valid : 1;
 };
 
 /*****************************************************************************/
@@ -390,8 +409,11 @@ nm_l3_config_data_log(const NML3ConfigData *self,
            : "",
        !self->is_sealed ? ", not-sealed" : "");
 
-    if (self->mtu != 0 || self->ip6_mtu != 0) {
-        _L("mtu: %u, ip6-mtu: %u", self->mtu, self->ip6_mtu);
+    if (self->mtu != 0 || self->ip6_mtu_static != 0 || self->ip6_mtu_ra != 0) {
+        _L("mtu: %u, ip6-mtu-static: %u, ip6-mtu-ra %u",
+           self->mtu,
+           self->ip6_mtu_static,
+           self->ip6_mtu_ra);
     }
 
     for (IS_IPv4 = 1; IS_IPv4 >= 0; IS_IPv4--) {
@@ -519,6 +541,27 @@ nm_l3_config_data_log(const NML3ConfigData *self,
                 _L("nis-domain: %s", self->nis_domain->str);
         }
 
+        if (!IS_IPv4) {
+            if (self->clat_config == NM_SETTING_IP4_CONFIG_CLAT_AUTO)
+                _L("clat-config: auto");
+            else if (self->clat_config == NM_SETTING_IP4_CONFIG_CLAT_FORCE)
+                _L("clat-config: force");
+
+            if (self->clat_state.enabled) {
+                _L("clat-state: ip4=%s/32, pref64=%s/%u, ip6=%s/64",
+                   nm_inet4_ntop(self->clat_state.ip4, sbuf + NM_INET_ADDRSTRLEN),
+                   nm_inet6_ntop(&self->clat_state.pref64, sbuf),
+                   self->clat_state.pref64_plen,
+                   nm_inet6_ntop(&self->clat_state.ip6, sbuf_addr));
+            }
+        }
+
+        if (!IS_IPv4 && self->pref64_valid) {
+            _L("pref64_prefix: %s/%d",
+               nm_utils_inet6_ntop(&self->pref64_prefix, sbuf_addr),
+               self->pref64_plen);
+        }
+
         if (self->dhcp_lease_x[IS_IPv4]) {
             gs_free NMUtilsNamedValue *options_free = NULL;
             NMUtilsNamedValue          options_buffer[30];
@@ -603,6 +646,10 @@ nm_l3_config_data_log(const NML3ConfigData *self,
            nm_utils_inet6_interface_identifier_to_token(&self->ip6_token, sbuf_addr));
     }
 
+    if (self->network_id) {
+        _L("network-id: %s", self->network_id->str);
+    }
+
     if (self->metered != NM_TERNARY_DEFAULT)
         _L("metered: %s", self->metered ? "yes" : "no");
 
@@ -709,6 +756,7 @@ nm_l3_config_data_new(NMDedupMultiIndex *multi_idx, int ifindex, NMIPConfigSourc
         .flags                          = NM_L3_CONFIG_DAT_FLAGS_NONE,
         .metered                        = NM_TERNARY_DEFAULT,
         .proxy_browser_only             = NM_TERNARY_DEFAULT,
+        .clat_config                    = NM_SETTING_IP4_CONFIG_CLAT_NO,
         .proxy_method                   = NM_PROXY_CONFIG_METHOD_UNKNOWN,
         .route_table_sync_4             = NM_IP_ROUTE_TABLE_SYNC_MODE_NONE,
         .route_table_sync_6             = NM_IP_ROUTE_TABLE_SYNC_MODE_NONE,
@@ -722,6 +770,7 @@ nm_l3_config_data_new(NMDedupMultiIndex *multi_idx, int ifindex, NMIPConfigSourc
         .ndisc_retrans_timer_msec_set   = FALSE,
         .allow_routes_without_address_4 = TRUE,
         .allow_routes_without_address_6 = TRUE,
+        .pref64_valid                   = FALSE,
     };
 
     _idx_type_init(&self->idx_addresses_4, NMP_OBJECT_TYPE_IP4_ADDRESS);
@@ -822,6 +871,7 @@ nm_l3_config_data_unref(const NML3ConfigData *self)
     nm_ref_string_unref(mutable->nis_domain);
     nm_ref_string_unref(mutable->proxy_pac_url);
     nm_ref_string_unref(mutable->proxy_pac_script);
+    nm_ref_string_unref(mutable->network_id);
 
     nm_g_slice_free(mutable);
 }
@@ -1890,22 +1940,42 @@ nm_l3_config_data_set_mtu(NML3ConfigData *self, guint32 mtu)
 }
 
 guint32
-nm_l3_config_data_get_ip6_mtu(const NML3ConfigData *self)
+nm_l3_config_data_get_ip6_mtu_static(const NML3ConfigData *self)
+{
+    nm_assert(_NM_IS_L3_CONFIG_DATA(self, TRUE));
+
+    return self->ip6_mtu_static;
+}
+
+gboolean
+nm_l3_config_data_set_ip6_mtu_static(NML3ConfigData *self, guint32 ip6_mtu)
+{
+    nm_assert(_NM_IS_L3_CONFIG_DATA(self, FALSE));
+
+    if (self->ip6_mtu_static == ip6_mtu)
+        return FALSE;
+
+    self->ip6_mtu_static = ip6_mtu;
+    return TRUE;
+}
+
+guint32
+nm_l3_config_data_get_ip6_mtu_ra(const NML3ConfigData *self)
 {
     nm_assert(_NM_IS_L3_CONFIG_DATA(self, TRUE));
 
-    return self->ip6_mtu;
+    return self->ip6_mtu_ra;
 }
 
 gboolean
-nm_l3_config_data_set_ip6_mtu(NML3ConfigData *self, guint32 ip6_mtu)
+nm_l3_config_data_set_ip6_mtu_ra(NML3ConfigData *self, guint32 ip6_mtu)
 {
     nm_assert(_NM_IS_L3_CONFIG_DATA(self, FALSE));
 
-    if (self->ip6_mtu == ip6_mtu)
+    if (self->ip6_mtu_ra == ip6_mtu)
         return FALSE;
 
-    self->ip6_mtu = ip6_mtu;
+    self->ip6_mtu_ra = ip6_mtu;
     return TRUE;
 }
 
@@ -1957,6 +2027,132 @@ nm_l3_config_data_set_ip6_token(NML3ConfigData *self, NMUtilsIPv6IfaceId ipv6_to
     return TRUE;
 }
 
+const char *
+nm_l3_config_data_get_network_id(const NML3ConfigData *self)
+{
+    nm_assert(_NM_IS_L3_CONFIG_DATA(self, TRUE));
+
+    return nm_ref_string_get_str(self->network_id);
+}
+
+gboolean
+nm_l3_config_data_set_network_id(NML3ConfigData *self, const char *value)
+{
+    nm_assert(_NM_IS_L3_CONFIG_DATA(self, FALSE));
+
+    return nm_ref_string_reset_str(&self->network_id, value);
+}
+
+gboolean
+nm_l3_config_data_set_clat_config(NML3ConfigData *self, NMSettingIp4ConfigClat val)
+{
+    nm_assert(_NM_IS_L3_CONFIG_DATA(self, FALSE));
+    nm_assert(NM_IN_SET(val,
+                        NM_SETTING_IP4_CONFIG_CLAT_NO,
+                        NM_SETTING_IP4_CONFIG_CLAT_FORCE,
+                        NM_SETTING_IP4_CONFIG_CLAT_AUTO));
+
+    if (self->clat_config == val)
+        return FALSE;
+    self->clat_config = val;
+    return TRUE;
+}
+
+NMSettingIp4ConfigClat
+nm_l3_config_data_get_clat_config(const NML3ConfigData *self)
+{
+    nm_assert(_NM_IS_L3_CONFIG_DATA(self, TRUE));
+
+    return self->clat_config;
+}
+
+gboolean
+nm_l3_config_data_get_clat_state(const NML3ConfigData *self,
+                                 struct in6_addr      *out_ip6,
+                                 struct in6_addr      *out_pref64,
+                                 guint8               *out_pref64_plen,
+                                 in_addr_t            *out_ip4)
+{
+    if (!self || !self->clat_state.enabled)
+        return FALSE;
+    NM_SET_OUT(out_ip6, self->clat_state.ip6);
+    NM_SET_OUT(out_pref64, self->clat_state.pref64);
+    NM_SET_OUT(out_pref64_plen, self->clat_state.pref64_plen);
+    NM_SET_OUT(out_ip4, self->clat_state.ip4);
+    return TRUE;
+}
+
+void
+nm_l3_config_data_set_clat_state(NML3ConfigData        *self,
+                                 gboolean               enabled,
+                                 const struct in6_addr *ip6,
+                                 const struct in6_addr *pref64,
+                                 guint8                 pref64_plen,
+                                 in_addr_t              ip4)
+{
+    nm_assert(_NM_IS_L3_CONFIG_DATA(self, FALSE));
+
+    self->clat_state.enabled = enabled;
+    if (enabled) {
+        self->clat_state.ip6         = *ip6;
+        self->clat_state.pref64      = *pref64;
+        self->clat_state.pref64_plen = pref64_plen;
+        self->clat_state.ip4         = ip4;
+    } else {
+        self->clat_state.ip6         = in6addr_any;
+        self->clat_state.pref64      = in6addr_any;
+        self->clat_state.pref64_plen = 0;
+        self->clat_state.ip4         = 0;
+    }
+}
+
+gboolean
+nm_l3_config_data_set_pref64_valid(NML3ConfigData *self, gboolean val)
+{
+    if (self->pref64_valid == val)
+        return FALSE;
+    self->pref64_valid = val;
+    return TRUE;
+}
+
+gboolean
+nm_l3_config_data_get_pref64_valid(const NML3ConfigData *self)
+{
+    nm_assert(_NM_IS_L3_CONFIG_DATA(self, TRUE));
+
+    return self->pref64_valid;
+}
+
+gboolean
+nm_l3_config_data_get_pref64(const NML3ConfigData *self,
+                             struct in6_addr      *out_prefix,
+                             guint32              *out_plen)
+{
+    nm_assert(_NM_IS_L3_CONFIG_DATA(self, TRUE));
+
+    if (!self->pref64_valid)
+        return FALSE;
+    NM_SET_OUT(out_prefix, self->pref64_prefix);
+    NM_SET_OUT(out_plen, self->pref64_plen);
+    return TRUE;
+}
+
+gboolean
+nm_l3_config_data_set_pref64(NML3ConfigData *self, struct in6_addr prefix, guint32 plen)
+{
+    if (self->pref64_valid) {
+        if (self->pref64_plen == plen
+            && nm_ip6_addr_same_prefix(&self->pref64_prefix, &prefix, plen)) {
+            return FALSE;
+        }
+    } else {
+        self->pref64_valid = TRUE;
+    }
+    self->pref64_prefix = prefix;
+    self->pref64_plen   = plen;
+    return TRUE;
+}
+
 NMMptcpFlags
 nm_l3_config_data_get_mptcp_flags(const NML3ConfigData *self)
 {
@@ -2294,8 +2490,8 @@ _dedup_multi_index_cmp(const NML3ConfigData *a,
             switch (obj_type) {
             case NMP_OBJECT_TYPE_IP4_ADDRESS:
                 NM_CMP_DIRECT(obj_a->ip4_address.plen, obj_b->ip4_address.plen);
-                NM_CMP_DIRECT(obj_b->ip4_address.address, obj_b->ip4_address.address);
-                NM_CMP_DIRECT(obj_b->ip4_address.peer_address, obj_b->ip4_address.peer_address);
+                NM_CMP_DIRECT(obj_a->ip4_address.address, obj_b->ip4_address.address);
+                NM_CMP_DIRECT(obj_a->ip4_address.peer_address, obj_b->ip4_address.peer_address);
                 break;
             case NMP_OBJECT_TYPE_IP6_ADDRESS:
                 NM_CMP_DIRECT(obj_a->ip6_address.plen, obj_b->ip6_address.plen);
@@ -2408,15 +2604,15 @@ nm_l3_config_data_cmp_full(const NML3ConfigData *a,
         const NMPObject *def_route_a = a->best_default_route_x[IS_IPv4];
         const NMPObject *def_route_b = b->best_default_route_x[IS_IPv4];
 
-        if (def_route_a != def_route_b) {
-            if (NM_FLAGS_HAS(flags, NM_L3_CONFIG_CMP_FLAGS_ROUTES)) {
-                NM_CMP_RETURN(
-                    nmp_object_cmp_full(def_route_a,
-                                        def_route_b,
-                                        NM_FLAGS_HAS(flags, NM_L3_CONFIG_CMP_FLAGS_IFINDEX)
-                                            ? NMP_OBJECT_CMP_FLAGS_NONE
-                                            : NMP_OBJECT_CMP_FLAGS_IGNORE_IFINDEX));
-            } else if (NM_FLAGS_HAS(flags, NM_L3_CONFIG_CMP_FLAGS_ROUTES_ID)) {
+        if (NM_FLAGS_HAS(flags, NM_L3_CONFIG_CMP_FLAGS_ROUTES)) {
+            NM_CMP_RETURN(nmp_object_cmp_full(def_route_a,
+                                              def_route_b,
+                                              NM_FLAGS_HAS(flags, NM_L3_CONFIG_CMP_FLAGS_IFINDEX)
+                                                  ? NMP_OBJECT_CMP_FLAGS_NONE
+                                                  : NMP_OBJECT_CMP_FLAGS_IGNORE_IFINDEX));
+        } else if (NM_FLAGS_HAS(flags, NM_L3_CONFIG_CMP_FLAGS_ROUTES_ID)) {
+            NM_CMP_DIRECT(!!def_route_a, !!def_route_b);
+            if (def_route_a && def_route_b) {
                 if (NM_FLAGS_HAS(flags, NM_L3_CONFIG_CMP_FLAGS_IFINDEX)) {
                     NM_CMP_DIRECT(def_route_a->obj_with_ifindex.ifindex,
                                   def_route_b->obj_with_ifindex.ifindex);
@@ -2484,8 +2680,10 @@ nm_l3_config_data_cmp_full(const NML3ConfigData *a,
     if (NM_FLAGS_HAS(flags, NM_L3_CONFIG_CMP_FLAGS_OTHER)) {
         NM_CMP_DIRECT(a->flags, b->flags);
         NM_CMP_DIRECT(a->ip6_token.id, b->ip6_token.id);
+        NM_CMP_DIRECT_REF_STRING(a->network_id, b->network_id);
         NM_CMP_DIRECT(a->mtu, b->mtu);
-        NM_CMP_DIRECT(a->ip6_mtu, b->ip6_mtu);
+        NM_CMP_DIRECT(a->ip6_mtu_static, b->ip6_mtu_static);
+        NM_CMP_DIRECT(a->ip6_mtu_ra, b->ip6_mtu_ra);
         NM_CMP_DIRECT_UNSAFE(a->metered, b->metered);
         NM_CMP_DIRECT_UNSAFE(a->proxy_browser_only, b->proxy_browser_only);
         NM_CMP_DIRECT_UNSAFE(a->proxy_method, b->proxy_method);
@@ -2509,6 +2707,23 @@ nm_l3_config_data_cmp_full(const NML3ConfigData *a,
         NM_CMP_DIRECT_UNSAFE(a->routed_dns_4, b->routed_dns_4);
         NM_CMP_DIRECT_UNSAFE(a->routed_dns_6, b->routed_dns_6);
 
+        NM_CMP_DIRECT_UNSAFE(a->clat_config, b->clat_config);
+
+        NM_CMP_DIRECT(!!a->clat_state.enabled, !!b->clat_state.enabled);
+        if (a->clat_state.enabled) {
+            NM_CMP_DIRECT_IN6ADDR(&a->clat_state.ip6, &b->clat_state.ip6);
+            NM_CMP_DIRECT_IN6ADDR(&a->clat_state.pref64, &b->clat_state.pref64);
+            NM_CMP_DIRECT(a->clat_state.pref64_plen, b->clat_state.pref64_plen);
+            NM_CMP_DIRECT(a->clat_state.ip4, b->clat_state.ip4);
+        }
+
+        NM_CMP_DIRECT(!!a->pref64_valid, !!b->pref64_valid);
+        if (a->pref64_valid) {
+            NM_CMP_DIRECT(a->pref64_plen, b->pref64_plen);
+            NM_CMP_RETURN_DIRECT(
+                nm_ip6_addr_same_prefix_cmp(&a->pref64_prefix, &b->pref64_prefix, a->pref64_plen));
+        }
+
         NM_CMP_FIELD(a, b, source);
     }
 
@@ -2524,8 +2739,10 @@ nm_l3_config_data_cmp_full(const NML3ConfigData *a,
 
 /*****************************************************************************/
 
-static const NMPObject *
-_data_get_direct_route_for_host(const NML3ConfigData *self, int addr_family, gconstpointer host)
+const NMPObject *
+nm_l3_config_data_get_direct_route_for_host(const NML3ConfigData *self,
+                                            int                   addr_family,
+                                            gconstpointer         host)
 {
     const int                 IS_IPv4        = NM_IS_IPv4(addr_family);
     const NMPObject          *best_route_obj = NULL;
@@ -2556,7 +2773,8 @@ _data_get_direct_route_for_host(const NML3ConfigData *self, int addr_family, gco
         if (!nm_ip_addr_same_prefix(addr_family, host, item->rx.network_ptr, item->rx.plen))
             continue;
 
-        if (best_route && best_route->rx.metric <= item->rx.metric)
+        if (best_route && best_route->rx.plen == item->rx.plen
+            && best_route->rx.metric <= item->rx.metric)
             continue;
 
         best_route_obj = item_obj;
@@ -2683,7 +2901,7 @@ nm_l3_config_data_add_dependent_onlink_routes(NML3ConfigData *self, int addr_fam
         if (NM_FLAGS_HAS(route_src->rx.r_rtm_flags, (unsigned) RTNH_F_ONLINK))
             continue;
 
-        if (_data_get_direct_route_for_host(self, addr_family, p_gateway))
+        if (nm_l3_config_data_get_direct_route_for_host(self, addr_family, p_gateway))
             continue;
 
         new_route = nmp_object_clone(obj_src, FALSE);
@@ -3027,6 +3245,9 @@ _init_from_connection_ip(NML3ConfigData *self, int addr_family, NMConnection *co
         nm_l3_config_data_set_ip6_privacy(
             self,
             nm_setting_ip6_config_get_ip6_privacy(NM_SETTING_IP6_CONFIG(s_ip)));
+        nm_l3_config_data_set_ip6_mtu_static(
+            self,
+            nm_setting_ip6_config_get_mtu(NM_SETTING_IP6_CONFIG(s_ip)));
     }
 }
 
@@ -3503,6 +3724,9 @@ nm_l3_config_data_merge(NML3ConfigData       *self,
     if (self->ip6_token.id == 0)
         self->ip6_token.id = src->ip6_token.id;
 
+    if (!self->network_id)
+        self->network_id = nm_ref_string_ref(src->network_id);
+
     self->metered = NM_MAX((NMTernary) self->metered, (NMTernary) src->metered);
 
     if (self->proxy_method == NM_PROXY_CONFIG_METHOD_UNKNOWN)
@@ -3541,8 +3765,11 @@ nm_l3_config_data_merge(NML3ConfigData       *self,
     if (self->mtu == 0u)
         self->mtu = src->mtu;
 
-    if (self->ip6_mtu == 0u)
-        self->ip6_mtu = src->ip6_mtu;
+    if (self->ip6_mtu_static == 0u)
+        self->ip6_mtu_static = src->ip6_mtu_static;
+
+    if (self->ip6_mtu_ra == 0u)
+        self->ip6_mtu_ra = src->ip6_mtu_ra;
 
     if (NM_FLAGS_HAS(merge_flags, NM_L3_CONFIG_MERGE_FLAGS_CLONE)) {
         _nm_unused nm_auto_unref_dhcplease NMDhcpLease *dhcp_lease_6 =
@@ -3564,6 +3791,24 @@ nm_l3_config_data_merge(NML3ConfigData       *self,
         self->routed_dns_4 = TRUE;
     if (src->routed_dns_6)
         self->routed_dns_6 = TRUE;
+
+    if (self->clat_config == NM_SETTING_IP4_CONFIG_CLAT_NO) {
+        /* 'no' always loses to 'force' and 'auto' */
+        self->clat_config = src->clat_config;
+    } else if (src->clat_config == NM_SETTING_IP4_CONFIG_CLAT_FORCE) {
+        /* 'force' always takes precedence */
+        self->clat_config = src->clat_config;
+    }
+
+    if (!self->clat_state.enabled && src->clat_state.enabled) {
+        self->clat_state = src->clat_state;
+    }
+
+    if (src->pref64_valid) {
+        self->pref64_prefix = src->pref64_prefix;
+        self->pref64_plen   = src->pref64_plen;
+        self->pref64_valid  = src->pref64_valid;
+    }
 }
 
 NML3ConfigData *
diff --git a/src/core/nm-l3-config-data.h b/src/core/nm-l3-config-data.h
index 4102b6e1..b76e11f9 100644
--- a/src/core/nm-l3-config-data.h
+++ b/src/core/nm-l3-config-data.h
@@ -5,6 +5,7 @@
 
 #include "libnm-glib-aux/nm-dedup-multi.h"
 #include "nm-setting-connection.h"
+#include "nm-setting-ip4-config.h"
 #include "nm-setting-ip6-config.h"
 #include "libnm-platform/nm-platform.h"
 #include "libnm-platform/nmp-object.h"
@@ -225,6 +226,10 @@ nm_l3_config_data_equal(const NML3ConfigData *a, const NML3ConfigData *b)
 
 /*****************************************************************************/
 
+const NMPObject *nm_l3_config_data_get_direct_route_for_host(const NML3ConfigData *self,
+                                                             int                   addr_family,
+                                                             gconstpointer         host);
+
 const NMDedupMultiIdxType *nm_l3_config_data_lookup_index(const NML3ConfigData *self,
                                                           NMPObjectType         obj_type);
 
@@ -482,14 +487,49 @@ guint32 nm_l3_config_data_get_mtu(const NML3ConfigData *self);
 
 gboolean nm_l3_config_data_set_mtu(NML3ConfigData *self, guint32 mtu);
 
-guint32 nm_l3_config_data_get_ip6_mtu(const NML3ConfigData *self);
+guint32 nm_l3_config_data_get_ip6_mtu_static(const NML3ConfigData *self);
+
+gboolean nm_l3_config_data_set_ip6_mtu_static(NML3ConfigData *self, guint32 ip6_mtu);
 
-gboolean nm_l3_config_data_set_ip6_mtu(NML3ConfigData *self, guint32 ip6_mtu);
+guint32 nm_l3_config_data_get_ip6_mtu_ra(const NML3ConfigData *self);
+
+gboolean nm_l3_config_data_set_ip6_mtu_ra(NML3ConfigData *self, guint32 ip6_mtu);
 
 NMUtilsIPv6IfaceId nm_l3_config_data_get_ip6_token(const NML3ConfigData *self);
 
 gboolean nm_l3_config_data_set_ip6_token(NML3ConfigData *self, NMUtilsIPv6IfaceId ipv6_token);
 
+gboolean nm_l3_config_data_set_network_id(NML3ConfigData *self, const char *network_id);
+
+const char *nm_l3_config_data_get_network_id(const NML3ConfigData *self);
+
+gboolean nm_l3_config_data_set_clat_config(NML3ConfigData *self, NMSettingIp4ConfigClat val);
+
+NMSettingIp4ConfigClat nm_l3_config_data_get_clat_config(const NML3ConfigData *self);
+
+gboolean nm_l3_config_data_get_clat_state(const NML3ConfigData *self,
+                                          struct in6_addr      *out_ip6,
+                                          struct in6_addr      *out_pref64,
+                                          guint8               *out_pref64_plen,
+                                          in_addr_t            *out_ip4);
+
+void nm_l3_config_data_set_clat_state(NML3ConfigData        *self,
+                                      gboolean               enabled,
+                                      const struct in6_addr *ip6,
+                                      const struct in6_addr *pref64,
+                                      guint8                 pref64_plen,
+                                      in_addr_t              ip4);
+
+gboolean nm_l3_config_data_set_pref64_valid(NML3ConfigData *self, gboolean val);
+
+gboolean nm_l3_config_data_get_pref64_valid(const NML3ConfigData *self);
+
+gboolean nm_l3_config_data_get_pref64(const NML3ConfigData *self,
+                                      struct in6_addr      *out_prefix,
+                                      guint32              *out_plen);
+
+gboolean nm_l3_config_data_set_pref64(NML3ConfigData *self, struct in6_addr prefix, guint32 plen);
+
 NMMptcpFlags nm_l3_config_data_get_mptcp_flags(const NML3ConfigData *self);
 
 gboolean nm_l3_config_data_set_mptcp_flags(NML3ConfigData *self, NMMptcpFlags mptcp_flags);
diff --git a/src/core/nm-l3cfg.c b/src/core/nm-l3cfg.c
index 88a9c241..98a2a2a6 100644
--- a/src/core/nm-l3cfg.c
+++ b/src/core/nm-l3cfg.c
@@ -7,10 +7,15 @@
 #include "libnm-std-aux/nm-linux-compat.h"
 
 #include <net/if.h>
+#include <net/if_arp.h>
 #include "nm-compat-headers/linux/if_addr.h"
 #include <linux/if_ether.h>
 #include <linux/rtnetlink.h>
 #include <linux/fib_rules.h>
+#if HAVE_CLAT
+#include <bpf/libbpf.h>
+#include <bpf/bpf.h>
+#endif /* HAVE_CLAT */
 
 #include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 #include "libnm-glib-aux/nm-prioq.h"
@@ -22,6 +27,13 @@
 #include "n-acd/src/n-acd.h"
 #include "nm-l3-ipv4ll.h"
 #include "nm-ip-config.h"
+#include "nm-core-utils.h"
+#if HAVE_CLAT
+#include "bpf/clat.h"
+NM_PRAGMA_WARNING_DISABLE("-Wcast-align")
+#include "bpf/clat.skel.h"
+NM_PRAGMA_WARNING_REENABLE
+#endif /* HAVE_CLAT */
 
 /*****************************************************************************/
 
@@ -289,6 +301,24 @@ typedef struct _NML3CfgPrivate {
         NMIPConfig *ipconfig_x[2];
     };
 
+#if HAVE_CLAT
+    /* The reserved IPv4 address for CLAT in the 192.0.0.0/28 range */
+    NMNetnsIPReservation *clat_address_4;
+    /* The IPv6 address for sending and receiving translated packets */
+    NMPlatformIP6Address clat_address_6;
+
+    /* The same addresses as above, but already committed previously */
+    NMNetnsIPReservation *clat_address_4_committed;
+    NMPlatformIP6Address  clat_address_6_committed;
+
+    /* If NULL, the BPF program hasn't been loaded or attached */
+    struct clat_bpf *clat_bpf;
+    struct bpf_link *clat_ingress_link;
+    struct bpf_link *clat_egress_link;
+
+    int clat_socket;
+#endif /* HAVE_CLAT */
+
     /* Whether we earlier configured MPTCP endpoints for the interface. */
     union {
         struct {
@@ -353,6 +383,9 @@ typedef struct _NML3CfgPrivate {
 
     bool rp_filter_handled : 1;
     bool rp_filter_set : 1;
+
+    bool clat_address_6_valid : 1;
+    bool clat_address_6_committed_valid : 1;
 } NML3CfgPrivate;
 
 struct _NML3CfgClass {
@@ -4107,6 +4140,291 @@ update_routes:
     }
 }
 
+#if HAVE_CLAT
+/**
+ * _clat_prefix_is_better:
+ * @best: current best candidate (or %NULL)
+ * @candidate: the new candidate prefix
+ * @nat64_pref: the NAT64 prefix
+ *
+ * Compare two SLAAC candidate prefixes to be used for CLAT,
+ * as recommended by draft-ietf-v6ops-claton Section 7. Apply
+ * rules 6 and 8 of the source address selection algorithm from
+ * RFC 6724, Section 5.
+ *
+ * Returns %TRUE if @candidate is better than @best.
+ */
+static gboolean
+_clat_prefix_is_better(const NMPlatformIP6Address *best,
+                       const NMPlatformIP6Address *candidate,
+                       const struct in6_addr      *nat64_pref)
+{
+    guint    nat64_pref_label;
+    gboolean best_label_match;
+    gboolean cand_label_match;
+    guint    best_prefix_len;
+    guint    cand_prefix_len;
+
+    if (!best)
+        return TRUE;
+
+    /* Rule 6: prefer the address whose RFC 6724 label matches
+     * the label of the NAT64 prefix. */
+    nat64_pref_label = nm_ip6_addr_rfc6724_label(nat64_pref);
+    best_label_match = nm_ip6_addr_rfc6724_label(&best->address) == nat64_pref_label;
+    cand_label_match = nm_ip6_addr_rfc6724_label(&candidate->address) == nat64_pref_label;
+
+    if (cand_label_match && !best_label_match)
+        return TRUE;
+    else if (best_label_match && !cand_label_match)
+        return FALSE;
+
+    /* Rule 8: longest matching prefix with the NAT64 prefix. */
+    best_prefix_len = nm_ip6_addr_common_prefix_len(&best->address, nat64_pref);
+    cand_prefix_len = nm_ip6_addr_common_prefix_len(&candidate->address, nat64_pref);
+    if (cand_prefix_len != best_prefix_len)
+        return cand_prefix_len > best_prefix_len;
+
+    return FALSE;
+}
+#endif /* HAVE_CLAT */
+
+static void
+_l3cfg_update_clat_config(NML3Cfg             *self,
+                          NML3ConfigData      *l3cd,
+                          const L3ConfigData **l3_config_datas_arr,
+                          guint                l3_config_datas_len)
+{
+#if !HAVE_CLAT
+    return;
+#else
+    struct in6_addr           pref64;
+    guint32                   pref64_plen;
+    gboolean                  clat_enabled = FALSE;
+    const NMPlatformIP4Route *ip4_route;
+    NMDedupMultiIter          iter;
+
+    switch (nm_l3_config_data_get_clat_config(l3cd)) {
+    case NM_SETTING_IP4_CONFIG_CLAT_FORCE:
+        clat_enabled = TRUE;
+        break;
+    case NM_SETTING_IP4_CONFIG_CLAT_NO:
+        clat_enabled = FALSE;
+        break;
+    case NM_SETTING_IP4_CONFIG_CLAT_AUTO:
+        clat_enabled = TRUE;
+        /* disable if there is a native IPv4 gateway */
+        nm_l3_config_data_iter_ip4_route_for_each (&iter, l3cd, &ip4_route) {
+            if (ip4_route->network == INADDR_ANY && ip4_route->plen == 0
+                && ip4_route->gateway != INADDR_ANY) {
+                clat_enabled = FALSE;
+                break;
+            }
+        }
+        break;
+    case NM_SETTING_IP4_CONFIG_CLAT_DEFAULT:
+        nm_assert_not_reached();
+        clat_enabled = TRUE;
+        break;
+    }
+
+    if (clat_enabled && nm_l3_config_data_get_pref64_valid(l3cd)) {
+        NMPlatformIPXRoute          rx;
+        NMIPAddrTyped               best_v6_gateway;
+        const NMPlatformIP6Route   *best_v6_route;
+        const NMPlatformIP6Address *ip6_entry;
+        struct in6_addr             ip6;
+        const char                 *network_id;
+        char                        buf[512];
+        guint32                     route4_metric = NM_PLATFORM_ROUTE_METRIC_DEFAULT_IP4;
+        guint                       i;
+
+        /* If we have a valid NAT64 prefix, configure in kernel:
+         *
+         * - a CLAT IPv4 address (192.0.0.x)
+         * - a IPv4 default route via the best IPv6 gateway
+         *
+         * We also set clat_address_6 as an additional /64 IPv6 address
+         * determined according to https://www.rfc-editor.org/rfc/rfc6877#section-6.3 .
+         * This address is used for sending and receiving translated packets,
+         * but is not configured in kernel to avoid that it gets used by applications.
+         * Later in _l3_commit_pref64() we use IPV6_JOIN_ANYCAST to let the kernel
+         * handle ND for the address.
+         */
+
+        nm_l3_config_data_get_pref64(l3cd, &pref64, &pref64_plen);
+        network_id = nm_l3_config_data_get_network_id(l3cd);
+
+        if (!self->priv.p->clat_address_6_valid && network_id) {
+            const NMPlatformIP6Address *best_prefix = NULL;
+
+            /* Select the best SLAAC prefix for the CLAT address per
+             * draft-ietf-v6ops-claton-14 Section 7 */
+            nm_l3_config_data_iter_ip6_address_for_each (&iter, l3cd, &ip6_entry) {
+                if (ip6_entry->addr_source == NM_IP_CONFIG_SOURCE_NDISC && ip6_entry->plen == 64) {
+                    if (_clat_prefix_is_better(best_prefix, ip6_entry, &pref64))
+                        best_prefix = ip6_entry;
+                }
+            }
+
+            if (best_prefix) {
+                ip6 = best_prefix->address;
+
+                nm_utils_ipv6_addr_set_stable_privacy(NM_UTILS_STABLE_TYPE_CLAT,
+                                                      &ip6,
+                                                      nm_l3cfg_get_ifname(self, TRUE),
+                                                      network_id,
+                                                      0);
+                self->priv.p->clat_address_6 = (NMPlatformIP6Address) {
+                    .ifindex      = self->priv.ifindex,
+                    .address      = ip6,
+                    .peer_address = ip6,
+                    .addr_source  = NM_IP_CONFIG_SOURCE_CLAT,
+                    .plen         = best_prefix->plen,
+                };
+
+                _LOGT("clat: using IPv6 address %s", nm_inet6_ntop(&ip6, buf));
+
+                self->priv.p->clat_address_6_valid = TRUE;
+            }
+        }
+
+        /* Don't get a v4 address if we have no v6 address (otherwise, we could
+         * potentially create broken v4 connectivity) */
+        if (!self->priv.p->clat_address_6_valid) {
+            _LOGW("CLAT is currently only supported when SLAAC is in use.");
+            /* Deallocate the v4 address unless it's the committed one */
+            if (self->priv.p->clat_address_4 != self->priv.p->clat_address_4_committed) {
+                nm_clear_pointer(&self->priv.p->clat_address_4, nm_netns_ip_reservation_release);
+            } else {
+                self->priv.p->clat_address_4 = NULL;
+            }
+        } else if (!self->priv.p->clat_address_4) {
+            /* We need a v4 /32 */
+            self->priv.p->clat_address_4 =
+                nm_netns_ip_reservation_get(self->priv.netns, NM_NETNS_IP_RESERVATION_TYPE_CLAT);
+        }
+
+        {
+            const NMPlatformIP4Route *r4;
+            guint32                   metric  = 0;
+            guint32                   penalty = 0;
+
+            /* Find the IPv4 metric for the CLAT default route.
+             * If there is another non-CLAT default route on the device, use the
+             * same metric + 1, so that native connectivity is always preferred.
+             * Otherwise, use the metric from the connection profile.
+             */
+
+            r4 = NMP_OBJECT_CAST_IP4_ROUTE(nm_l3_config_data_get_best_default_route(l3cd, AF_INET));
+
+            if (r4) {
+                route4_metric = nm_add_clamped_u32(r4->metric, 1u);
+            } else {
+                for (i = 0; i < l3_config_datas_len; i++) {
+                    const L3ConfigData *l3cd_data = l3_config_datas_arr[i];
+
+                    if (l3cd_data->default_route_metric_4 != NM_PLATFORM_ROUTE_METRIC_DEFAULT_IP4) {
+                        metric = l3cd_data->default_route_metric_4;
+                    }
+                    if (l3cd_data->default_route_penalty_4 != 0) {
+                        penalty = l3cd_data->default_route_penalty_4;
+                    }
+                }
+                route4_metric = nm_add_clamped_u32(metric, penalty);
+            }
+        }
+
+        if (self->priv.p->clat_address_4) {
+            best_v6_route = NMP_OBJECT_CAST_IP6_ROUTE(
+                nm_l3_config_data_get_direct_route_for_host(l3cd, AF_INET6, &pref64));
+            if (!best_v6_route) {
+                best_v6_route = NMP_OBJECT_CAST_IP6_ROUTE(
+                    nm_l3_config_data_get_best_default_route(l3cd, AF_INET6));
+            }
+            if (best_v6_route) {
+                NMPlatformIP4Address addr = {
+                    .ifindex      = self->priv.ifindex,
+                    .address      = self->priv.p->clat_address_4->addr,
+                    .peer_address = self->priv.p->clat_address_4->addr,
+                    .addr_source  = NM_IP_CONFIG_SOURCE_CLAT,
+                    .plen         = 32,
+                };
+                const NMPlatformLink *pllink;
+                guint                 mtu = 0;
+                guint                 val = 0;
+
+                best_v6_gateway.addr_family = AF_INET6;
+                best_v6_gateway.addr.addr6  = best_v6_route->gateway;
+
+                /* Determine the IPv6 MTU of the interface. Unfortunately,
+                 * the logic to set the MTU is in NMDevice and here we need
+                 * some duplication to find the actual value.
+                 * TODO: move the MTU handling into l3cfg. */
+
+                /* Get the link MTU */
+                pllink = nm_l3cfg_get_pllink(self, TRUE);
+                if (pllink)
+                    mtu = pllink->mtu;
+                if (mtu == 0)
+                    mtu = 1500;
+
+                /* Update it with the IPv6 MTU value from the connection
+                 * or from RA */
+                val = nm_l3_config_data_get_ip6_mtu_static(l3cd);
+                if (val == 0) {
+                    val = nm_l3_config_data_get_ip6_mtu_ra(l3cd);
+                }
+                if (val != 0 && val < mtu) {
+                    mtu = val;
+                }
+                if (mtu < 1280)
+                    mtu = 1280;
+
+                /* Leave 20 additional bytes for the ipv4 -> ipv6 header translation,
+                 * plus 8 for a potential fragmentation extension header */
+                mtu -= 28;
+
+                rx.r4 = (NMPlatformIP4Route) {
+                    .ifindex       = self->priv.ifindex,
+                    .rt_source     = NM_IP_CONFIG_SOURCE_CLAT,
+                    .network       = 0, /* default route */
+                    .plen          = 0,
+                    .table_coerced = nm_platform_route_table_coerce(RT_TABLE_MAIN),
+                    .scope_inv     = nm_platform_route_scope_inv(RT_SCOPE_UNIVERSE),
+                    .type_coerced  = nm_platform_route_type_coerce(RTN_UNICAST),
+                    .pref_src      = self->priv.p->clat_address_4->addr,
+                    .via           = best_v6_gateway,
+                    .metric        = route4_metric,
+                    .mtu           = mtu,
+                };
+                nm_platform_ip_route_normalize(AF_INET, &rx.rx);
+                if (!nm_l3_config_data_lookup_route(l3cd, AF_INET, &rx.rx)) {
+                    nm_l3_config_data_add_route_4(l3cd, &rx.r4);
+                }
+
+                _LOGT("clat: route %s", nm_platform_ip4_route_to_string(&rx.r4, buf, sizeof(buf)));
+
+                nm_l3_config_data_add_address_4(l3cd, &addr);
+            } else {
+                _LOGW("Couldn't find a good ipv6 route! Unable to set up CLAT!");
+            }
+        }
+
+        if (self->priv.p->clat_address_4 && self->priv.p->clat_address_6_valid) {
+            nm_l3_config_data_set_clat_state(l3cd,
+                                             TRUE,
+                                             &self->priv.p->clat_address_6.address,
+                                             &pref64,
+                                             pref64_plen,
+                                             self->priv.p->clat_address_4->addr);
+        } else {
+            nm_l3_config_data_set_clat_state(l3cd, FALSE, NULL, NULL, 0, INADDR_ANY);
+        }
+    }
+#endif /* HAVE_CLAT */
+}
+
 static void
 _l3cfg_update_combined_config(NML3Cfg               *self,
                               gboolean               to_commit,
@@ -4220,6 +4538,8 @@ _l3cfg_update_combined_config(NML3Cfg               *self,
                                     &hook_data);
         }
 
+        _l3cfg_update_clat_config(self, l3cd, l3_config_datas_arr, l3_config_datas_len);
+
         if (self->priv.ifindex == NM_LOOPBACK_IFINDEX) {
             NMPlatformIPXAddress ax;
             NMPlatformIPXRoute   rx;
@@ -4280,6 +4600,18 @@ _l3cfg_update_combined_config(NML3Cfg               *self,
     if (nm_l3_config_data_equal(l3cd, self->priv.p->combined_l3cd_merged))
         goto out;
 
+#if HAVE_CLAT
+    if (!l3cd) {
+        self->priv.p->clat_address_6_valid = FALSE;
+        /* Deallocate the v4 address unless it's the commited one */
+        if (self->priv.p->clat_address_4 != self->priv.p->clat_address_4_committed) {
+            nm_clear_pointer(&self->priv.p->clat_address_4, nm_netns_ip_reservation_release);
+        } else {
+            self->priv.p->clat_address_4 = NULL;
+        }
+    }
+#endif /* HAVE_CLAT */
+
     l3cd_old                           = g_steal_pointer(&self->priv.p->combined_l3cd_merged);
     self->priv.p->combined_l3cd_merged = nm_l3_config_data_seal(g_steal_pointer(&l3cd));
     merged_changed                     = TRUE;
@@ -5379,6 +5711,251 @@ _l3_commit_one(NML3Cfg              *self,
     _failedobj_handle_routes(self, addr_family, routes_failed);
 }
 
+#if HAVE_CLAT
+static void
+_l3_clat_destroy(NML3Cfg *self)
+{
+    char buf[100];
+    int  err;
+
+    if (self->priv.p->clat_bpf) {
+        const struct clat_stats *s = &self->priv.p->clat_bpf->bss->stats;
+
+        _LOGT("clat: stats:"
+              " egress (v4 to v6): tcp %" G_GUINT64_FORMAT ", udp %" G_GUINT64_FORMAT
+              ", icmp %" G_GUINT64_FORMAT ", other %" G_GUINT64_FORMAT
+              ", dropped %" G_GUINT64_FORMAT "; ingress (v6 to v4): tcp %" G_GUINT64_FORMAT
+              ", udp %" G_GUINT64_FORMAT ", icmp %" G_GUINT64_FORMAT ", other %" G_GUINT64_FORMAT
+              ", fragment %" G_GUINT64_FORMAT ", dropped %" G_GUINT64_FORMAT,
+              (guint64) s->egress_tcp,
+              (guint64) s->egress_udp,
+              (guint64) s->egress_icmp,
+              (guint64) s->egress_other,
+              (guint64) s->egress_dropped,
+              (guint64) s->ingress_tcp,
+              (guint64) s->ingress_udp,
+              (guint64) s->ingress_icmp,
+              (guint64) s->ingress_other,
+              (guint64) s->ingress_fragment,
+              (guint64) s->ingress_dropped);
+    }
+
+    if (self->priv.p->clat_ingress_link) {
+        err = bpf_link__destroy(self->priv.p->clat_ingress_link);
+        if (err != 0) {
+            libbpf_strerror(err, buf, sizeof(buf));
+            _LOGD("clat: failed to destroy the ingress link");
+        }
+        self->priv.p->clat_ingress_link = NULL;
+    }
+
+    if (self->priv.p->clat_egress_link) {
+        err = bpf_link__destroy(self->priv.p->clat_egress_link);
+        if (err != 0) {
+            libbpf_strerror(err, buf, sizeof(buf));
+            _LOGD("clat: failed to destroy the egress link");
+        }
+        self->priv.p->clat_egress_link = NULL;
+    }
+
+    nm_clear_pointer(&self->priv.p->clat_bpf, clat_bpf__destroy);
+}
+
+static void
+_l3_commit_pref64(NML3Cfg *self, NML3CfgCommitType commit_type)
+{
+    int                    err  = 0;
+    const NML3ConfigData  *l3cd = self->priv.p->combined_l3cd_commited;
+    struct in6_addr        _l3cd_pref64_inner;
+    const struct in6_addr *l3cd_pref64 = NULL;
+    guint32                l3cd_pref64_plen;
+    char                   buf[100];
+    struct clat_config     clat_config;
+    gboolean               v6_changed;
+    const NMPlatformLink  *pllink;
+    gboolean               has_ethernet_header = FALSE;
+
+    if (l3cd && nm_l3_config_data_get_pref64(l3cd, &_l3cd_pref64_inner, &l3cd_pref64_plen)) {
+        l3cd_pref64 = &_l3cd_pref64_inner;
+    }
+
+    if (l3cd_pref64 && self->priv.p->clat_address_4 && self->priv.p->clat_address_6_valid) {
+        pllink = nm_l3cfg_get_pllink(self, TRUE);
+        if (!pllink) {
+            has_ethernet_header = TRUE;
+        } else {
+            switch (pllink->arptype) {
+            case ARPHRD_ETHER:
+                has_ethernet_header = TRUE;
+                break;
+            case ARPHRD_NONE:
+            case ARPHRD_PPP:
+            case ARPHRD_RAWIP:
+                has_ethernet_header = FALSE;
+                break;
+            default:
+                _LOGD("clat: unknown ARP type %u, assuming the interface uses no L2 header",
+                      pllink->arptype);
+                has_ethernet_header = FALSE;
+            }
+        }
+
+        if (!self->priv.p->clat_bpf) {
+            _LOGT("clat: attaching the BPF program");
+
+            self->priv.p->clat_bpf = clat_bpf__open();
+            if (!self->priv.p->clat_bpf) {
+                libbpf_strerror(errno, buf, sizeof(buf));
+                _LOGW("clat: failed to open the BPF program: %s", buf);
+                return;
+            }
+
+            /* Only load the programs for the right L2 type */
+            bpf_program__set_autoload(self->priv.p->clat_bpf->progs.nm_clat_ingress_eth,
+                                      has_ethernet_header);
+            bpf_program__set_autoload(self->priv.p->clat_bpf->progs.nm_clat_egress_eth,
+                                      has_ethernet_header);
+            bpf_program__set_autoload(self->priv.p->clat_bpf->progs.nm_clat_ingress_rawip,
+                                      !has_ethernet_header);
+            bpf_program__set_autoload(self->priv.p->clat_bpf->progs.nm_clat_egress_rawip,
+                                      !has_ethernet_header);
+
+            if (clat_bpf__load(self->priv.p->clat_bpf)) {
+                libbpf_strerror(errno, buf, sizeof(buf));
+                _LOGW("clat: failed to load the BPF program: %s", buf);
+                nm_clear_pointer(&self->priv.p->clat_bpf, clat_bpf__destroy);
+                return;
+            }
+
+            self->priv.p->clat_ingress_link = bpf_program__attach_tcx(
+                has_ethernet_header ? self->priv.p->clat_bpf->progs.nm_clat_ingress_eth
+                                    : self->priv.p->clat_bpf->progs.nm_clat_ingress_rawip,
+                self->priv.ifindex,
+                NULL);
+            if (!self->priv.p->clat_ingress_link) {
+                libbpf_strerror(errno, buf, sizeof(buf));
+                _LOGW("clat: failed to attach the ingress program: %s", buf);
+                return;
+            }
+
+            self->priv.p->clat_egress_link = bpf_program__attach_tcx(
+                has_ethernet_header ? self->priv.p->clat_bpf->progs.nm_clat_egress_eth
+                                    : self->priv.p->clat_bpf->progs.nm_clat_egress_rawip,
+                self->priv.ifindex,
+                NULL);
+            if (!self->priv.p->clat_egress_link) {
+                libbpf_strerror(errno, buf, sizeof(buf));
+                _LOGW("clat: failed to attach the egress program: %s", buf);
+                return;
+            }
+
+            _LOGT("clat: program attached successfully");
+        }
+
+        /* Pass configuration to the BPF program */
+        memset(&clat_config, 0, sizeof(clat_config));
+        clat_config.local_v4.s_addr         = self->priv.p->clat_address_4->addr;
+        clat_config.local_v6                = self->priv.p->clat_address_6.address;
+        clat_config.pref64                  = *l3cd_pref64;
+        clat_config.pref64_len              = l3cd_pref64_plen;
+        self->priv.p->clat_bpf->bss->config = clat_config;
+
+        if (self->priv.p->clat_socket < 0) {
+            self->priv.p->clat_socket = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
+            if (self->priv.p->clat_socket < 0) {
+                _LOGW("clat: couldn't create the socket: %s", nm_strerror_native(errno));
+            }
+        }
+        if (self->priv.p->clat_socket >= 0) {
+            err = setsockopt(self->priv.p->clat_socket,
+                             SOL_SOCKET,
+                             SO_BINDTOIFINDEX,
+                             &self->priv.ifindex,
+                             sizeof(self->priv.ifindex));
+            if (err < 0) {
+                _LOGW("clat: couldn't bind the socket: %s", nm_strerror_native(errno));
+            }
+        }
+
+        v6_changed =
+            (self->priv.p->clat_address_6_valid != self->priv.p->clat_address_6_committed_valid)
+            || (self->priv.p->clat_address_6_valid && self->priv.p->clat_address_6_committed_valid
+                && memcmp(&self->priv.p->clat_address_6.address,
+                          &self->priv.p->clat_address_6_committed.address,
+                          sizeof(self->priv.p->clat_address_6_committed.address)));
+
+        if (self->priv.p->clat_socket > 0 && v6_changed) {
+            struct ipv6_mreq mreq = {.ipv6mr_interface = self->priv.ifindex};
+
+            if (self->priv.p->clat_address_6_committed_valid) {
+                mreq.ipv6mr_multiaddr = self->priv.p->clat_address_6_committed.address;
+
+                err = setsockopt(self->priv.p->clat_socket,
+                                 SOL_IPV6,
+                                 IPV6_LEAVE_ANYCAST,
+                                 &mreq,
+                                 sizeof(mreq));
+                if (err < 0) {
+                    _LOGW("clat: couldn't leave the anycast group: %s", nm_strerror_native(errno));
+                }
+            }
+
+            if (self->priv.p->clat_address_6_valid) {
+                /* As per draft-ietf-v6ops-claton-14, hosts must perform duplicate
+                 * addresses detection (DAD) on the generated CLAT IPv6 address. This is
+                 * necessary not only to avoid address collisions but also because some
+                 * networks drop traffic from addresses that have not done DAD.
+                 * Since doing true DAD adds complexity, adopt the same approach as
+                 * Android: start DAD by sending a neighbor solicitation and don't wait
+                 * for any reply. This avoids the problem with dropped traffic; it
+                 * doesn't help with collisions, but collisions are anyway very unlikely
+                 * because the interface identifier is a random 64-bit value.
+                 */
+                nm_utils_ipv6_dad_send(&self->priv.p->clat_address_6.address,
+                                       self->priv.ifindex,
+                                       pllink ? pllink->arptype : ARPHRD_ETHER);
+
+                mreq.ipv6mr_multiaddr = self->priv.p->clat_address_6.address;
+
+                err = setsockopt(self->priv.p->clat_socket,
+                                 SOL_IPV6,
+                                 IPV6_JOIN_ANYCAST,
+                                 &mreq,
+                                 sizeof(mreq));
+                if (err < 0) {
+                    _LOGW("clat: couldn't join the anycast group: %s", nm_strerror_native(errno));
+                }
+            }
+        }
+    } else {
+        if (self->priv.p->clat_bpf) {
+            _l3_clat_destroy(self);
+        }
+
+        /* Committed will get cleaned up below */
+        self->priv.p->clat_address_6_valid = FALSE;
+
+        nm_clear_fd(&self->priv.p->clat_socket);
+
+        /* Deallocate the v4 address. Committed address will get cleaned up below,
+           but we need to make sure there's no double-free */
+        if (self->priv.p->clat_address_4 != self->priv.p->clat_address_4_committed) {
+            nm_clear_pointer(&self->priv.p->clat_address_4, nm_netns_ip_reservation_release);
+        } else {
+            self->priv.p->clat_address_4 = NULL;
+        }
+    }
+
+    /* Record the new state */
+    if (self->priv.p->clat_address_4_committed != self->priv.p->clat_address_4) {
+        nm_clear_pointer(&self->priv.p->clat_address_4_committed, nm_netns_ip_reservation_release);
+        self->priv.p->clat_address_4_committed = self->priv.p->clat_address_4;
+    }
+    self->priv.p->clat_address_6_committed       = self->priv.p->clat_address_6;
+    self->priv.p->clat_address_6_committed_valid = self->priv.p->clat_address_6_valid;
+}
+#endif /* HAVE_CLAT */
+
 static void
 _l3_commit(NML3Cfg *self, NML3CfgCommitType commit_type, gboolean is_idle)
 {
@@ -5461,6 +6038,10 @@ _l3_commit(NML3Cfg *self, NML3CfgCommitType commit_type, gboolean is_idle)
 
     _l3_acd_data_process_changes(self);
 
+#if HAVE_CLAT
+    _l3_commit_pref64(self, commit_type);
+#endif /* HAVE_CLAT */
+
     nm_assert(self->priv.p->commit_reentrant_count == 1);
     self->priv.p->commit_reentrant_count--;
 
@@ -5842,6 +6423,10 @@ nm_l3cfg_init(NML3Cfg *self)
 {
     self->priv.p = G_TYPE_INSTANCE_GET_PRIVATE(self, NM_TYPE_L3CFG, NML3CfgPrivate);
 
+#if HAVE_CLAT
+    self->priv.p->clat_socket = -1;
+#endif /* HAVE_CLAT */
+
     c_list_init(&self->priv.p->acd_lst_head);
     c_list_init(&self->priv.p->acd_event_notify_lst_head);
     c_list_init(&self->priv.p->commit_type_lst_head);
@@ -5950,6 +6535,14 @@ finalize(GObject *object)
     if (changed)
         nmp_global_tracker_sync_mptcp_addrs(self->priv.global_tracker, FALSE);
 
+#if HAVE_CLAT
+    self->priv.p->clat_address_4_committed = NULL;
+    nm_clear_pointer(&self->priv.p->clat_address_4, nm_netns_ip_reservation_release);
+    nm_clear_fd(&self->priv.p->clat_socket);
+    if (self->priv.p->clat_bpf) {
+        _l3_clat_destroy(self);
+    }
+#endif
     g_clear_object(&self->priv.netns);
     g_clear_object(&self->priv.platform);
     nm_clear_pointer(&self->priv.global_tracker, nmp_global_tracker_unref);
diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
index 87dde2c3..7099cb8a 100644
--- a/src/core/nm-manager.c
+++ b/src/core/nm-manager.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <stdlib.h>
-#include <sys/sendfile.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -3585,34 +3584,6 @@ get_existing_connection(NMManager *self, NMDevice *device, gboolean *out_generat
 }
 
 static gboolean
-copy_lease(const char *src, const char *dst)
-{
-    nm_auto_close int src_fd = -1;
-    int               dst_fd;
-    ssize_t           res, size = SSIZE_MAX;
-
-    src_fd = open(src, O_RDONLY | O_CLOEXEC);
-    if (src_fd < 0)
-        return FALSE;
-
-    dst_fd = open(dst, O_CREAT | O_EXCL | O_CLOEXEC | O_WRONLY, 0644);
-    if (dst_fd < 0)
-        return FALSE;
-
-    while ((res = sendfile(dst_fd, src_fd, NULL, size)) > 0)
-        size -= res;
-
-    nm_close(dst_fd);
-
-    if (res != 0) {
-        unlink(dst);
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-static gboolean
 recheck_assume_connection(NMManager *self, NMDevice *device)
 {
     NMSettingsConnection *sett_conn;
@@ -3652,18 +3623,9 @@ recheck_assume_connection(NMManager *self, NMDevice *device)
     if (state == NM_DEVICE_STATE_UNMANAGED) {
         gs_free char *initramfs_lease =
             g_strdup_printf(RUNSTATEDIR "/initramfs/net.%s.lease", nm_device_get_iface(device));
-        gs_free char *connection_lease = g_strdup_printf(NMRUNDIR "/dhclient-%s-%s.lease",
-                                                         nm_settings_connection_get_uuid(sett_conn),
-                                                         nm_device_get_iface(device));
 
-        if (copy_lease(initramfs_lease, connection_lease)) {
+        if (g_file_test(initramfs_lease, G_FILE_TEST_EXISTS)) {
             unlink(initramfs_lease);
-            /*
-             * We've managed to steal the lease used by initramfs before it
-             * killed off the dhclient. We need to take ownership of the configured
-             * connection and act like the device was configured by us.
-             * Otherwise, the address would just expire.
-             */
             _LOG2I(LOGD_DEVICE, device, "assume: taking over an initramfs-configured connection");
             activation_type_assume = TRUE;
 
@@ -3885,10 +3847,19 @@ _get_best_connectivity(NMManager *self, int addr_family)
         if (NM_IS_DEVICE_LOOPBACK(dev))
             continue;
 
-        r = nm_device_get_best_default_route(dev, addr_family);
-        if (r)
+        r     = nm_device_get_best_default_route(dev, addr_family);
+        state = nm_device_get_connectivity_state(dev, addr_family);
+
+        if (r) {
+            /* If a default-route device is FULL, that is the global state: its
+             * route carries no penalty, so it outranks any non-FULL device (which
+             * gets +20000). Decide on the state directly, not the metric, which is
+             * stale here because the penalty commits to the route asynchronously
+             * after this recompute. */
+            if (nm_connectivity_state_cmp(state, NM_CONNECTIVITY_FULL) >= 0)
+                return NM_CONNECTIVITY_FULL;
             metric = NMP_OBJECT_CAST_IP_ROUTE(r)->metric;
-        else {
+        } else {
             /* if all devices have no default-route, we still include the best
              * of all connectivity state of all the devices. */
             metric = G_MAXINT64;
@@ -3896,11 +3867,10 @@ _get_best_connectivity(NMManager *self, int addr_family)
 
         if (metric > best_metric) {
             /* we already have a default route with better metric. The connectivity state
-             * of this device is irreleavnt. */
+             * of this device is irrelevant. */
             continue;
         }
 
-        state = nm_device_get_connectivity_state(dev, addr_family);
         if (metric < best_metric) {
             /* this device has a better default route. It wins. */
             best_metric = metric;
@@ -8146,6 +8116,27 @@ nm_manager_start(NMManager *self, GError **error)
     return TRUE;
 }
 
+static int
+compare_device_remove_order(const CList *a, const CList *b, const void *user_data)
+{
+    NMDevice *dev_a = c_list_entry(a, NMDevice, devices_lst);
+    NMDevice *dev_b = c_list_entry(b, NMDevice, devices_lst);
+
+    gboolean a_has_dhcp =
+        nm_device_get_dhcp_config(dev_a, AF_INET) || nm_device_get_dhcp_config(dev_a, AF_INET6);
+    gboolean b_has_dhcp =
+        nm_device_get_dhcp_config(dev_b, AF_INET) || nm_device_get_dhcp_config(dev_b, AF_INET6);
+    gboolean a_is_software = nm_device_is_software(dev_a);
+    gboolean b_is_software = nm_device_is_software(dev_b);
+
+    /* priority: software AND dhcp first, then dhcp only
+     * then everything else,*/
+    int a_score = a_has_dhcp ? (a_is_software ? 2 : 1) : 0;
+    int b_score = b_has_dhcp ? (b_is_software ? 2 : 1) : 0;
+
+    return b_score - a_score;
+}
+
 void
 nm_manager_stop(NMManager *self)
 {
@@ -8167,6 +8158,12 @@ nm_manager_stop(NMManager *self)
 
     nm_dbus_manager_stop(nm_dbus_object_get_manager(NM_DBUS_OBJECT(self)));
 
+    /* When OVS internal interface or linux bridge holds DHCP, if we delete its
+     * physical interface first, then we cannot send out DHCP release request
+     * anymore. To fix that, we need to remove/deactivate software interfaces that
+     * holds DHCP config first.
+     */
+    c_list_sort(&priv->devices_lst_head, compare_device_remove_order, NULL);
     while ((device = c_list_first_entry(&priv->devices_lst_head, NMDevice, devices_lst)))
         remove_device(self, device, TRUE);
 
diff --git a/src/core/nm-netns.c b/src/core/nm-netns.c
index 0e8b15a7..65142f4f 100644
--- a/src/core/nm-netns.c
+++ b/src/core/nm-netns.c
@@ -576,8 +576,8 @@ notify_watcher:
 typedef struct {
     const char *name;
     guint32     start_addr; /* host byte order */
-    guint       prefix_len;
-    guint       num_addrs;
+    guint       range_plen;
+    guint       addr_plen;
     gboolean    allow_reuse;
 } IPReservationTypeDesc;
 
@@ -585,11 +585,19 @@ static const IPReservationTypeDesc ip_reservation_types[_NM_NETNS_IP_RESERVATION
     [NM_NETNS_IP_RESERVATION_TYPE_SHARED4] =
         {
             .name        = "shared-ip4",
-            .start_addr  = 0x0a2a0001, /* 10.42.0.1 */
-            .prefix_len  = 24,
-            .num_addrs   = 256,
+            .start_addr  = 0x0a2a0001, /* 10.42.{0-255}.1/24 */
+            .range_plen  = 16,
+            .addr_plen   = 24,
             .allow_reuse = TRUE,
         },
+    [NM_NETNS_IP_RESERVATION_TYPE_CLAT] =
+        {
+            .name        = "clat",
+            .start_addr  = 0xc0000005, /* 192.0.0.{5-7,0-4}/32 */
+            .range_plen  = 29,
+            .addr_plen   = 32,
+            .allow_reuse = FALSE,
+        },
 };
 
 NMNetnsIPReservation *
@@ -615,13 +623,23 @@ nm_netns_ip_reservation_get(NMNetns *self, NMNetnsIPReservationType type)
         g_object_ref(self);
     } else {
         guint32 count;
+        guint32 base_network;
+        guint32 host_mask;
+        guint32 increment;
 
         nm_assert(g_hash_table_size(*table) > 0);
-        nm_assert(desc->prefix_len > 0 && desc->prefix_len <= 32);
+        nm_assert(desc->range_plen < 32);
+        nm_assert(desc->addr_plen > 0 && desc->addr_plen <= 32);
+        nm_assert(desc->addr_plen > desc->range_plen);
+
+        base_network = desc->start_addr & ~(0xFFFFFFFFu >> desc->range_plen);
+        host_mask    = 0xFFFFFFFFu >> desc->range_plen;
+        increment    = 1 << (32 - desc->addr_plen);
 
         count = 0u;
         for (;;) {
-            addr = htonl(desc->start_addr + (count << (32 - desc->prefix_len)));
+            addr = htonl(base_network
+                         + ((base_network + (desc->start_addr + count * increment)) & host_mask));
 
             res = g_hash_table_lookup(*table, &addr);
             if (!res)
@@ -629,7 +647,7 @@ nm_netns_ip_reservation_get(NMNetns *self, NMNetnsIPReservationType type)
 
             count++;
 
-            if (count >= desc->num_addrs) {
+            if (count >= 1 << (desc->addr_plen - desc->range_plen)) {
                 if (!desc->allow_reuse) {
                     _LOGE("%s: ran out of IP addresses", desc->name);
                     return NULL;
@@ -639,12 +657,12 @@ nm_netns_ip_reservation_get(NMNetns *self, NMNetnsIPReservationType type)
                     _LOGE("%s: ran out of IP addresses. Reuse %s/%u",
                           desc->name,
                           nm_inet4_ntop(res->addr, buf),
-                          desc->prefix_len);
+                          desc->addr_plen);
                 } else {
                     _LOGD("%s: reserved IP address %s/%u (duplicate)",
                           desc->name,
                           nm_inet4_ntop(res->addr, buf),
-                          desc->prefix_len);
+                          desc->addr_plen);
                 }
                 res->_ref_count++;
                 return res;
@@ -665,7 +683,7 @@ nm_netns_ip_reservation_get(NMNetns *self, NMNetnsIPReservationType type)
     _LOGD("%s: reserved IP address %s/%u",
           desc->name,
           nm_inet4_ntop(res->addr, buf),
-          desc->prefix_len);
+          desc->addr_plen);
     return res;
 }
 
@@ -697,7 +715,7 @@ nm_netns_ip_reservation_release(NMNetnsIPReservation *res)
         _LOGD("%s: release IP address reservation %s/%u (%d more references held)",
               desc->name,
               nm_inet4_ntop(res->addr, buf),
-              desc->prefix_len,
+              desc->addr_plen,
               res->_ref_count);
         return;
     }
@@ -708,7 +726,7 @@ nm_netns_ip_reservation_release(NMNetnsIPReservation *res)
     _LOGD("%s: release IP address reservation %s/%u",
           desc->name,
           nm_inet4_ntop(res->addr, buf),
-          desc->prefix_len);
+          desc->addr_plen);
 
     if (g_hash_table_size(*table) == 0) {
         nm_clear_pointer(table, g_hash_table_unref);
diff --git a/src/core/nm-netns.h b/src/core/nm-netns.h
index 5ddb852a..e32d5680 100644
--- a/src/core/nm-netns.h
+++ b/src/core/nm-netns.h
@@ -43,6 +43,7 @@ NML3Cfg *nm_netns_l3cfg_acquire(NMNetns *netns, int ifindex);
 
 typedef enum {
     NM_NETNS_IP_RESERVATION_TYPE_SHARED4,
+    NM_NETNS_IP_RESERVATION_TYPE_CLAT,
 
     _NM_NETNS_IP_RESERVATION_TYPE_NUM,
 } NMNetnsIPReservationType;
diff --git a/src/core/nm-pacrunner-manager.c b/src/core/nm-pacrunner-manager.c
index 12c3c9a1..9f4a294b 100644
--- a/src/core/nm-pacrunner-manager.c
+++ b/src/core/nm-pacrunner-manager.c
@@ -122,43 +122,6 @@ NM_AUTO_DEFINE_FCN0(NMPacrunnerConfId *, _nm_auto_unref_conf_id, conf_id_unref);
 
 /*****************************************************************************/
 
-static void
-get_ip_domains(GPtrArray *domains, const NML3ConfigData *l3cd, int addr_family)
-{
-    NMDedupMultiIter           ipconf_iter;
-    char                      *cidr;
-    guint                      num;
-    guint                      i;
-    char                       sbuf[NM_INET_ADDRSTRLEN];
-    const NMPlatformIPAddress *address;
-    const NMPlatformIPRoute   *route;
-    const char *const         *strv;
-
-    strv = nm_l3_config_data_get_searches(l3cd, addr_family, &num);
-    for (i = 0; i < num; i++)
-        g_ptr_array_add(domains, g_strdup(strv[i]));
-
-    strv = nm_l3_config_data_get_domains(l3cd, addr_family, &num);
-    for (i = 0; i < num; i++)
-        g_ptr_array_add(domains, g_strdup(strv[i]));
-
-    nm_l3_config_data_iter_ip_address_for_each (&ipconf_iter, l3cd, addr_family, &address) {
-        cidr = g_strdup_printf("%s/%u",
-                               nm_inet_ntop(addr_family, address->address_ptr, sbuf),
-                               address->plen);
-        g_ptr_array_add(domains, cidr);
-    }
-
-    nm_l3_config_data_iter_ip_route_for_each (&ipconf_iter, l3cd, addr_family, &route) {
-        if (NM_PLATFORM_IP_ROUTE_IS_DEFAULT(route))
-            continue;
-        cidr = g_strdup_printf("%s/%u",
-                               nm_inet_ntop(addr_family, route->network_ptr, sbuf),
-                               route->plen);
-        g_ptr_array_add(domains, cidr);
-    }
-}
-
 static GVariant *
 _make_request_create_proxy_configuration(const char *iface, const NML3ConfigData *l3cd)
 {
@@ -198,23 +161,6 @@ _make_request_create_proxy_configuration(const char *iface, const NML3ConfigData
         "BrowserOnly",
         g_variant_new_boolean(l3cd ? !!nm_l3_config_data_get_proxy_browser_only(l3cd) : FALSE));
 
-    if (l3cd) {
-        gs_unref_ptrarray GPtrArray *domains = NULL;
-
-        domains = g_ptr_array_new_with_free_func(g_free);
-
-        get_ip_domains(domains, l3cd, AF_INET);
-        get_ip_domains(domains, l3cd, AF_INET6);
-
-        if (domains->len > 0) {
-            g_variant_builder_add(
-                &builder,
-                "{sv}",
-                "Domains",
-                g_variant_new_strv((const char *const *) domains->pdata, domains->len));
-        }
-    }
-
     return g_variant_new("(a{sv})", &builder);
 }
 
diff --git a/src/core/nm-policy.c b/src/core/nm-policy.c
index f7be1a9f..48c004bf 100644
--- a/src/core/nm-policy.c
+++ b/src/core/nm-policy.c
@@ -204,10 +204,10 @@ expire_ip6_delegations(NMPolicy *self)
     IP6PrefixDelegation *delegation = NULL;
     guint                i;
 
-    for (i = 0; i < priv->ip6_prefix_delegations->len; i++) {
-        delegation = &nm_g_array_index(priv->ip6_prefix_delegations, IP6PrefixDelegation, i);
+    for (i = priv->ip6_prefix_delegations->len; i > 0; i--) {
+        delegation = &nm_g_array_index(priv->ip6_prefix_delegations, IP6PrefixDelegation, i - 1);
         if (delegation->prefix.timestamp + delegation->prefix.lifetime < now)
-            g_array_remove_index_fast(priv->ip6_prefix_delegations, i);
+            g_array_remove_index(priv->ip6_prefix_delegations, i - 1);
     }
 }
 
@@ -253,7 +253,7 @@ ip6_subnet_from_delegation(IP6PrefixDelegation *delegation, NMDevice *device)
     }
 
     /* Check for out-of-prefixes condition */
-    num_subnets = 1 << (64 - delegation->prefix.plen);
+    num_subnets = (guint64) 1 << (64 - delegation->prefix.plen);
     if (nm_g_hash_table_size(delegation->map_subnet_id_to_ifindex) >= num_subnets) {
         _LOGD(LOGD_IP6,
               "ipv6-pd: no more prefixes in %s/%u",
@@ -378,10 +378,10 @@ ip6_remove_device_prefix_delegations(NMPolicy *self, NMDevice *device)
     IP6PrefixDelegation *delegation = NULL;
     guint                i;
 
-    for (i = 0; i < priv->ip6_prefix_delegations->len; i++) {
-        delegation = &nm_g_array_index(priv->ip6_prefix_delegations, IP6PrefixDelegation, i);
+    for (i = priv->ip6_prefix_delegations->len; i > 0; i--) {
+        delegation = &nm_g_array_index(priv->ip6_prefix_delegations, IP6PrefixDelegation, i - 1);
         if (delegation->device == device)
-            g_array_remove_index_fast(priv->ip6_prefix_delegations, i);
+            g_array_remove_index(priv->ip6_prefix_delegations, i - 1);
     }
 }
 
diff --git a/src/core/ppp/nm-pppd-plugin.c b/src/core/ppp/nm-pppd-plugin.c
index c8a866ec..0bf58a0c 100644
--- a/src/core/ppp/nm-pppd-plugin.c
+++ b/src/core/ppp/nm-pppd-plugin.c
@@ -198,7 +198,7 @@ nm_ip_up(void *data, int arg)
         g_variant_builder_add(&builder,
                               "{sv}",
                               NM_PPP_IP4_CONFIG_GATEWAY,
-                              g_variant_new_uint32(peer_opts.ouraddr));
+                              g_variant_new_uint32(peer_opts.hisaddr));
     }
 
     g_variant_builder_add(&builder, "{sv}", NM_PPP_IP4_CONFIG_PREFIX, g_variant_new_uint32(32));
diff --git a/src/core/settings/nm-settings-connection.c b/src/core/settings/nm-settings-connection.c
index 7ed3712b..c8f5f290 100644
--- a/src/core/settings/nm-settings-connection.c
+++ b/src/core/settings/nm-settings-connection.c
@@ -1866,6 +1866,8 @@ impl_settings_connection_update2(NMDBusObject                      *obj,
 
     g_variant_iter_init(&iter, args);
     while (g_variant_iter_next(&iter, "{&sv}", &args_name, &args_value)) {
+        gs_unref_variant GVariant *args_value_unref = args_value;
+
         if (plugin_name == NULL && nm_streq(args_name, "plugin")
             && g_variant_is_of_type(args_value, G_VARIANT_TYPE_STRING)) {
             plugin_name = g_variant_dup_string(args_value, NULL);
diff --git a/src/core/settings/nm-settings.c b/src/core/settings/nm-settings.c
index 702c53d5..3fe9c76a 100644
--- a/src/core/settings/nm-settings.c
+++ b/src/core/settings/nm-settings.c
@@ -2934,6 +2934,8 @@ impl_settings_add_connection2(NMDBusObject                      *obj,
 
     g_variant_iter_init(&iter, args);
     while (g_variant_iter_next(&iter, "{&sv}", &args_name, &args_value)) {
+        gs_unref_variant GVariant *args_value_unref = args_value;
+
         if (plugin == NULL && nm_streq(args_name, "plugin")
             && g_variant_is_of_type(args_value, G_VARIANT_TYPE_STRING)) {
             plugin = g_variant_dup_string(args_value, NULL);
diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index 728dccac..6312154c 100644
--- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -4401,7 +4401,7 @@ make_wireless_setting(shvarFile *ifcfg, GError **error)
     NMSettingWireless         *s_wireless;
     const char                *cvalue;
     char                      *value = NULL;
-    gint64                     chan  = 0;
+    guint64                    chan  = 0;
     NMSettingMacRandomization  mac_randomization;
     NMSettingWirelessPowersave powersave = NM_SETTING_WIRELESS_POWERSAVE_DEFAULT;
     NMTernary                  ternary;
@@ -4502,7 +4502,7 @@ make_wireless_setting(shvarFile *ifcfg, GError **error)
 
     value = svGetValueStr_cp(ifcfg, "CHANNEL");
     if (value) {
-        chan = _nm_utils_ascii_str_to_int64(value, 10, 1, 196, 0);
+        chan = _nm_utils_ascii_str_to_int64(value, 10, 1, _NM_WIFI_CHANNEL_MAX, 0);
         if (chan == 0) {
             g_set_error(error,
                         NM_SETTINGS_ERROR,
@@ -4518,19 +4518,18 @@ make_wireless_setting(shvarFile *ifcfg, GError **error)
 
     value = svGetValueStr_cp(ifcfg, "BAND");
     if (value) {
-        if (!strcmp(value, "a")) {
-            if (chan && chan <= 14) {
-                g_set_error(error,
-                            NM_SETTINGS_ERROR,
-                            NM_SETTINGS_ERROR_INVALID_CONNECTION,
-                            "Band '%s' invalid for channel %u",
-                            value,
-                            (guint32) chan);
-                g_free(value);
-                goto error;
-            }
-        } else if (!strcmp(value, "bg")) {
-            if (chan && chan > 14) {
+        if (!NM_IN_STRSET(value, "a", "bg", "6GHz")) {
+            g_set_error(error,
+                        NM_SETTINGS_ERROR,
+                        NM_SETTINGS_ERROR_INVALID_CONNECTION,
+                        "Band '%s' invalid",
+                        value);
+            g_free(value);
+            goto error;
+        }
+
+        if (chan) {
+            if (!nm_utils_wifi_is_channel_valid(chan, value)) {
                 g_set_error(error,
                             NM_SETTINGS_ERROR,
                             NM_SETTINGS_ERROR_INVALID_CONNECTION,
@@ -4540,22 +4539,26 @@ make_wireless_setting(shvarFile *ifcfg, GError **error)
                 g_free(value);
                 goto error;
             }
-        } else {
+        }
+
+        g_object_set(s_wireless, NM_SETTING_WIRELESS_BAND, value, NULL);
+        g_free(value);
+    } else if (chan > 0) {
+        if (chan > _NM_WIFI_CHANNEL_MAX_5GHZ) {
             g_set_error(error,
                         NM_SETTINGS_ERROR,
                         NM_SETTINGS_ERROR_INVALID_CONNECTION,
-                        "Invalid wireless band '%s'",
-                        value);
+                        "Setting channel without band is ambiguous and deprecated. Not supported "
+                        "for 6GHz.");
             g_free(value);
             goto error;
-        }
-        g_object_set(s_wireless, NM_SETTING_WIRELESS_BAND, value, NULL);
-        g_free(value);
-    } else if (chan > 0) {
-        if (chan > 14)
+        } else if (chan > _NM_WIFI_CHANNEL_MAX_2GHZ) {
+            PARSE_WARNING(
+                "Setting channel without band is ambiguous and deprecated. Assuming band 'a'.");
             g_object_set(s_wireless, NM_SETTING_WIRELESS_BAND, "a", NULL);
-        else
+        } else {
             g_object_set(s_wireless, NM_SETTING_WIRELESS_BAND, "bg", NULL);
+        }
     }
 
     value = svGetValueStr_cp(ifcfg, "MTU");
diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index 21908090..dc60fdf1 100644
--- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -849,7 +849,7 @@ write_wireless_setting(NMConnection *connection,
     GBytes            *ssid;
     const guint8      *ssid_data;
     gsize              ssid_len;
-    const char        *mode, *bssid;
+    const char        *mode, *bssid, *band;
     const char        *device_mac, *cloned_mac;
     guint32            mtu, chan, i;
     gboolean           adhoc = FALSE, hex_ssid = FALSE;
@@ -968,9 +968,11 @@ write_wireless_setting(NMConnection *connection,
     chan = nm_setting_wireless_get_channel(s_wireless);
     if (chan) {
         svSetValueInt64(ifcfg, "CHANNEL", chan);
-    } else {
-        /* Band only set if channel is not, since channel implies band */
-        svSetValueStr(ifcfg, "BAND", nm_setting_wireless_get_band(s_wireless));
+    }
+
+    band = nm_setting_wireless_get_band(s_wireless);
+    if (band) {
+        svSetValueStr(ifcfg, "BAND", band);
     }
 
     bssid = nm_setting_wireless_get_bssid(s_wireless);
@@ -3598,6 +3600,7 @@ do_write_construct(NMConnection                   *connection,
     } else
         route_ignore = FALSE;
 
+    /* Unsupported properties */
     if ((s_ip4 = nm_connection_get_setting_ip4_config(connection))) {
         if (nm_setting_ip_config_get_dhcp_dscp(s_ip4)) {
             set_error_unsupported(error,
@@ -3616,6 +3619,14 @@ do_write_construct(NMConnection                   *connection,
                                   FALSE);
             return FALSE;
         }
+        if (nm_setting_ip4_config_get_clat(NM_SETTING_IP4_CONFIG(s_ip4))
+            != NM_SETTING_IP4_CONFIG_CLAT_DEFAULT) {
+            set_error_unsupported(error,
+                                  connection,
+                                  NM_SETTING_IP4_CONFIG_SETTING_NAME "." NM_SETTING_IP4_CONFIG_CLAT,
+                                  FALSE);
+            return FALSE;
+        }
     }
 
     write_ip4_setting(connection,
diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected
index caeaaff8..8199a9b4 100644
--- a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected
@@ -1,6 +1,7 @@
 ESSID=MySSID
 MODE=Ap
-CHANNEL=196
+CHANNEL=52
+BAND=a
 MAC_ADDRESS_RANDOMIZATION=default
 AP_ISOLATION=yes
 TYPE=Wireless
diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_6ghz.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_6ghz.cexpected
new file mode 100644
index 00000000..d8ffe48e
--- /dev/null
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_6ghz.cexpected
@@ -0,0 +1,18 @@
+ESSID="Test SSID"
+MODE=Managed
+BAND=6GHz
+MAC_ADDRESS_RANDOMIZATION=default
+TYPE=Wireless
+PROXY_METHOD=none
+BROWSER_ONLY=no
+BOOTPROTO=dhcp
+DEFROUTE=yes
+IPV4_FAILURE_FATAL=no
+IPV6INIT=yes
+IPV6_AUTOCONF=yes
+IPV6_DEFROUTE=yes
+IPV6_FAILURE_FATAL=no
+IPV6_ADDR_GEN_MODE=default
+NAME="Test Write Wi-Fi Band 6GHz"
+UUID=${UUID}
+ONBOOT=yes
diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_a.cexpected
index 7e3d4f02..90570ea3 100644
--- a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_a.cexpected
@@ -13,6 +13,6 @@ IPV6_AUTOCONF=yes
 IPV6_DEFROUTE=yes
 IPV6_FAILURE_FATAL=no
 IPV6_ADDR_GEN_MODE=default
-NAME="Test Write Wi-Fi Band A"
+NAME="Test Write Wi-Fi Band A - 5GHz"
 UUID=${UUID}
 ONBOOT=yes
diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-6ghz b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-6ghz
new file mode 100644
index 00000000..803ca19b
--- /dev/null
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-6ghz
@@ -0,0 +1,13 @@
+TYPE=Wireless
+DEVICE=eth2
+HWADDR=00:16:41:11:22:33
+NM_CONTROLLED=yes
+BOOTPROTO=dhcp
+ESSID=blahblah
+BAND=6GHz
+MODE=Managed
+RATE=auto
+ONBOOT=yes
+USERCTL=yes
+PEERDNS=yes
+IPV6INIT=no
diff --git a/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-6ghz-channel-mismatch b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-6ghz-channel-mismatch
new file mode 100644
index 00000000..26fc29fe
--- /dev/null
+++ b/src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-6ghz-channel-mismatch
@@ -0,0 +1,9 @@
+TYPE=Wireless
+DEVICE=eth2
+HWADDR=00:16:41:11:22:33
+BOOTPROTO=dhcp
+ESSID=blahblah
+CHANNEL=14
+BAND=6GHz
+MODE=Managed
+
diff --git a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
index 2f3035ef..f5f80ed8 100644
--- a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -3991,7 +3991,7 @@ test_write_wifi_band_a(void)
     s_con = _nm_connection_new_setting(connection, NM_TYPE_SETTING_CONNECTION);
     g_object_set(s_con,
                  NM_SETTING_CONNECTION_ID,
-                 "Test Write Wi-Fi Band A",
+                 "Test Write Wi-Fi Band A - 5GHz",
                  NM_SETTING_CONNECTION_UUID,
                  nm_uuid_generate_random_str_a(),
                  NM_SETTING_CONNECTION_TYPE,
@@ -4012,7 +4012,7 @@ test_write_wifi_band_a(void)
 
     _writer_new_connec_exp(connection,
                            TEST_SCRATCH_DIR,
-                           TEST_IFCFG_DIR "/ifcfg-Test_Write_WiFi_Band_A.cexpected",
+                           TEST_IFCFG_DIR "/ifcfg-Test_Write_WiFi_Band_a.cexpected",
                            &testfile);
 
     f = _svOpenFile(testfile);
@@ -4025,6 +4025,77 @@ test_write_wifi_band_a(void)
 }
 
 static void
+test_read_wifi_band_6ghz(void)
+{
+    gs_unref_object NMConnection *connection = NULL;
+    NMSettingConnection          *s_con;
+    NMSettingWireless            *s_wifi;
+
+    connection = _connection_from_file(TEST_IFCFG_DIR "/ifcfg-test-wifi-band-6ghz",
+                                       NULL,
+                                       TYPE_WIRELESS,
+                                       NULL);
+
+    s_con = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_CONNECTION);
+    g_assert_cmpstr(nm_setting_connection_get_connection_type(s_con),
+                    ==,
+                    NM_SETTING_WIRELESS_SETTING_NAME);
+
+    s_wifi = nmtst_connection_assert_setting(connection, NM_TYPE_SETTING_WIRELESS);
+    g_assert_cmpstr(nm_setting_wireless_get_band(s_wifi), ==, "6GHz");
+}
+
+static void
+test_write_wifi_band_6ghz(void)
+{
+    nmtst_auto_unlinkfile char   *testfile   = NULL;
+    gs_unref_object NMConnection *connection = NULL;
+    gs_unref_object NMConnection *reread     = NULL;
+    NMSettingConnection          *s_con;
+    NMSettingWireless            *s_wifi;
+    shvarFile                    *f;
+    gs_unref_bytes GBytes        *ssid =
+        nmtst_gbytes_from_arr(0x54, 0x65, 0x73, 0x74, 0x20, 0x53, 0x53, 0x49, 0x44);
+
+    connection = nm_simple_connection_new();
+
+    s_con = _nm_connection_new_setting(connection, NM_TYPE_SETTING_CONNECTION);
+    g_object_set(s_con,
+                 NM_SETTING_CONNECTION_ID,
+                 "Test Write Wi-Fi Band 6GHz",
+                 NM_SETTING_CONNECTION_UUID,
+                 nm_uuid_generate_random_str_a(),
+                 NM_SETTING_CONNECTION_TYPE,
+                 NM_SETTING_WIRELESS_SETTING_NAME,
+                 NULL);
+
+    s_wifi = _nm_connection_new_setting(connection, NM_TYPE_SETTING_WIRELESS);
+    g_object_set(s_wifi,
+                 NM_SETTING_WIRELESS_SSID,
+                 ssid,
+                 NM_SETTING_WIRELESS_MODE,
+                 "infrastructure",
+                 NM_SETTING_WIRELESS_BAND,
+                 "6GHz",
+                 NULL);
+
+    nmtst_assert_connection_verifies(connection);
+
+    _writer_new_connec_exp(connection,
+                           TEST_SCRATCH_DIR,
+                           TEST_IFCFG_DIR "/ifcfg-Test_Write_WiFi_Band_6ghz.cexpected",
+                           &testfile);
+
+    f = _svOpenFile(testfile);
+    _svGetValue_check(f, "BAND", "6GHz");
+    svCloseFile(f);
+
+    reread = _connection_from_file(testfile, NULL, TYPE_WIRELESS, NULL);
+
+    nmtst_assert_connection_equals(connection, TRUE, reread, FALSE);
+}
+
+static void
 test_write_wifi_ap_mode(void)
 {
     nmtst_auto_unlinkfile char   *testfile   = NULL;
@@ -4055,7 +4126,7 @@ test_write_wifi_ap_mode(void)
                  NM_SETTING_WIRELESS_BAND,
                  "a",
                  NM_SETTING_WIRELESS_CHANNEL,
-                 (guint) 196,
+                 (guint) 52,
                  NM_SETTING_WIRELESS_AP_ISOLATION,
                  NM_TERNARY_TRUE,
                  NULL);
@@ -4073,6 +4144,18 @@ test_write_wifi_ap_mode(void)
 }
 
 static void
+test_read_wifi_band_6ghz_channel_mismatch(void)
+{
+    gs_free_error GError *error = NULL;
+
+    _connection_from_file_fail(TEST_IFCFG_DIR "/ifcfg-test-wifi-band-6ghz-channel-mismatch",
+                               NULL,
+                               TYPE_WIRELESS,
+                               &error);
+    g_assert_error(error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION);
+}
+
+static void
 test_read_wifi_band_a_channel_mismatch(void)
 {
     gs_free_error GError *error = NULL;
@@ -10680,6 +10763,9 @@ main(int argc, char **argv)
                     test_read_wifi_band_a_channel_mismatch);
     g_test_add_func(TPATH "wifi/read-band-bg-channel-mismatch",
                     test_read_wifi_band_bg_channel_mismatch);
+    g_test_add_func(TPATH "wifi/read-band-6ghz", test_read_wifi_band_6ghz);
+    g_test_add_func(TPATH "wifi/read-band-6ghz-channel-mismatch",
+                    test_read_wifi_band_6ghz_channel_mismatch);
     g_test_add_func(TPATH "wifi/read-hidden", test_read_wifi_hidden);
 
     nmtst_add_test_func(TPATH "wifi/read-mac-random-always",
@@ -10852,6 +10938,7 @@ main(int argc, char **argv)
                     test_write_wifi_wpa_then_wep_with_perms);
     g_test_add_func(TPATH "wifi/write-hidden", test_write_wifi_hidden);
     g_test_add_func(TPATH "wifi/write-band-a", test_write_wifi_band_a);
+    g_test_add_func(TPATH "wifi/write-band-6ghz", test_write_wifi_band_6ghz);
     g_test_add_func(TPATH "wifi/write-ap-mode", test_write_wifi_ap_mode);
 
     g_test_add_func(TPATH "s390/read-qeth-static", test_read_wired_qeth_static);
diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-writer.c b/src/core/settings/plugins/keyfile/nms-keyfile-writer.c
index c7c88260..962f3d15 100644
--- a/src/core/settings/plugins/keyfile/nms-keyfile-writer.c
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-writer.c
@@ -143,7 +143,9 @@ cert_writer(NMConnection                     *connection,
                                             vtable->setting_key,
                                             strrchr(new_path, '/') + 1);
         } else {
-            nm_log_warn(LOGD_SETTINGS,
+            g_set_error(error,
+                        NM_SETTINGS_ERROR,
+                        NM_SETTINGS_ERROR_FAILED,
                         "keyfile: %s.%s: failed to write certificate to file %s: %s",
                         setting_name,
                         vtable->setting_key,
diff --git a/src/core/supplicant/nm-supplicant-config.c b/src/core/supplicant/nm-supplicant-config.c
index 233afe48..a0ffb483 100644
--- a/src/core/supplicant/nm-supplicant-config.c
+++ b/src/core/supplicant/nm-supplicant-config.c
@@ -373,14 +373,24 @@ nm_supplicant_config_get_blobs(NMSupplicantConfig *self)
 }
 
 static const char *
-wifi_freqs_to_string(gboolean bg_band)
+wifi_freqs_to_string(const char *band)
 {
     static const char *str_2ghz = NULL;
     static const char *str_5ghz = NULL;
+    static const char *str_6ghz = NULL;
     const char       **f_p;
     const char        *f;
 
-    f_p = bg_band ? &str_2ghz : &str_5ghz;
+    if (nm_streq0(band, "a"))
+        f_p = &str_5ghz;
+    else if (nm_streq0(band, "bg"))
+        f_p = &str_2ghz;
+    else if (nm_streq0(band, "6GHz"))
+        f_p = &str_6ghz;
+    else {
+        nm_assert_not_reached();
+        return NULL;
+    }
 
 again:
     f = g_atomic_pointer_get(f_p);
@@ -390,7 +400,13 @@ again:
         const guint             *freqs;
         int                      i;
 
-        freqs = bg_band ? nm_utils_wifi_2ghz_freqs() : nm_utils_wifi_5ghz_freqs();
+        if (f_p == &str_2ghz)
+            freqs = nm_utils_wifi_2ghz_freqs();
+        else if (f_p == &str_5ghz)
+            freqs = nm_utils_wifi_5ghz_freqs();
+        else
+            freqs = nm_utils_wifi_6ghz_freqs();
+
         for (i = 0; freqs[i]; i++) {
             if (i > 0)
                 nm_str_buf_append_c(&strbuf, ' ');
@@ -533,38 +549,47 @@ get_ap_params(guint                         freq,
         guint channel;
         guint center_channel = 0;
 
-        if (freq < 5000) {
-            /* the setting is not valid */
-            nm_assert_not_reached();
-            return;
-        }
-
         /* Determine the center channel according to the table at
          * https://en.wikipedia.org/wiki/List_of_WLAN_channels */
 
-        channel = (freq - 5000) / 5;
-
-        if (channel >= 36 && channel <= 48)
-            center_channel = 42;
-        else if (channel >= 52 && channel <= 64)
-            center_channel = 58;
-        else if (channel >= 100 && channel <= 112)
-            center_channel = 106;
-        else if (channel >= 116 && channel <= 128)
-            center_channel = 122;
-        else if (channel >= 132 && channel <= 144)
-            center_channel = 138;
-        else if (channel >= 149 && channel <= 161)
-            center_channel = 155;
-        else if (channel >= 165 && channel <= 177)
-            center_channel = 171;
-
-        if (center_channel) {
+        if (freq > 5950) {
+            /* 6 GHz */
+            channel = (freq - 5950) / 5;
+            channel = ((channel - 1) / 16) * 16 + 7;
+
             *out_ht40             = 1;
             *out_max_oper_chwidth = 1;
-            *out_center_freq      = 5000 + 5 * center_channel;
+            *out_center_freq      = 5950 + 5 * channel;
+        } else {
+            /* 5 GHz */
+            if (freq < 5000) {
+                /* the setting is not valid */
+                nm_assert_not_reached();
+                return;
+            }
+            channel = (freq - 5000) / 5;
+
+            if (channel >= 36 && channel <= 48)
+                center_channel = 42;
+            else if (channel >= 52 && channel <= 64)
+                center_channel = 58;
+            else if (channel >= 100 && channel <= 112)
+                center_channel = 106;
+            else if (channel >= 116 && channel <= 128)
+                center_channel = 122;
+            else if (channel >= 132 && channel <= 144)
+                center_channel = 138;
+            else if (channel >= 149 && channel <= 161)
+                center_channel = 155;
+            else if (channel >= 165 && channel <= 177)
+                center_channel = 171;
+
+            if (center_channel) {
+                *out_ht40             = 1;
+                *out_max_oper_chwidth = 1;
+                *out_center_freq      = 5000 + 5 * center_channel;
+            }
         }
-
         return;
     }
 
@@ -711,10 +736,7 @@ nm_supplicant_config_add_setting_wireless(NMSupplicantConfig *self,
         } else {
             const char *freqs = NULL;
 
-            if (nm_streq(band, "a"))
-                freqs = wifi_freqs_to_string(FALSE);
-            else if (nm_streq(band, "bg"))
-                freqs = wifi_freqs_to_string(TRUE);
+            freqs = wifi_freqs_to_string(band);
 
             if (freqs
                 && !nm_supplicant_config_add_option(self,
@@ -1575,8 +1597,14 @@ nm_supplicant_config_add_setting_8021x(NMSupplicantConfig *self,
     g_string_free(phase2, TRUE);
 
     /* PAC file */
-    path = nm_setting_802_1x_get_pac_file(setting);
-    if (path) {
+    path  = nm_setting_802_1x_get_pac_file(setting);
+    bytes = priv->private_user && path ? nm_g_hash_table_lookup(files, path) : NULL;
+    if (bytes) {
+        if (!nm_supplicant_config_add_blob_for_connection(self, bytes, "pac_file", con_uuid, error))
+            return FALSE;
+    } else if (path) {
+        /* Private connections cannot use paths */
+        g_return_val_if_fail(!priv->private_user, FALSE);
         if (!add_string_val(self, path, "pac_file", FALSE, NULL, error))
             return FALSE;
     } else {
diff --git a/src/core/supplicant/nm-supplicant-interface.c b/src/core/supplicant/nm-supplicant-interface.c
index 5c60a7b6..4476c701 100644
--- a/src/core/supplicant/nm-supplicant-interface.c
+++ b/src/core/supplicant/nm-supplicant-interface.c
@@ -67,6 +67,7 @@ enum {
     GROUP_STARTED,   /* a new Group (interface) was created */
     GROUP_FINISHED,  /* a Group (interface) has been finished */
     PSK_MISMATCH,    /* supplicant reported incorrect PSK */
+    SAE_MISMATCH,    /* supplicant reported incorrect SAE Password */
     LAST_SIGNAL
 };
 
@@ -3237,6 +3238,11 @@ _signal_handle(NMSupplicantInterface *self,
             g_signal_emit(self, signals[PSK_MISMATCH], 0);
             return;
         }
+
+        if (nm_streq(signal_name, "SaePasswordMismatch")) {
+            g_signal_emit(self, signals[SAE_MISMATCH], 0);
+            return;
+        }
         return;
     }
 
@@ -3879,4 +3885,13 @@ nm_supplicant_interface_class_init(NMSupplicantInterfaceClass *klass)
                                          NULL,
                                          G_TYPE_NONE,
                                          0);
+    signals[SAE_MISMATCH] = g_signal_new(NM_SUPPLICANT_INTERFACE_SAE_MISMATCH,
+                                         G_OBJECT_CLASS_TYPE(object_class),
+                                         G_SIGNAL_RUN_LAST,
+                                         0,
+                                         NULL,
+                                         NULL,
+                                         NULL,
+                                         G_TYPE_NONE,
+                                         0);
 }
diff --git a/src/core/supplicant/nm-supplicant-interface.h b/src/core/supplicant/nm-supplicant-interface.h
index 961de1b1..e77f5a42 100644
--- a/src/core/supplicant/nm-supplicant-interface.h
+++ b/src/core/supplicant/nm-supplicant-interface.h
@@ -87,6 +87,7 @@ typedef enum {
 #define NM_SUPPLICANT_INTERFACE_GROUP_STARTED   "group-started"
 #define NM_SUPPLICANT_INTERFACE_GROUP_FINISHED  "group-finished"
 #define NM_SUPPLICANT_INTERFACE_PSK_MISMATCH    "wpa-psk-mismatch"
+#define NM_SUPPLICANT_INTERFACE_SAE_MISMATCH    "wpa-sae-password-mismatch"
 
 typedef struct _NMSupplicantInterfaceClass NMSupplicantInterfaceClass;
 
diff --git a/src/core/supplicant/nm-supplicant-settings-verify.c b/src/core/supplicant/nm-supplicant-settings-verify.c
index cca53d82..a1f888ec 100644
--- a/src/core/supplicant/nm-supplicant-settings-verify.c
+++ b/src/core/supplicant/nm-supplicant-settings-verify.c
@@ -6,6 +6,7 @@
 #include "src/core/nm-default-daemon.h"
 
 #include "nm-supplicant-settings-verify.h"
+#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -71,7 +72,7 @@ static const struct Opt opt_table[] = {
     OPT_BYTES("engine_id", 0),
     OPT_INT("fragment_size", 1, 2000),
     OPT_KEYWORD("freq_list", NULL),
-    OPT_INT("frequency", 2412, 5825),
+    OPT_INT("frequency", _NM_WIFI_FREQ_MIN, _NM_WIFI_FREQ_MAX),
     OPT_KEYWORD("group", NM_MAKE_STRV("CCMP", "TKIP", "WEP104", "WEP40", "GCMP-256", )),
     OPT_INT("ht40", 0, 1),
     OPT_BYTES("identity", 0),
diff --git a/src/core/tests/config/NetworkManager-warn.conf b/src/core/tests/config/NetworkManager-warn.conf
index 80df7c52..f43f4cf1 100644
--- a/src/core/tests/config/NetworkManager-warn.conf
+++ b/src/core/tests/config/NetworkManager-warn.conf
@@ -1,5 +1,5 @@
 [main]
-dhcp=dhclient
+dhcp=internal
 plugin=foo,bar,baz
 no-auto-default=11:11:11:11:11:11
 rc-managed=unmanaged
diff --git a/src/core/tests/config/NetworkManager.conf b/src/core/tests/config/NetworkManager.conf
index ae9f3e46..7584a0f2 100644
--- a/src/core/tests/config/NetworkManager.conf
+++ b/src/core/tests/config/NetworkManager.conf
@@ -1,5 +1,5 @@
 [main]
-dhcp=dhclient
+dhcp=internal
 plugins=foo,bar,baz
 no-auto-default=11:11:11:11:11:11
 
diff --git a/src/core/tests/config/test-config.c b/src/core/tests/config/test-config.c
index b2f29821..c549bcaa 100644
--- a/src/core/tests/config/test-config.c
+++ b/src/core/tests/config/test-config.c
@@ -162,7 +162,7 @@ test_config_simple(void)
     g_assert_cmpstr(nm_config_data_get_config_main_file(nm_config_get_data_orig(config)),
                     ==,
                     TEST_DIR "/NetworkManager.conf");
-    g_assert_cmpstr(_config_get_dhcp_client_a(config), ==, "dhclient");
+    g_assert_cmpstr(_config_get_dhcp_client_a(config), ==, "internal");
     g_assert_cmpstr(nm_config_get_log_level(config), ==, "INFO");
     g_assert_cmpint(nm_config_data_get_connectivity_interval(nm_config_get_data_orig(config)),
                     ==,
@@ -297,7 +297,7 @@ test_config_override(void)
     g_assert_cmpstr(nm_config_data_get_config_main_file(nm_config_get_data_orig(config)),
                     ==,
                     TEST_DIR "/NetworkManager.conf");
-    g_assert_cmpstr(_config_get_dhcp_client_a(config), ==, "dhclient");
+    g_assert_cmpstr(_config_get_dhcp_client_a(config), ==, "internal");
     g_assert_cmpstr(nm_config_get_log_level(config), ==, "INFO");
     g_assert_cmpint(nm_config_data_get_connectivity_interval(nm_config_get_data_orig(config)),
                     ==,
diff --git a/src/core/tests/test-core.c b/src/core/tests/test-core.c
index e08296c2..b8920558 100644
--- a/src/core/tests/test-core.c
+++ b/src/core/tests/test-core.c
@@ -7,6 +7,7 @@
 
 #include <net/if.h>
 #include <byteswap.h>
+#include <netinet/ip6.h>
 
 /* need math.h for isinf() and INFINITY. No need to link with -lm */
 #include <math.h>
@@ -19,6 +20,7 @@
 #include "dns/nm-dns-manager.h"
 #include "nm-connectivity.h"
 #include "nm-firewall-utils.h"
+#include "nm-l3-config-data.h"
 
 #include "nm-test-utils-core.h"
 
@@ -2770,6 +2772,104 @@ test_nm_firewall_nft_stdio_mlag(void)
        "nm-mlag-bond0\012delete table netdev nm-mlag-bond0\012");
 }
 
+static void
+test_icmp6_checksum(void)
+{
+    struct ip6_hdr ip6h = {};
+    guint8        *data;
+    guint16        c;
+
+    ip6h.ip6_src = NM_IN6ADDR_INIT(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    ip6h.ip6_dst = NM_IN6ADDR_INIT(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    data         = (guint8[]) {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    c            = nm_utils_icmp6_checksum(&ip6h.ip6_src, 12, data);
+    g_assert_cmpint(c, ==, htons(0xffb9));
+
+    ip6h.ip6_src = NM_IN6ADDR_INIT(0xfe,
+                                   0x80,
+                                   0x00,
+                                   0x00,
+                                   0x00,
+                                   0x00,
+                                   0x00,
+                                   0x00,
+                                   0xc0,
+                                   0x60,
+                                   0x8c,
+                                   0xaf,
+                                   0xf6,
+                                   0x9b,
+                                   0xe4,
+                                   0x1a);
+    ip6h.ip6_dst = NM_IN6ADDR_INIT(0x20,
+                                   0x02,
+                                   0xaa,
+                                   0xaa,
+                                   0x00,
+                                   0x00,
+                                   0x00,
+                                   0x00,
+                                   0x64,
+                                   0xd4,
+                                   0x29,
+                                   0x32,
+                                   0x35,
+                                   0x85,
+                                   0x7c,
+                                   0x89);
+    data         = (guint8[]) {0xdc, 0x74, 0x1a, 0xcc, 0xd3, 0x8e, 0xca, 0x34};
+    c            = nm_utils_icmp6_checksum(&ip6h.ip6_src, 8, data);
+    g_assert_cmpint(c, ==, htons(0x39af));
+}
+
+/*****************************************************************************/
+
+static void
+test_l3_config_data_cmp_default_routes(void)
+{
+    nm_auto_unref_dedup_multi_index NMDedupMultiIndex *multi_idx = nm_dedup_multi_index_new();
+    nm_auto_unref_l3cd_init NML3ConfigData            *a         = NULL;
+    nm_auto_unref_l3cd_init NML3ConfigData            *b         = NULL;
+    const int                                          IFINDEX   = 1;
+
+    a = nm_l3_config_data_new(multi_idx, IFINDEX, NM_IP_CONFIG_SOURCE_USER);
+    nm_l3_config_data_add_route_4(
+        a,
+        NM_PLATFORM_IP4_ROUTE_INIT(.ifindex = IFINDEX,
+                                   .network = 0,
+                                   .plen    = 0,
+                                   .gateway = nmtst_inet4_from_string("192.168.1.1"),
+                                   .metric  = 100));
+
+    b = nm_l3_config_data_new(multi_idx, IFINDEX, NM_IP_CONFIG_SOURCE_USER);
+    nm_l3_config_data_add_route_4(
+        b,
+        NM_PLATFORM_IP4_ROUTE_INIT(.ifindex       = IFINDEX,
+                                   .network       = 0,
+                                   .plen          = 0,
+                                   .gateway       = nmtst_inet4_from_string("192.168.1.1"),
+                                   .metric        = 100,
+                                   .table_coerced = nm_platform_route_table_coerce(100)));
+
+    nm_l3_config_data_seal(a);
+    nm_l3_config_data_seal(b);
+
+    g_assert(nm_l3_config_data_get_best_default_route(a, AF_INET));
+    g_assert(!nm_l3_config_data_get_best_default_route(b, AF_INET));
+
+    g_assert_cmpint(nm_l3_config_data_cmp_full(a, b, NM_L3_CONFIG_CMP_FLAGS_ROUTES_ID), !=, 0);
+    g_assert_cmpint(nm_l3_config_data_cmp_full(b, a, NM_L3_CONFIG_CMP_FLAGS_ROUTES_ID), !=, 0);
+
+    g_assert_cmpint(nm_l3_config_data_cmp_full(a, b, NM_L3_CONFIG_CMP_FLAGS_ROUTES), !=, 0);
+    g_assert_cmpint(nm_l3_config_data_cmp_full(b, a, NM_L3_CONFIG_CMP_FLAGS_ROUTES), !=, 0);
+
+    g_assert_cmpint(nm_l3_config_data_cmp_full(a, b, NM_L3_CONFIG_CMP_FLAGS_ADDRESSES), ==, 0);
+    g_assert_cmpint(nm_l3_config_data_cmp_full(b, a, NM_L3_CONFIG_CMP_FLAGS_ADDRESSES), ==, 0);
+
+    g_assert_cmpint(nm_l3_config_data_cmp_full(a, a, NM_L3_CONFIG_CMP_FLAGS_ALL), ==, 0);
+    g_assert_cmpint(nm_l3_config_data_cmp_full(b, b, NM_L3_CONFIG_CMP_FLAGS_ALL), ==, 0);
+}
+
 /*****************************************************************************/
 
 NMTST_DEFINE();
@@ -2848,5 +2948,10 @@ main(int argc, char **argv)
 
     g_test_add_func("/core/test_nm_firewall_nft_stdio_mlag", test_nm_firewall_nft_stdio_mlag);
 
+    g_test_add_func("/core/general/test_icmp6_checksum", test_icmp6_checksum);
+
+    g_test_add_func("/core/general/test_l3_config_data_cmp_default_routes",
+                    test_l3_config_data_cmp_default_routes);
+
     return g_test_run();
 }
diff --git a/src/core/tests/test-netns.c b/src/core/tests/test-netns.c
index 26ecbcb8..7bcd3809 100644
--- a/src/core/tests/test-netns.c
+++ b/src/core/tests/test-netns.c
@@ -53,6 +53,44 @@ test_ip_reservation_shared4(void)
     }
 }
 
+static void
+test_ip_reservation_clat(void)
+{
+    gs_unref_object NMPlatform *platform = NULL;
+    gs_unref_object NMNetns    *netns    = NULL;
+    NMNetnsIPReservation       *res[8];
+    NMNetnsIPReservation       *res1;
+    char                        buf[NM_INET_ADDRSTRLEN];
+    guint                       i;
+
+    platform = g_object_ref(NM_PLATFORM_GET);
+    netns    = nm_netns_new(platform);
+
+    /* Allocate addresses 192.0.0.{5,6,7,0,1,2,3,4} */
+    for (i = 0; i < 8; i++) {
+        res[i] = nm_netns_ip_reservation_get(netns, NM_NETNS_IP_RESERVATION_TYPE_CLAT);
+        g_snprintf(buf, sizeof(buf), "192.0.0.%u", (i + 5) % 8);
+        nmtst_assert_ip4_address(res[i]->addr, buf);
+        g_assert_cmpint(res[i]->_ref_count, ==, 1);
+    }
+
+    /* Release an address and get it back */
+    nm_netns_ip_reservation_release(res[2]);
+    res[2] = nm_netns_ip_reservation_get(netns, NM_NETNS_IP_RESERVATION_TYPE_CLAT);
+    nmtst_assert_ip4_address(res[2]->addr, "192.0.0.7");
+
+    /* No reuse */
+    NMTST_EXPECT_NM_ERROR("netns[*]: clat: ran out of IP addresses");
+    res1 = nm_netns_ip_reservation_get(netns, NM_NETNS_IP_RESERVATION_TYPE_CLAT);
+    g_test_assert_expected_messages();
+    g_assert_null(res1);
+
+    /* Release all */
+    for (i = 0; i < 8; i++) {
+        nm_netns_ip_reservation_release(res[i]);
+    }
+}
+
 /*****************************************************************************/
 
 NMTST_DEFINE();
@@ -64,6 +102,7 @@ main(int argc, char **argv)
     nm_linux_platform_setup();
 
     g_test_add_func("/netns/ip_reservation/shared4", test_ip_reservation_shared4);
+    g_test_add_func("/netns/ip_reservation/clat", test_ip_reservation_clat);
 
     return g_test_run();
 }
diff --git a/src/core/tests/test-systemd.c b/src/core/tests/test-systemd.c
index 1b0b7f65..09481a64 100644
--- a/src/core/tests/test-systemd.c
+++ b/src/core/tests/test-systemd.c
@@ -83,6 +83,42 @@ test_sd_event(void)
 
 /*****************************************************************************/
 
+static void
+test_http_url_is_valid_https(void)
+{
+    /* CVE-2026-10805: connection.mud-url is pasted verbatim into the dhclient
+     * config inside a quoted string ("send mudurl \"%s\";"). This function
+     * gates the property at verify() time, so it must reject characters that
+     * break out of the quotes or inject config syntax. */
+#define _assert_valid(url)   g_assert(nm_sd_http_url_is_valid_https("" url))
+#define _assert_invalid(url) g_assert(!nm_sd_http_url_is_valid_https("" url))
+
+    _assert_valid("https://example.com/mud.json");
+    _assert_valid("https://example.com");
+    _assert_valid("https://example.com/a?b=c&d=e#frag");
+    _assert_valid("https://[2001:db8::1]/x");
+    _assert_valid("https://user@example.com/~p/(a)*,;=+!$'");
+    _assert_valid("https://user:pass@example.com/p%20q?x=%2F");
+
+    _assert_invalid("http://example.com");
+    _assert_invalid("ftp://example.com");
+    _assert_invalid("example.com");
+    _assert_invalid("");
+    _assert_invalid("https://");
+
+    _assert_invalid("https://example.com/\""); /* breaks out of the quoted string */
+    _assert_invalid("https://example.com/\\"); /* escapes the following char */
+    _assert_invalid("https://example.com/\n");
+    _assert_invalid("https://example.com/\t");
+    _assert_invalid("https://example.com/a\x01b");
+    _assert_invalid("https://example.com/\xc3\xa4"); /* non-ASCII */
+
+#undef _assert_valid
+#undef _assert_invalid
+}
+
+/*****************************************************************************/
+
 NMTST_DEFINE();
 
 int
@@ -91,6 +127,7 @@ main(int argc, char **argv)
     nmtst_init(&argc, &argv, TRUE);
 
     g_test_add_func("/systemd/sd-event", test_sd_event);
+    g_test_add_func("/systemd/http-url-is-valid-https", test_http_url_is_valid_https);
 
     return g_test_run();
 }
diff --git a/src/core/vpn/nm-vpn-connection.c b/src/core/vpn/nm-vpn-connection.c
index 54478c53..4623af9c 100644
--- a/src/core/vpn/nm-vpn-connection.c
+++ b/src/core/vpn/nm-vpn-connection.c
@@ -2135,16 +2135,20 @@ _dbus_signal_ip_config_cb(NMVpnConnection *self, int addr_family, GVariant *dict
                          IS_IPv4 ? NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN
                                  : NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN,
                          "&s",
-                         &v_str))
+                         &v_str)) {
         nm_l3_config_data_add_domain(l3cd, addr_family, v_str);
+        nm_l3_config_data_add_search(l3cd, addr_family, v_str);
+    }
 
     if (g_variant_lookup(dict,
                          IS_IPv4 ? NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS
                                  : NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS,
                          "as",
                          &var_iter)) {
-        while (g_variant_iter_next(var_iter, "&s", &v_str))
+        while (g_variant_iter_next(var_iter, "&s", &v_str)) {
             nm_l3_config_data_add_domain(l3cd, addr_family, v_str);
+            nm_l3_config_data_add_search(l3cd, addr_family, v_str);
+        }
         g_variant_iter_free(var_iter);
     }
 
diff --git a/src/core/vpn/nm-vpn-manager.c b/src/core/vpn/nm-vpn-manager.c
index 6bf8edae..e49c6898 100644
--- a/src/core/vpn/nm-vpn-manager.c
+++ b/src/core/vpn/nm-vpn-manager.c
@@ -60,16 +60,21 @@ nm_vpn_manager_activate_connection(NMVpnManager *manager, NMVpnConnection *vpn,
 {
     NMVpnManagerPrivate *priv;
     NMVpnPluginInfo     *plugin_info;
+    NMConnection        *applied;
     const char          *service_name;
     NMDevice            *device;
+    const char          *user;
 
     g_return_val_if_fail(NM_IS_VPN_MANAGER(manager), FALSE);
     g_return_val_if_fail(NM_IS_VPN_CONNECTION(vpn), FALSE);
     g_return_val_if_fail(!error || !*error, FALSE);
 
-    priv   = NM_VPN_MANAGER_GET_PRIVATE(manager);
-    device = nm_active_connection_get_device(NM_ACTIVE_CONNECTION(vpn));
-    g_assert(device);
+    priv    = NM_VPN_MANAGER_GET_PRIVATE(manager);
+    device  = nm_active_connection_get_device(NM_ACTIVE_CONNECTION(vpn));
+    applied = nm_active_connection_get_applied_connection(NM_ACTIVE_CONNECTION(vpn));
+    nm_assert(device);
+    nm_assert(applied);
+
     if (nm_device_get_state(device) != NM_DEVICE_STATE_ACTIVATED
         && nm_device_get_state(device) != NM_DEVICE_STATE_SECONDARIES) {
         g_set_error_literal(error,
@@ -101,6 +106,30 @@ nm_vpn_manager_activate_connection(NMVpnManager *manager, NMVpnConnection *vpn,
         return FALSE;
     }
 
+    user = nm_utils_get_connection_first_permissions_user(applied);
+    if (user) {
+        NMSettingConnection *s_con;
+
+        s_con = nm_connection_get_setting_connection(applied);
+        nm_assert(s_con);
+        if (_nm_setting_connection_get_num_permissions_users(s_con) > 1) {
+            g_set_error_literal(error,
+                                NM_MANAGER_ERROR,
+                                NM_MANAGER_ERROR_CONNECTION_NOT_AVAILABLE,
+                                "private VPN connections with multiple users are not allowed.");
+            return FALSE;
+        }
+
+        if (!nm_vpn_plugin_info_supports_safe_private_file_access(plugin_info)) {
+            g_set_error(error,
+                        NM_MANAGER_ERROR,
+                        NM_MANAGER_ERROR_CONNECTION_NOT_AVAILABLE,
+                        "The '%s' plugin doesn't support private connections.",
+                        nm_vpn_plugin_info_get_name(plugin_info));
+            return FALSE;
+        }
+    }
+
     nm_vpn_connection_activate(vpn, plugin_info);
 
     if (!nm_vpn_plugin_info_supports_multiple(plugin_info)) {
diff --git a/src/libnm-base/nm-base.h b/src/libnm-base/nm-base.h
index 048c0241..7806f7e7 100644
--- a/src/libnm-base/nm-base.h
+++ b/src/libnm-base/nm-base.h
@@ -345,6 +345,7 @@ typedef enum {
     NM_IP_CONFIG_SOURCE_VPN,
     NM_IP_CONFIG_SOURCE_DHCP,
     NM_IP_CONFIG_SOURCE_NDISC,
+    NM_IP_CONFIG_SOURCE_CLAT,
     NM_IP_CONFIG_SOURCE_USER,
 } NMIPConfigSource;
 
diff --git a/src/libnm-base/nm-config-base.h b/src/libnm-base/nm-config-base.h
index e11d8abf..07e3fe3c 100644
--- a/src/libnm-base/nm-config-base.h
+++ b/src/libnm-base/nm-config-base.h
@@ -65,6 +65,7 @@
 
 #define NM_CONFIG_KEYFILE_KEY_DEVICE_MANAGED                    "managed"
 #define NM_CONFIG_KEYFILE_KEY_DEVICE_IGNORE_CARRIER             "ignore-carrier"
+#define NM_CONFIG_KEYFILE_KEY_DEVICE_CHECK_CONNECTIVITY         "check-connectivity"
 #define NM_CONFIG_KEYFILE_KEY_DEVICE_SRIOV_NUM_VFS              "sriov-num-vfs"
 #define NM_CONFIG_KEYFILE_KEY_DEVICE_KEEP_CONFIGURATION         "keep-configuration"
 #define NM_CONFIG_KEYFILE_KEY_DEVICE_ALLOWED_CONNECTIONS        "allowed-connections"
diff --git a/src/libnm-client-impl/libnm.ver b/src/libnm-client-impl/libnm.ver
index c03b8f39..62d486ff 100644
--- a/src/libnm-client-impl/libnm.ver
+++ b/src/libnm-client-impl/libnm.ver
@@ -2104,7 +2104,7 @@ global:
 	nm_vpn_plugin_info_supports_safe_private_file_access;
 } libnm_1_54_0;
 
-libnm_1_56_1 {
+libnm_1_58_0 {
 global:
 	nm_connection_get_setting_geneve;
 	nm_device_geneve_get_df;
@@ -2118,6 +2118,8 @@ global:
 	nm_device_managed_get_type;
 	nm_device_set_managed_async;
 	nm_device_set_managed_finish;
+	nm_ip_config_get_clat_address;
+	nm_ip_config_get_clat_pref64;
 	nm_setting_geneve_df_get_type;
 	nm_setting_geneve_get_destination_port;
 	nm_setting_geneve_get_df;
@@ -2127,4 +2129,9 @@ global:
 	nm_setting_geneve_get_ttl;
 	nm_setting_geneve_get_type;
 	nm_setting_geneve_new;
+	nm_setting_ip4_config_clat_get_type;
+	nm_setting_ip4_config_get_clat;
+	nm_utils_wifi_6ghz_freqs;
+	nm_utils_wifi_freq_to_band;
+	nm_wifi_band_get_type;
 } libnm_1_56_0;
diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
index 3352ebfe..329078ab 100644
--- a/src/libnm-client-impl/meson.build
+++ b/src/libnm-client-impl/meson.build
@@ -167,13 +167,13 @@ if enable_introspection
     install: true,
   )
 
-  gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH', check: false).stdout()
+  gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH', check: false).stdout().strip()
   if gi_typelib_path != ''
     gi_typelib_path = ':' + gi_typelib_path
   endif
   gi_typelib_path = meson.current_build_dir() + gi_typelib_path
 
-  ld_library_path = run_command('printenv', 'LD_LIBRARY_PATH', check: false).stdout()
+  ld_library_path = run_command('printenv', 'LD_LIBRARY_PATH', check: false).stdout().strip()
   if ld_library_path != ''
     ld_library_path = ':' + ld_library_path
   endif
diff --git a/src/libnm-client-impl/nm-access-point.c b/src/libnm-client-impl/nm-access-point.c
index a06bee48..28f190de 100644
--- a/src/libnm-client-impl/nm-access-point.c
+++ b/src/libnm-client-impl/nm-access-point.c
@@ -18,6 +18,7 @@
 
 #include "nm-dbus-interface.h"
 #include "nm-object-private.h"
+#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 
 /*****************************************************************************/
 
@@ -338,11 +339,14 @@ nm_access_point_connection_valid(NMAccessPoint *ap, NMConnection *connection)
     ap_freq = nm_access_point_get_frequency(ap);
     if (ap_freq) {
         setting_band = nm_setting_wireless_get_band(s_wifi);
-        if (g_strcmp0(setting_band, "a") == 0) {
-            if (ap_freq < 4915 || ap_freq > 5825)
+        if (nm_streq0(setting_band, "a")) {
+            if (ap_freq < _NM_WIFI_FREQ_MIN_5GHZ || ap_freq > _NM_WIFI_FREQ_MAX_5GHZ)
                 return FALSE;
-        } else if (g_strcmp0(setting_band, "bg") == 0) {
-            if (ap_freq < 2412 || ap_freq > 2484)
+        } else if (nm_streq0(setting_band, "bg")) {
+            if (ap_freq < _NM_WIFI_FREQ_MIN_2GHZ || ap_freq > _NM_WIFI_FREQ_MAX_2GHZ)
+                return FALSE;
+        } else if (nm_streq0(setting_band, "6GHz")) {
+            if (ap_freq < _NM_WIFI_FREQ_MIN_6GHZ || ap_freq > _NM_WIFI_FREQ_MAX_6GHZ)
                 return FALSE;
         }
 
diff --git a/src/libnm-client-impl/nm-active-connection.c b/src/libnm-client-impl/nm-active-connection.c
index 9008256a..78db887c 100644
--- a/src/libnm-client-impl/nm-active-connection.c
+++ b/src/libnm-client-impl/nm-active-connection.c
@@ -383,7 +383,7 @@ nm_active_connection_get_vpn(NMActiveConnection *connection)
  *
  * Gets the controller #NMDevice of the connection.
  *
- * Returns: (transfer none): the controller #NMDevice of the #NMActiveConnection.
+ * Returns: (type NMDevice) (transfer none): the controller #NMDevice of the #NMActiveConnection.
  *
  * Deprecated: 1.44: Use nm_active_connection_get_controller() instead.
  **/
@@ -400,7 +400,7 @@ nm_active_connection_get_master(NMActiveConnection *connection)
  * Gets the controller #NMDevice of the connection. This replaces the
  * deprecated nm_active_connection_get_master() method.
  *
- * Returns: (transfer none): the controller #NMDevice of the #NMActiveConnection.
+ * Returns: (type NMDevice) (transfer none): the controller #NMDevice of the #NMActiveConnection.
  *
  * Since: 1.44
  **/
diff --git a/src/libnm-client-impl/nm-device-geneve.c b/src/libnm-client-impl/nm-device-geneve.c
index 312a99b3..415e978d 100644
--- a/src/libnm-client-impl/nm-device-geneve.c
+++ b/src/libnm-client-impl/nm-device-geneve.c
@@ -52,7 +52,7 @@ G_DEFINE_TYPE(NMDeviceGeneve, nm_device_geneve, NM_TYPE_DEVICE)
  *
  * Returns: the device's GENEVE ID.
  *
- * Since: 1.58, 1.56.1
+ * Since: 1.58
  **/
 guint
 nm_device_geneve_get_id(NMDeviceGeneve *device)
@@ -68,7 +68,7 @@ nm_device_geneve_get_id(NMDeviceGeneve *device)
  *
  * Returns: the IP address of the remote tunnel endpoint
  *
- * Since: 1.58, 1.56.1
+ * Since: 1.58
  **/
 const char *
 nm_device_geneve_get_remote(NMDeviceGeneve *device)
@@ -84,7 +84,7 @@ nm_device_geneve_get_remote(NMDeviceGeneve *device)
  *
  * Returns: the UDP destination port
  *
- * Since: 1.58, 1.56.1
+ * Since: 1.58
  **/
 guint
 nm_device_geneve_get_dst_port(NMDeviceGeneve *device)
@@ -100,7 +100,7 @@ nm_device_geneve_get_dst_port(NMDeviceGeneve *device)
  *
  * Returns: the TOS value to use in outgoing packets
  *
- * Since: 1.58, 1.56.1
+ * Since: 1.58
  **/
 guint
 nm_device_geneve_get_tos(NMDeviceGeneve *device)
@@ -116,7 +116,7 @@ nm_device_geneve_get_tos(NMDeviceGeneve *device)
  *
  * Returns: the time-to-live value to use in outgoing packets
  *
- * Since: 1.58, 1.56.1
+ * Since: 1.58
  **/
 guint
 nm_device_geneve_get_ttl(NMDeviceGeneve *device)
@@ -132,7 +132,7 @@ nm_device_geneve_get_ttl(NMDeviceGeneve *device)
  *
  * Returns: the Don't Fragment (DF) bit to set in outgoing packets
  *
- * Since: 1.58, 1.56.1
+ * Since: 1.58
  **/
 guint
 nm_device_geneve_get_df(NMDeviceGeneve *device)
@@ -256,7 +256,7 @@ nm_device_geneve_class_init(NMDeviceGeneveClass *klass)
      *
      * The device's GENEVE ID.
      *
-     * Since: 1.58, 1.56.1
+     * Since: 1.58
      **/
     obj_properties[PROP_ID] = g_param_spec_uint(NM_DEVICE_GENEVE_ID,
                                                 "",
@@ -271,7 +271,7 @@ nm_device_geneve_class_init(NMDeviceGeneveClass *klass)
      *
      * The IP address of the remote tunnel endpoint.
      *
-     * Since: 1.58, 1.56.1
+     * Since: 1.58
      */
     obj_properties[PROP_REMOTE] = g_param_spec_string(NM_DEVICE_GENEVE_REMOTE,
                                                       "",
@@ -284,7 +284,7 @@ nm_device_geneve_class_init(NMDeviceGeneveClass *klass)
      *
      * The TOS value to use in outgoing packets.
      *
-     * Since: 1.58, 1.56.1
+     * Since: 1.58
      */
     obj_properties[PROP_TOS] = g_param_spec_uchar(NM_DEVICE_GENEVE_TOS,
                                                   "",
@@ -299,7 +299,7 @@ nm_device_geneve_class_init(NMDeviceGeneveClass *klass)
      *
      * The time-to-live value to use in outgoing packets.
      *
-     * Since: 1.58, 1.56.1
+     * Since: 1.58
      */
     obj_properties[PROP_TTL] = g_param_spec_int(NM_DEVICE_GENEVE_TTL,
                                                 "",
@@ -315,7 +315,7 @@ nm_device_geneve_class_init(NMDeviceGeneveClass *klass)
      * The UDP destination port used to communicate with the remote GENEVE tunnel
      * endpoint.
      *
-     * Since: 1.58, 1.56.1
+     * Since: 1.58
      */
     obj_properties[PROP_DST_PORT] = g_param_spec_uint(NM_DEVICE_GENEVE_DST_PORT,
                                                       "",
@@ -330,7 +330,7 @@ nm_device_geneve_class_init(NMDeviceGeneveClass *klass)
      *
      * The Don't Fragment (DF) bit to set in outgoing packets.
      *
-     * Since: 1.58, 1.56.1
+     * Since: 1.58
      */
     obj_properties[PROP_DF] = g_param_spec_uchar(NM_DEVICE_GENEVE_DF,
                                                  "",
diff --git a/src/libnm-client-impl/nm-device.c b/src/libnm-client-impl/nm-device.c
index 63a62942..80c7de06 100644
--- a/src/libnm-client-impl/nm-device.c
+++ b/src/libnm-client-impl/nm-device.c
@@ -1481,7 +1481,7 @@ nm_device_set_managed(NMDevice *device, gboolean managed)
  * argument different behaviors can be achieved, such as persisting the state to
  * disk or matching the device by MAC address.
  *
- * Since: 1.58, 1.56.1
+ * Since: 1.58
  **/
 void
 nm_device_set_managed_async(NMDevice            *device,
@@ -1521,7 +1521,7 @@ nm_device_set_managed_async(NMDevice            *device,
  * Returns: %TRUE on success, %FALSE on error, in which case @error
  * will be set.
  *
- * Since: 1.58, 1.56.1
+ * Since: 1.58
  **/
 gboolean
 nm_device_set_managed_finish(NMDevice *device, GAsyncResult *result, GError **error)
diff --git a/src/libnm-client-impl/nm-ip-config.c b/src/libnm-client-impl/nm-ip-config.c
index ef3dcca1..40f2f7f0 100644
--- a/src/libnm-client-impl/nm-ip-config.c
+++ b/src/libnm-client-impl/nm-ip-config.c
@@ -26,7 +26,9 @@ NM_GOBJECT_PROPERTIES_DEFINE(NMIPConfig,
                              PROP_NAMESERVERS,
                              PROP_DOMAINS,
                              PROP_SEARCHES,
-                             PROP_WINS_SERVERS, );
+                             PROP_WINS_SERVERS,
+                             PROP_CLAT_ADDRESS,
+                             PROP_CLAT_PREF64, );
 
 typedef struct _NMIPConfigPrivate {
     GPtrArray *addresses;
@@ -36,6 +38,8 @@ typedef struct _NMIPConfigPrivate {
     char     **searches;
     char     **wins_servers;
     char      *gateway;
+    char      *clat_address;
+    char      *clat_pref64;
 
     bool addresses_new_style : 1;
     bool routes_new_style : 1;
@@ -256,6 +260,12 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
     case PROP_GATEWAY:
         g_value_set_string(value, nm_ip_config_get_gateway(self));
         break;
+    case PROP_CLAT_ADDRESS:
+        g_value_set_string(value, nm_ip_config_get_clat_address(self));
+        break;
+    case PROP_CLAT_PREF64:
+        g_value_set_string(value, nm_ip_config_get_clat_pref64(self));
+        break;
     case PROP_ADDRESSES:
         g_value_take_boxed(value,
                            _nm_utils_copy_array(nm_ip_config_get_addresses(self),
@@ -307,6 +317,8 @@ finalize(GObject *object)
     NMIPConfigPrivate *priv = NM_IP_CONFIG_GET_PRIVATE(object);
 
     g_free(priv->gateway);
+    g_free(priv->clat_address);
+    g_free(priv->clat_pref64);
 
     g_ptr_array_unref(priv->routes);
     g_ptr_array_unref(priv->addresses);
@@ -333,6 +345,10 @@ const NMLDBusMetaIface _nml_dbus_meta_iface_nm_ip4config = NML_DBUS_META_IFACE_I
                                         "aau",
                                         _notify_update_prop_addresses,
                                         .obj_property_no_reverse_idx = TRUE),
+        NML_DBUS_META_PROPERTY_INIT_S("ClatAddress",
+                                      PROP_CLAT_ADDRESS,
+                                      NMIPConfigPrivate,
+                                      clat_address),
         NML_DBUS_META_PROPERTY_INIT_TODO("DnsOptions", "as"),
         NML_DBUS_META_PROPERTY_INIT_TODO("DnsPriority", "i"),
         NML_DBUS_META_PROPERTY_INIT_AS("Domains", PROP_DOMAINS, NMIPConfigPrivate, domains),
@@ -381,6 +397,14 @@ const NMLDBusMetaIface _nml_dbus_meta_iface_nm_ip6config = NML_DBUS_META_IFACE_I
                                         "a(ayuay)",
                                         _notify_update_prop_addresses,
                                         .obj_property_no_reverse_idx = TRUE),
+        NML_DBUS_META_PROPERTY_INIT_S("ClatAddress",
+                                      PROP_CLAT_ADDRESS,
+                                      NMIPConfigPrivate,
+                                      clat_address),
+        NML_DBUS_META_PROPERTY_INIT_S("ClatPref64",
+                                      PROP_CLAT_PREF64,
+                                      NMIPConfigPrivate,
+                                      clat_pref64),
         NML_DBUS_META_PROPERTY_INIT_TODO("DnsOptions", "as"),
         NML_DBUS_META_PROPERTY_INIT_TODO("DnsPriority", "i"),
         NML_DBUS_META_PROPERTY_INIT_AS("Domains", PROP_DOMAINS, NMIPConfigPrivate, domains),
@@ -437,6 +461,34 @@ nm_ip_config_class_init(NMIPConfigClass *config_class)
                                                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
+     * NMIPConfig:clat-address:
+     *
+     * The IP address used by CLAT.
+     *
+     * Since: 1.58
+     **/
+    obj_properties[PROP_CLAT_ADDRESS] =
+        g_param_spec_string(NM_IP_CONFIG_CLAT_ADDRESS,
+                            "",
+                            "",
+                            NULL,
+                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+    /**
+     * NMIPConfig:clat-pref64:
+     *
+     * The NAT64 prefix used by CLAT.
+     *
+     * Since: 1.58
+     **/
+    obj_properties[PROP_CLAT_PREF64] =
+        g_param_spec_string(NM_IP_CONFIG_CLAT_PREF64,
+                            "",
+                            "",
+                            NULL,
+                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+    /**
      * NMIPConfig:addresses:
      *
      * A #GPtrArray containing the addresses (#NMIPAddress) of the configuration.
@@ -544,6 +596,42 @@ nm_ip_config_get_gateway(NMIPConfig *config)
 }
 
 /**
+ * nm_ip_config_get_clat_address:
+ * @config: a #NMIPConfig
+ *
+ * Gets the CLAT IP address.
+ *
+ * Returns: (transfer none): the CLAT IP address.
+ *
+ * Since: 1.58
+ **/
+const char *
+nm_ip_config_get_clat_address(NMIPConfig *config)
+{
+    g_return_val_if_fail(NM_IS_IP_CONFIG(config), NULL);
+
+    return _nml_coerce_property_str_not_empty(NM_IP_CONFIG_GET_PRIVATE(config)->clat_address);
+}
+
+/**
+ * nm_ip_config_get_clat_pref64:
+ * @config: a #NMIPConfig
+ *
+ * Gets the NAT64 prefix used by CLAT.
+ *
+ * Returns: (transfer none): the NAT64 prefix.
+ *
+ * Since: 1.58
+ **/
+const char *
+nm_ip_config_get_clat_pref64(NMIPConfig *config)
+{
+    g_return_val_if_fail(NM_IS_IP_CONFIG(config), NULL);
+
+    return _nml_coerce_property_str_not_empty(NM_IP_CONFIG_GET_PRIVATE(config)->clat_pref64);
+}
+
+/**
  * nm_ip_config_get_addresses:
  * @config: a #NMIPConfig
  *
diff --git a/src/libnm-client-impl/nm-libnm-utils.c b/src/libnm-client-impl/nm-libnm-utils.c
index 1c80c1dc..9f1b515c 100644
--- a/src/libnm-client-impl/nm-libnm-utils.c
+++ b/src/libnm-client-impl/nm-libnm-utils.c
@@ -516,6 +516,8 @@ nm_utils_fixup_product_string(const char *desc)
         "Network Everywhere",
         "N Wireless",
         "N+ Wireless",
+        "NBase-T/IEEE 802.3an",
+        "NBase-T/IEEE 802.3bz",
         "OCT To Fast Ethernet Converter",
         "PC Card",
         "PCI Express",
@@ -575,6 +577,7 @@ nm_utils_fixup_product_string(const char *desc)
         "10/100M",
         "10/20-Gigabit",
         "10/25/40/50GbE",
+        "10/25GbE",
         "10/40G",
         "10base-FL",
         "10BaseT",
@@ -585,6 +588,7 @@ nm_utils_fixup_product_string(const char *desc)
         "10Gb/25Gb/40Gb/50Gb",
         "10Gbase-T",
         "10GBase-T",
+        "10GBase-T/NBASE-T",
         "10GBASE-T",
         "10GbE",
         "10Gbps",
@@ -600,6 +604,7 @@ nm_utils_fixup_product_string(const char *desc)
         "16Gbps/10Gbps",
         "1GbE",
         "1x2:2",
+        "2.5GbE",
         "20GbE",
         "25Gb",
         "25GbE",
@@ -615,6 +620,8 @@ nm_utils_fixup_product_string(const char *desc)
         "54Mbps",
         "56k",
         "5G",
+        "5GbE",
+        "5GBase-T/NBASE-T",
         "802.11",
         "802.11a/b/g",
         "802.11abg",
diff --git a/src/libnm-client-impl/nm-object.c b/src/libnm-client-impl/nm-object.c
index add498e1..7b014c2d 100644
--- a/src/libnm-client-impl/nm-object.c
+++ b/src/libnm-client-impl/nm-object.c
@@ -98,7 +98,7 @@ nm_object_get_path(NMObject *object)
  * this returns %NULL. So it can be used to check whether the
  * object is still alive.
  *
- * Returns: (transfer none): the #NMClient cache in which the
+ * Returns: (type NMClient) (transfer none): the #NMClient cache in which the
  * object can be found, or %NULL if the object is no longer
  * cached.
  *
diff --git a/src/libnm-client-impl/tests/test-libnm.c b/src/libnm-client-impl/tests/test-libnm.c
index b30d02a5..3d49f4a5 100644
--- a/src/libnm-client-impl/tests/test-libnm.c
+++ b/src/libnm-client-impl/tests/test-libnm.c
@@ -694,6 +694,10 @@ test_fixup_product_string(void)
         T_DATA("Allnet ALL0283 [AR5523]", "Allnet ALL0283"),
         T_DATA("Allnet ALL0283 [AR5523](no firmware)", "Allnet ALL0283"),
         T_DATA("Allnet ALL0298 v2 802.11bg", "Allnet ALL0298"),
+        T_DATA("Alveo X3522, Quad Port, 10/25GbE Adaptable Accelerator Card",
+               "Alveo X3522 Quad Port Adaptable Accelerator"),
+        T_DATA("Alveo X3522, Quad Port, 10/25GbE Low Latency Network Adapter",
+               "Alveo X3522 Quad Port Low Latency"),
         T_DATA("AM10 v1 802.11n [Ralink RT3072]", "AM10"),
         T_DATA("AMD-8111 Ethernet", "AMD-8111"),
         T_DATA("AN2720 USB-USB Bridge", "AN2720 USB-USB Bridge"),
@@ -704,6 +708,28 @@ test_fixup_product_string(void)
         T_DATA("ANA620xx/ANA69011A", "ANA620xx/ANA69011A"),
         T_DATA("AN-WF500 802.11abgn + BT Wireless Adapter [Broadcom BCM43242]", "AN-WF500"),
         T_DATA("Aolynk WUB320g", "Aolynk WUB320g"),
+        T_DATA("AQtion AQC100 NBase-T/IEEE 802.3an Ethernet Controller [Atlantic 10G]",
+               "AQtion AQC100"),
+        T_DATA("AQtion AQC100S NBase-T/IEEE 802.3an Ethernet Controller [Atlantic 10G]",
+               "AQtion AQC100S"),
+        T_DATA("AQtion AQC107 NBase-T/IEEE 802.3an Ethernet Controller [Atlantic 10G]",
+               "AQtion AQC107"),
+        T_DATA("AQtion AQC107S NBase-T/IEEE 802.3an Ethernet Controller [Atlantic 10G]",
+               "AQtion AQC107S"),
+        T_DATA("AQC107 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion]", "AQC107"),
+        T_DATA("AQC108 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion]", "AQC108"),
+        T_DATA("AQC111 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion]", "AQC111"),
+        T_DATA("AQC112 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion]", "AQC112"),
+        T_DATA("AQtion AQC113 NBase-T/IEEE 802.3an Ethernet Controller [Antigua 10G]",
+               "AQtion AQC113"),
+        T_DATA("AQC113C NBase-T/IEEE 802.3an Ethernet Controller [Marvell Scalable mGig]",
+               "AQC113C"),
+        T_DATA("AQtion AQC113CS NBase-T/IEEE 802.3an Ethernet Controller [Antigua 10G]",
+               "AQtion AQC113CS"),
+        T_DATA("AQtion AQC114CS NBase-T/IEEE 802.3bz Ethernet Controller [Antigua 5G]",
+               "AQtion AQC114CS"),
+        T_DATA("AQtion AQC115C NBase-T/IEEE 802.3bz Ethernet Controller [Antigua 2.5G]",
+               "AQtion AQC115C"),
         T_DATA("AR2413/AR2414 Wireless Network Adapter [AR5005G(S) 802.11bg]", "AR2413/AR2414"),
         T_DATA("AR2417 Wireless Network Adapter [AR5007G 802.11bg]", "AR2417"),
         T_DATA("AR2425 Wireless Network Adapter [AR5007EG 802.11bg]", "AR2425"),
@@ -1684,6 +1710,9 @@ test_fixup_product_string(void)
         T_DATA("RTL8101/2/6E PCI Express Fast/Gigabit Ethernet controller", "RTL8101/2/6E"),
         T_DATA("RTL-8110SC/8169SC Gigabit Ethernet", "RTL-8110SC/8169SC"),
         T_DATA("RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller", "RTL8111/8168/8411"),
+        T_DATA("RTL8125 2.5GbE Controller", "RTL8125"),
+        T_DATA("RTL8126 5GbE Controller", "RTL8126"),
+        T_DATA("RTL8127 10GbE Controller", "RTL8127"),
         T_DATA("RTL-8129", "RTL-8129"),
         T_DATA("RTL8139D [Realtek] PCI 10/100BaseTX ethernet adaptor", "RTL8139D"),
         T_DATA("RTL8139 Ethernet", "RTL8139"),
@@ -1994,6 +2023,9 @@ test_fixup_product_string(void)
                "TEW-648UBM"),
         T_DATA("TG54USB 802.11bg", "TG54USB"),
         T_DATA("Thomson TG121N [Atheros AR9001U-(2)NG]", "Thomson TG121N"),
+        T_DATA("TN9510 10GBase-T/NBASE-T Ethernet Adapter", "TN9510"),
+        T_DATA("TN9710P 10GBase-T/NBASE-T Ethernet Adapter", "TN9710P"),
+        T_DATA("TN9710Q 5GBase-T/NBASE-T Ethernet Adapter", "TN9710Q"),
         T_DATA("Top Global Gobi 2000 Wireless Modem", "Top Global Gobi 2000"),
         T_DATA("TP-Link TL-WN322G v3 / TL-WN422G v2 802.11g [Atheros AR9271]",
                "TP-Link TL-WN322G / TL-WN422G"),
diff --git a/src/libnm-client-impl/tests/test-nm-client.c b/src/libnm-client-impl/tests/test-nm-client.c
index da252549..41f02d8b 100644
--- a/src/libnm-client-impl/tests/test-nm-client.c
+++ b/src/libnm-client-impl/tests/test-nm-client.c
@@ -299,7 +299,7 @@ test_wifi_ap_added_removed(void)
 
     ret = g_dbus_proxy_call_sync(sinfo->proxy,
                                  "AddWifiAp",
-                                 g_variant_new("(sss)", "wlan0", "test-ap", expected_bssid),
+                                 g_variant_new("(sssu)", "wlan0", "test-ap", expected_bssid, 2412),
                                  G_DBUS_CALL_FLAGS_NO_AUTO_START,
                                  3000,
                                  NULL,
diff --git a/src/libnm-client-public/nm-device-geneve.h b/src/libnm-client-public/nm-device-geneve.h
index 1c537fbd..5f7c92b3 100644
--- a/src/libnm-client-public/nm-device-geneve.h
+++ b/src/libnm-client-public/nm-device-geneve.h
@@ -34,25 +34,25 @@ G_BEGIN_DECLS
 /**
  * NMDeviceGeneve:
  *
- * Since: 1.58, 1.56.1
+ * Since: 1.58
  */
 typedef struct _NMDeviceGeneve      NMDeviceGeneve;
 typedef struct _NMDeviceGeneveClass NMDeviceGeneveClass;
 
-NM_AVAILABLE_IN_1_56_1
+NM_AVAILABLE_IN_1_58
 GType nm_device_geneve_get_type(void);
 
-NM_AVAILABLE_IN_1_56_1
+NM_AVAILABLE_IN_1_58
 guint nm_device_geneve_get_id(NMDeviceGeneve *device);
-NM_AVAILABLE_IN_1_56_1
+NM_AVAILABLE_IN_1_58
 const char *nm_device_geneve_get_remote(NMDeviceGeneve *device);
-NM_AVAILABLE_IN_1_56_1
+NM_AVAILABLE_IN_1_58
 guint nm_device_geneve_get_dst_port(NMDeviceGeneve *device);
-NM_AVAILABLE_IN_1_56_1
+NM_AVAILABLE_IN_1_58
 guint nm_device_geneve_get_tos(NMDeviceGeneve *device);
-NM_AVAILABLE_IN_1_56_1
+NM_AVAILABLE_IN_1_58
 guint nm_device_geneve_get_ttl(NMDeviceGeneve *device);
-NM_AVAILABLE_IN_1_56_1
+NM_AVAILABLE_IN_1_58
 guint nm_device_geneve_get_df(NMDeviceGeneve *device);
 
 G_END_DECLS
diff --git a/src/libnm-client-public/nm-device.h b/src/libnm-client-public/nm-device.h
index 2ee3a4ae..d0d004f8 100644
--- a/src/libnm-client-public/nm-device.h
+++ b/src/libnm-client-public/nm-device.h
@@ -150,14 +150,14 @@ NM_AVAILABLE_IN_1_2
 NM_DEPRECATED_IN_1_22
 _NM_DEPRECATED_SYNC_METHOD
 void nm_device_set_managed(NMDevice *device, gboolean managed);
-NM_AVAILABLE_IN_1_56_1
+NM_AVAILABLE_IN_1_58
 void nm_device_set_managed_async(NMDevice            *device,
                                  NMDeviceManaged      managed,
                                  NMDeviceManagedFlags flags,
                                  GCancellable        *cancellable,
                                  GAsyncReadyCallback  callback,
                                  gpointer             user_data);
-NM_AVAILABLE_IN_1_56_1
+NM_AVAILABLE_IN_1_58
 gboolean nm_device_set_managed_finish(NMDevice *device, GAsyncResult *result, GError **error);
 
 gboolean nm_device_get_autoconnect(NMDevice *device);
diff --git a/src/libnm-client-public/nm-ip-config.h b/src/libnm-client-public/nm-ip-config.h
index 9ad15d30..56eb29a0 100644
--- a/src/libnm-client-public/nm-ip-config.h
+++ b/src/libnm-client-public/nm-ip-config.h
@@ -38,11 +38,17 @@ typedef struct _NMIPConfigClass NMIPConfigClass;
 #define NM_IP_CONFIG_DOMAINS      "domains"
 #define NM_IP_CONFIG_SEARCHES     "searches"
 #define NM_IP_CONFIG_WINS_SERVERS "wins-servers"
+#define NM_IP_CONFIG_CLAT_ADDRESS "clat-address"
+#define NM_IP_CONFIG_CLAT_PREF64  "clat-pref64"
 
 GType nm_ip_config_get_type(void);
 
-int                nm_ip_config_get_family(NMIPConfig *config);
-const char        *nm_ip_config_get_gateway(NMIPConfig *config);
+int         nm_ip_config_get_family(NMIPConfig *config);
+const char *nm_ip_config_get_gateway(NMIPConfig *config);
+NM_AVAILABLE_IN_1_58
+const char *nm_ip_config_get_clat_address(NMIPConfig *config);
+NM_AVAILABLE_IN_1_58
+const char        *nm_ip_config_get_clat_pref64(NMIPConfig *config);
 GPtrArray         *nm_ip_config_get_addresses(NMIPConfig *config);
 GPtrArray         *nm_ip_config_get_routes(NMIPConfig *config);
 const char *const *nm_ip_config_get_nameservers(NMIPConfig *config);
diff --git a/src/libnm-core-aux-intern/nm-libnm-core-utils.c b/src/libnm-core-aux-intern/nm-libnm-core-utils.c
index a39f6454..9a0b5e7c 100644
--- a/src/libnm-core-aux-intern/nm-libnm-core-utils.c
+++ b/src/libnm-core-aux-intern/nm-libnm-core-utils.c
@@ -1149,3 +1149,196 @@ nm_setting_ovs_other_config_check_val(const char *val, GError **error)
 
     return TRUE;
 }
+
+/*****************************************************************************/
+
+typedef struct {
+    NMIPAddr dest;
+    guint    prefix;
+} DirectRoute;
+
+static void
+_setting_ip_config_collect_unreachable_gateways(NMSettingIPConfig *s_ip, GHashTable **result)
+{
+    const int            addr_family = nm_setting_ip_config_get_addr_family(s_ip);
+    guint                num_routes;
+    guint                num_addrs;
+    guint                n_direct_routes = 0;
+    NMIPAddr             gw_bin          = NM_IP_ADDR_INIT;
+    guint                i;
+    guint                j;
+    const char          *gateway;
+    gs_free DirectRoute *direct_routes = NULL;
+
+    num_routes = nm_setting_ip_config_get_num_routes(s_ip);
+    num_addrs  = nm_setting_ip_config_get_num_addresses(s_ip);
+
+    direct_routes = g_new0(DirectRoute, num_routes + num_addrs);
+
+    /* Collect direct routes (routes without a gateway) from the setting. */
+    for (i = 0; i < num_routes; i++) {
+        NMIPRoute *route = nm_setting_ip_config_get_route(s_ip, i);
+
+        if (nm_ip_route_get_next_hop(route))
+            continue;
+
+        nm_ip_route_get_dest_binary(route, &direct_routes[n_direct_routes].dest);
+        direct_routes[n_direct_routes].prefix = nm_ip_route_get_prefix(route);
+        n_direct_routes++;
+    }
+
+    /* Add prefix routes (device routes) for each static address. */
+    for (i = 0; i < num_addrs; i++) {
+        NMIPAddress *addr = nm_setting_ip_config_get_address(s_ip, i);
+
+        nm_ip_address_get_address_binary(addr, &direct_routes[n_direct_routes].dest);
+        direct_routes[n_direct_routes].prefix = nm_ip_address_get_prefix(addr);
+        n_direct_routes++;
+    }
+
+    /* Check the setting's default gateway. */
+    gateway = nm_setting_ip_config_get_gateway(s_ip);
+    if (gateway && nm_inet_parse_bin(addr_family, gateway, NULL, &gw_bin)) {
+        gboolean reachable = FALSE;
+
+        if (addr_family == AF_INET6 && IN6_IS_ADDR_LINKLOCAL(&gw_bin.addr6))
+            reachable = TRUE;
+
+        if (!reachable) {
+            for (j = 0; j < n_direct_routes; j++) {
+                if (nm_ip_addr_same_prefix(addr_family,
+                                           &gw_bin,
+                                           &direct_routes[j].dest,
+                                           direct_routes[j].prefix)) {
+                    reachable = TRUE;
+                    break;
+                }
+            }
+        }
+
+        if (!reachable) {
+            if (!*result)
+                *result = g_hash_table_new(nm_str_hash, g_str_equal);
+            g_hash_table_add(*result, (gpointer) gateway);
+        }
+    }
+
+    /* Check gateways of each route in the setting. */
+    for (i = 0; i < num_routes; i++) {
+        NMIPRoute *route     = nm_setting_ip_config_get_route(s_ip, i);
+        NMIPAddr   next_hop  = NM_IP_ADDR_INIT;
+        gboolean   reachable = FALSE;
+        GVariant  *attribute;
+
+        if (!nm_ip_route_get_next_hop_binary(route, &next_hop))
+            continue;
+
+        if (addr_family == AF_INET6 && IN6_IS_ADDR_LINKLOCAL(&next_hop.addr6))
+            continue;
+
+        attribute = nm_ip_route_get_attribute(route, NM_IP_ROUTE_ATTRIBUTE_ONLINK);
+        if (attribute && g_variant_is_of_type(attribute, G_VARIANT_TYPE("b"))
+            && g_variant_get_boolean(attribute)) {
+            /* the gateway of a onlink route is reachable */
+            continue;
+        }
+
+        for (j = 0; j < n_direct_routes; j++) {
+            if (nm_ip_addr_same_prefix(addr_family,
+                                       &next_hop,
+                                       &direct_routes[j].dest,
+                                       direct_routes[j].prefix)) {
+                reachable = TRUE;
+                break;
+            }
+        }
+
+        if (!reachable) {
+            if (!*result)
+                *result = g_hash_table_new(nm_str_hash, g_str_equal);
+            g_hash_table_add(*result, (gpointer) nm_ip_route_get_next_hop(route));
+        }
+    }
+}
+
+/**
+ * nm_connection_get_unreachable_gateways:
+ * @connection: the #NMConnection
+ *
+ * Checks whether there are gateways (either the default gateway or gateways
+ * of routes) that are not directly reachable in the IPv4 and IPv6 settings
+ * of the connection. A gateway is considered directly reachable if it falls
+ * within the subnet of a direct route (a route without a next hop) or of a
+ * prefix route from a static address.
+ *
+ * Returns: a %NULL-terminated array of gateway strings not directly reachable,
+ *   or %NULL if all gateways are reachable. The individual strings are owned
+ *   by the setting. Free the returned array with g_free().
+ */
+const char **
+nm_connection_get_unreachable_gateways(NMConnection *connection)
+{
+    gs_unref_hashtable GHashTable *result = NULL;
+    NMSettingIPConfig             *s_ip;
+    guint                          len;
+    const char                   **strv;
+
+    if (!connection)
+        return NULL;
+
+    s_ip = nm_connection_get_setting_ip4_config(connection);
+    if (s_ip
+        && nm_streq0(nm_setting_ip_config_get_method(s_ip), NM_SETTING_IP4_CONFIG_METHOD_MANUAL)) {
+        _setting_ip_config_collect_unreachable_gateways(s_ip, &result);
+    }
+
+    s_ip = nm_connection_get_setting_ip6_config(connection);
+    if (s_ip
+        && nm_streq0(nm_setting_ip_config_get_method(s_ip), NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) {
+        _setting_ip_config_collect_unreachable_gateways(s_ip, &result);
+    }
+
+    if (result) {
+        strv = (const char **) g_hash_table_get_keys_as_array(result, &len);
+        nm_strv_sort(strv, len);
+        return strv;
+    }
+
+    return NULL;
+}
+
+/**
+ * nm_connection_get_unreachable_gateways_warning:
+ * @connection: the #NMConnection
+ * @translate: whether to translate the message (use %TRUE for user-facing
+ *   tools like nmcli, %FALSE for daemon logs)
+ *
+ * Checks whether there are unreachable gateways in the connection and returns
+ * a formatted warning message if so.
+ *
+ * Returns: a warning message string, or %NULL if all gateways are reachable.
+ *   Free with g_free().
+ */
+char *
+nm_connection_get_unreachable_gateways_warning(NMConnection *connection, gboolean translate)
+{
+    gs_free const char **gateways = NULL;
+    gs_free char        *gw_list  = NULL;
+    const char          *msg =
+        N_("the following gateways are not directly reachable from any configured address or "
+           "route: %s. NetworkManager currently adds on-link routes for them automatically, "
+           "but this will change in the future. Consider adding addresses or routes whose "
+           "subnets cover these gateways");
+
+    gateways = nm_connection_get_unreachable_gateways(connection);
+    if (!gateways)
+        return NULL;
+
+    gw_list = g_strjoinv(", ", (char **) gateways);
+
+    NM_PRAGMA_WARNING_DISABLE("-Wformat-nonliteral")
+    if (translate)
+        return g_strdup_printf(_(msg), gw_list);
+    return g_strdup_printf(msg, gw_list);
+    NM_PRAGMA_WARNING_REENABLE
+}
diff --git a/src/libnm-core-aux-intern/nm-libnm-core-utils.h b/src/libnm-core-aux-intern/nm-libnm-core-utils.h
index 0e75982e..ad0bad44 100644
--- a/src/libnm-core-aux-intern/nm-libnm-core-utils.h
+++ b/src/libnm-core-aux-intern/nm-libnm-core-utils.h
@@ -342,4 +342,29 @@ const char *nm_dns_uri_normalize(int addr_family, const char *str, char **out_fr
 gboolean nm_setting_ovs_other_config_check_key(const char *key, GError **error);
 gboolean nm_setting_ovs_other_config_check_val(const char *val, GError **error);
 
+/*****************************************************************************/
+
+const char **nm_connection_get_unreachable_gateways(NMConnection *connection);
+
+char *nm_connection_get_unreachable_gateways_warning(NMConnection *connection, gboolean translate);
+
+/*****************************************************************************/
+
+/* Wi-Fi frequencies range for each band */
+#define _NM_WIFI_FREQ_MIN_2GHZ 2412
+#define _NM_WIFI_FREQ_MAX_2GHZ 2484
+#define _NM_WIFI_FREQ_MIN_5GHZ 4915
+#define _NM_WIFI_FREQ_MAX_5GHZ 5825
+#define _NM_WIFI_FREQ_MIN_6GHZ 5955
+#define _NM_WIFI_FREQ_MAX_6GHZ 7115
+
+#define _NM_WIFI_FREQ_MIN _NM_WIFI_FREQ_MIN_2GHZ
+#define _NM_WIFI_FREQ_MAX _NM_WIFI_FREQ_MAX_6GHZ
+
+/* Max Wi-Fi channel for each band */
+#define _NM_WIFI_CHANNEL_MAX_2GHZ 14
+#define _NM_WIFI_CHANNEL_MAX_5GHZ 177
+#define _NM_WIFI_CHANNEL_MAX_6GHZ 233
+#define _NM_WIFI_CHANNEL_MAX      _NM_WIFI_CHANNEL_MAX_6GHZ
+
 #endif /* __NM_LIBNM_SHARED_UTILS_H__ */
diff --git a/src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.xml.in b/src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.xml.in
index 8d5d3bc9..7308db4d 100644
--- a/src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.xml.in
+++ b/src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.xml.in
@@ -1680,6 +1680,10 @@
                   dbus-type="i"
                   gprop-type="NMTernary"
                   />
+        <property name="clat"
+                  dbus-type="i"
+                  gprop-type="gint"
+                  />
         <property name="dad-timeout"
                   dbus-type="i"
                   gprop-type="gint"
diff --git a/src/libnm-core-impl/nm-connection.c b/src/libnm-core-impl/nm-connection.c
index 180fcbbc..9ce72b41 100644
--- a/src/libnm-core-impl/nm-connection.c
+++ b/src/libnm-core-impl/nm-connection.c
@@ -3535,7 +3535,7 @@ nm_connection_get_setting_generic(NMConnection *connection)
  *
  * Returns: (transfer none): an #NMSettingGeneve if the connection contains one, otherwise NULL
  *
- * Since: 1.58, 1.56.1
+ * Since: 1.58
  **/
 NMSettingGeneve *
 nm_connection_get_setting_geneve(NMConnection *connection)
diff --git a/src/libnm-core-impl/nm-setting-8021x.c b/src/libnm-core-impl/nm-setting-8021x.c
index f9333803..ac148efa 100644
--- a/src/libnm-core-impl/nm-setting-8021x.c
+++ b/src/libnm-core-impl/nm-setting-8021x.c
@@ -3133,6 +3133,12 @@ need_secrets(NMSetting *setting, gboolean check_rerequest)
 
 /*****************************************************************************/
 
+static NMSetting8021xCKScheme
+_ck_scheme_path(NMSetting8021x *_sett)
+{
+    return NM_SETTING_802_1X_CK_SCHEME_PATH;
+}
+
 static void
 get_private_files(NMSetting *setting, GPtrArray *files)
 {
@@ -3159,6 +3165,7 @@ get_private_files(NMSetting *setting, GPtrArray *files)
         {NM_SETTING_802_1X_PHASE2_PRIVATE_KEY,
          nm_setting_802_1x_get_phase2_private_key_scheme,
          nm_setting_802_1x_get_phase2_private_key_path},
+        {NM_SETTING_802_1X_PAC_FILE, _ck_scheme_path, nm_setting_802_1x_get_pac_file},
     };
     NMSetting8021x *s_8021x = NM_SETTING_802_1X(setting);
     const char     *path;
@@ -3390,7 +3397,7 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass)
                                               obj_properties,
                                               NM_SETTING_802_1X_PAC_FILE,
                                               PROP_PAC_FILE,
-                                              NM_SETTING_PARAM_NONE,
+                                              NM_SETTING_PARAM_CERT_KEY_FILE,
                                               NMSetting8021xPrivate,
                                               pac_file,
                                               .direct_string_allow_empty = TRUE);
diff --git a/src/libnm-core-impl/nm-setting-bond.c b/src/libnm-core-impl/nm-setting-bond.c
index 7204df48..6e390159 100644
--- a/src/libnm-core-impl/nm-setting-bond.c
+++ b/src/libnm-core-impl/nm-setting-bond.c
@@ -197,7 +197,7 @@ static NM_UTILS_STRING_TABLE_LOOKUP_STRUCT_DEFINE(
      {"any", NM_BOND_OPTION_TYPE_BOTH, 0, 1, _option_default_strv_arp_all_targets}},
     {NM_SETTING_BOND_OPTION_ARP_INTERVAL, {"0", NM_BOND_OPTION_TYPE_INT, 0, G_MAXINT}},
     {NM_SETTING_BOND_OPTION_ARP_IP_TARGET, {"", NM_BOND_OPTION_TYPE_IP}},
-    {NM_SETTING_BOND_OPTION_ARP_MISSED_MAX, {"0", NM_BOND_OPTION_TYPE_INT, 0, 255}},
+    {NM_SETTING_BOND_OPTION_ARP_MISSED_MAX, {"2", NM_BOND_OPTION_TYPE_INT, 0, 255}},
     {NM_SETTING_BOND_OPTION_ARP_VALIDATE,
      {"none", NM_BOND_OPTION_TYPE_BOTH, 0, 6, _option_default_strv_arp_validate}},
     {NM_SETTING_BOND_OPTION_BALANCE_SLB, {"0", NM_BOND_OPTION_TYPE_INT, 0, 1}},
@@ -364,6 +364,10 @@ _bond_get_option_normalized(NMSettingBond *self, const char *option, gboolean ge
                 /* balance-slb implies vlan+srcmac */
                 return "5";
             }
+        } else if (nm_streq(option, NM_SETTING_BOND_OPTION_ARP_MISSED_MAX)) {
+            value = _bond_get_option(self, NM_SETTING_BOND_OPTION_ARP_MISSED_MAX) ?: "0";
+            if (nm_streq(value, "0"))
+                value = _bond_get_option_default(self, option);
         } else
             value = _bond_get_option(self, option);
 
@@ -894,13 +898,16 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
 
     miimon       = _atoi(_bond_get_option_or_default(self, NM_SETTING_BOND_OPTION_MIIMON));
     arp_interval = _atoi(_bond_get_option_or_default(self, NM_SETTING_BOND_OPTION_ARP_INTERVAL));
-    arp_missed_max =
-        _atoi(_bond_get_option_or_default(self, NM_SETTING_BOND_OPTION_ARP_MISSED_MAX));
     num_grat_arp = _atoi(_bond_get_option_or_default(self, NM_SETTING_BOND_OPTION_NUM_GRAT_ARP));
     num_unsol_na = _atoi(_bond_get_option_or_default(self, NM_SETTING_BOND_OPTION_NUM_UNSOL_NA));
     peer_notif_delay =
         _atoi(_bond_get_option_or_default(self, NM_SETTING_BOND_OPTION_PEER_NOTIF_DELAY));
 
+    /* "0" is an invalid value in the kernel, but we used to accept it to indicate "default value".
+     * Keep accepting "0" as a valid value, although we'll apply a different value, actually.
+     * Bond modes that don't accept arp_missed_max must just ignore the "0" value, too. */
+    arp_missed_max = _atoi(_bond_get_option(self, NM_SETTING_BOND_OPTION_ARP_MISSED_MAX) ?: "0");
+
     /* Option restrictions:
      *
      * arp_interval conflicts [ alb, tlb ]
@@ -950,6 +957,9 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
             g_prefix_error(error, "%s.%s: ", NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_OPTIONS);
             return FALSE;
         }
+    }
+
+    if (NM_IN_SET(bond_mode, NM_BOND_MODE_TLB, NM_BOND_MODE_ALB, NM_BOND_MODE_8023AD)) {
         if (arp_missed_max > 0) {
             g_set_error(error,
                         NM_CONNECTION_ERROR,
diff --git a/src/libnm-core-impl/nm-setting-connection.c b/src/libnm-core-impl/nm-setting-connection.c
index 0ad97846..96dff146 100644
--- a/src/libnm-core-impl/nm-setting-connection.c
+++ b/src/libnm-core-impl/nm-setting-connection.c
@@ -3328,9 +3328,8 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass)
      *
      * The number of retries for the authentication. Zero means to try indefinitely; -1 means
      * to use a global default. If the global default is not set, the authentication
-     * retries for 3 times before failing the connection.
-     *
-     * Currently, this only applies to 802-1x authentication.
+     * retries for 3 times before failing the connection. Connections using a pre-shared key
+     * to authenticate will only prompt for a new key during the last authentication attempt.
      *
      * Since: 1.10
      **/
diff --git a/src/libnm-core-impl/nm-setting-geneve.c b/src/libnm-core-impl/nm-setting-geneve.c
index b01fcd9a..d6426a06 100644
--- a/src/libnm-core-impl/nm-setting-geneve.c
+++ b/src/libnm-core-impl/nm-setting-geneve.c
@@ -65,7 +65,7 @@ G_DEFINE_TYPE(NMSettingGeneve, nm_setting_geneve, NM_TYPE_SETTING)
  *
  * Returns: the #NMSettingGeneve:id property of the setting
  *
- * Since: 1.58, 1.56.1
+ * Since: 1.58
  **/
 guint
 nm_setting_geneve_get_id(NMSettingGeneve *setting)
@@ -81,7 +81,7 @@ nm_setting_geneve_get_id(NMSettingGeneve *setting)
  *
  * Returns: the #NMSettingGeneve:remote property of the setting
  *
- * Since: 1.58, 1.56.1
+ * Since: 1.58
  **/
 const char *
 nm_setting_geneve_get_remote(NMSettingGeneve *setting)
@@ -97,7 +97,7 @@ nm_setting_geneve_get_remote(NMSettingGeneve *setting)
  *
  * Returns: the #NMSettingGeneve:destination-port property of the setting
  *
- * Since: 1.58, 1.56.1
+ * Since: 1.58
  **/
 guint
 nm_setting_geneve_get_destination_port(NMSettingGeneve *setting)
@@ -113,7 +113,7 @@ nm_setting_geneve_get_destination_port(NMSettingGeneve *setting)
  *
  * Returns: the #NMSettingGeneve:tos property of the setting
  *
- * Since: 1.58, 1.56.1
+ * Since: 1.58
  **/
 guint
 nm_setting_geneve_get_tos(NMSettingGeneve *setting)
@@ -129,7 +129,7 @@ nm_setting_geneve_get_tos(NMSettingGeneve *setting)
  *
  * Returns: the #NMSettingGeneve:ttl property of the setting
  *
- * Since: 1.58, 1.56.1
+ * Since: 1.58
  **/
 guint
 nm_setting_geneve_get_ttl(NMSettingGeneve *setting)
@@ -145,7 +145,7 @@ nm_setting_geneve_get_ttl(NMSettingGeneve *setting)
  *
  * Returns: the #NMSettingGeneve:df property of the setting
  *
- * Since: 1.58, 1.56.1
+ * Since: 1.58
  **/
 NMSettingGeneveDf
 nm_setting_geneve_get_df(NMSettingGeneve *setting)
@@ -206,7 +206,7 @@ nm_setting_geneve_init(NMSettingGeneve *self)
  *
  * Returns: (transfer full): the new empty #NMSettingGeneve object
  *
- * Since: 1.58, 1.56.1
+ * Since: 1.58
  **/
 NMSetting *
 nm_setting_geneve_new(void)
@@ -232,7 +232,7 @@ nm_setting_geneve_class_init(NMSettingGeneveClass *klass)
      * Specifies the GENEVE Network Identifier (or GENEVE Segment Identifier) to
      * use.
      *
-     * Since: 1.58, 1.56.1
+     * Since: 1.58
      **/
     _nm_setting_property_define_direct_uint32(properties_override,
                                               obj_properties,
@@ -251,7 +251,7 @@ nm_setting_geneve_class_init(NMSettingGeneveClass *klass)
      * Specifies the unicast destination IP address to use in outgoing packets
      * when communicating with the remote GENEVE tunnel endpoint.
      *
-     * Since: 1.58, 1.56.1
+     * Since: 1.58
      **/
     _nm_setting_property_define_direct_string(properties_override,
                                               obj_properties,
@@ -270,7 +270,7 @@ nm_setting_geneve_class_init(NMSettingGeneveClass *klass)
      * Specifies the UDP destination port to communicate to the remote GENEVE
      * tunnel endpoint.
      *
-     * Since: 1.58, 1.56.1
+     * Since: 1.58
      **/
     _nm_setting_property_define_direct_uint32(properties_override,
                                               obj_properties,
@@ -289,7 +289,7 @@ nm_setting_geneve_class_init(NMSettingGeneveClass *klass)
      * Specifies the TOS value to use in outgoing packets.
      * The special value "inherit" (1) means inherit from outer packet.
      *
-     * Since: 1.58, 1.56.1
+     * Since: 1.58
      **/
     _nm_setting_property_define_direct_uint32(properties_override,
                                               obj_properties,
@@ -308,7 +308,7 @@ nm_setting_geneve_class_init(NMSettingGeneveClass *klass)
      * Specifies the time-to-live value to use in outgoing packets.
      * The special value "inherit" (-1) means inherit from outer packet, 0 means auto, 1-255 are fixed values.
      *
-     * Since: 1.58, 1.56.1
+     * Since: 1.58
      **/
     _nm_setting_property_define_direct_int32(properties_override,
                                              obj_properties,
@@ -331,7 +331,7 @@ nm_setting_geneve_class_init(NMSettingGeneveClass *klass)
      * %NM_SETTING_GENEVE_DF_SET (1): Always set the DF flag, packets will not be fragmented.
      * %NM_SETTING_GENEVE_DF_INHERIT (2): Inherit the DF flag from the inner IP header.
      *
-     * Since: 1.58, 1.56.1
+     * Since: 1.58
      **/
     _nm_setting_property_define_direct_enum(properties_override,
                                             obj_properties,
diff --git a/src/libnm-core-impl/nm-setting-ip-config.c b/src/libnm-core-impl/nm-setting-ip-config.c
index f4ee094c..cee35159 100644
--- a/src/libnm-core-impl/nm-setting-ip-config.c
+++ b/src/libnm-core-impl/nm-setting-ip-config.c
@@ -1401,7 +1401,7 @@ _ip_route_attribute_validate(const char           *name,
                         NM_CONNECTION_ERROR_FAILED,
                         family == AF_INET ? _("'%s' is not a valid IPv4 address")
                                           : _("'%s' is not a valid IPv6 address"),
-                        string);
+                        addr);
             return FALSE;
         }
         break;
@@ -6960,7 +6960,7 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass)
      * activation will fail. The property is currently implemented only for IPv4.
      *
      * A zero value means that no duplicate address detection is performed, -1 means
-     * the default value (either the value configured globally in NetworkManger.conf
+     * the default value (either the value configured globally in NetworkManager.conf
      * or 200ms).  A value greater than zero is a timeout in milliseconds.  Note that
      * the time intervals are subject to randomization as per RFC 5227 and so the
      * actual duration can be between half and the full time specified in this
@@ -7006,7 +7006,7 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass)
      * This property is useful for example if both IPv4 and IPv6 are enabled and
      * are allowed to fail. Normally the connection succeeds as soon as one of
      * the two address families completes; by setting a required timeout for
-     * e.g. IPv4, one can ensure that even if IP6 succeeds earlier than IPv4,
+     * e.g. IPv4, one can ensure that even if IPv6 succeeds earlier than IPv4,
      * NetworkManager waits some time for IPv4 before the connection becomes
      * active.
      *
@@ -7050,8 +7050,7 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass)
      * values "duid" and "ipv6-duid" to generate the client-id.
      *
      * For DHCPv6, note that at the moment this property is
-     * only supported by the "internal" DHCPv6 plugin. The "dhclient" DHCPv6
-     * plugin always derives the IAID from the MAC address.
+     * only supported by the "internal" DHCPv6 plugin.
      *
      * The actually used DHCPv6 IAID for a currently activated interface is
      * exposed in the lease information of the device.
diff --git a/src/libnm-core-impl/nm-setting-ip4-config.c b/src/libnm-core-impl/nm-setting-ip4-config.c
index a4fccc6d..2eea98f6 100644
--- a/src/libnm-core-impl/nm-setting-ip4-config.c
+++ b/src/libnm-core-impl/nm-setting-ip4-config.c
@@ -40,7 +40,8 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_DHCP_CLIENT_ID,
                                   PROP_DHCP_FQDN,
                                   PROP_DHCP_VENDOR_CLASS_IDENTIFIER,
                                   PROP_LINK_LOCAL,
-                                  PROP_DHCP_IPV6_ONLY_PREFERRED, );
+                                  PROP_DHCP_IPV6_ONLY_PREFERRED,
+                                  PROP_CLAT, );
 
 typedef struct {
     NMSettingIPConfigPrivate parent;
@@ -50,6 +51,7 @@ typedef struct {
     char  *dhcp_vendor_class_identifier;
     gint32 link_local;
     gint32 dhcp_ipv6_only_preferred;
+    gint32 clat;
 } NMSettingIP4ConfigPrivate;
 
 /**
@@ -168,6 +170,24 @@ nm_setting_ip4_config_get_dhcp_ipv6_only_preferred(NMSettingIP4Config *setting)
     return NM_SETTING_IP4_CONFIG_GET_PRIVATE(setting)->dhcp_ipv6_only_preferred;
 }
 
+/**
+ * nm_setting_ip4_config_get_clat:
+ * @setting: the #NMSettingIP4Config
+ *
+ * Returns the value in the #NMSettingIP4Config:clat property.
+ *
+ * Returns: the CLAT property value
+ *
+ * Since: 1.58
+ */
+NMSettingIp4ConfigClat
+nm_setting_ip4_config_get_clat(NMSettingIP4Config *setting)
+{
+    g_return_val_if_fail(NM_IS_SETTING_IP4_CONFIG(setting), NM_SETTING_IP4_CONFIG_CLAT_DEFAULT);
+
+    return NM_SETTING_IP4_CONFIG_GET_PRIVATE(setting)->clat;
+}
+
 static gboolean
 verify(NMSetting *setting, NMConnection *connection, GError **error)
 {
@@ -186,12 +206,15 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
 
     if (!strcmp(method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL)) {
         if (nm_setting_ip_config_get_num_addresses(s_ip) == 0
-            && nm_setting_ip_config_get_num_routes(s_ip) == 0) {
-            g_set_error(error,
-                        NM_CONNECTION_ERROR,
-                        NM_CONNECTION_ERROR_MISSING_PROPERTY,
-                        _("method '%s' requires at least an address or a route"),
-                        method);
+            && nm_setting_ip_config_get_num_routes(s_ip) == 0
+            && nm_setting_ip4_config_get_clat(NM_SETTING_IP4_CONFIG(s_ip))
+                   != NM_SETTING_IP4_CONFIG_CLAT_FORCE) {
+            g_set_error(
+                error,
+                NM_CONNECTION_ERROR,
+                NM_CONNECTION_ERROR_MISSING_PROPERTY,
+                _("method '%s' requires at least an address, a route, or CLAT set to 'force'"),
+                method);
             g_prefix_error(error,
                            "%s.%s: ",
                            NM_SETTING_IP4_CONFIG_SETTING_NAME,
@@ -930,10 +953,7 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass)
      * this is normally not recommended.
      *
      * If unset, a globally configured default from NetworkManager.conf is
-     * used. If still unset, the default depends on the DHCP plugin. The
-     * internal dhcp client will default to "mac" and the dhclient plugin will
-     * try to use one from its config file if present, or won't sent any
-     * client-id otherwise.
+     * used. If still unset, internal dhcp client will default to "mac".
      **/
     /* ---nmcli---
      * property: dhcp-client-id
@@ -1259,7 +1279,7 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass)
      *        won't get merged. If the route finds no merge partner, it is
      *        configured as single hop route.</para> <para>Note that in
      *        NetworkManager, currently all nexthops of a ECMP route must share
-     *        the same "onlink" flag in order to be mergable.</para>
+     *        the same "onlink" flag in order to be mergeable.</para>
      *      </listitem>
      *      <listitem>
      *        <para><literal>"window"</literal> - an unsigned 32 bit integer.</para>
@@ -1353,18 +1373,25 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass)
     /**
      * NMSettingIP4Config:dhcp-ipv6-only-preferred
      *
-     * Controls the "IPv6-Only Preferred" DHCPv4 option (RFC 8925).
+     * Controls the "IPv6-Only Preferred" DHCPv4 option (option 108 - RFC 8925).
      *
      * When set to %NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_YES, the host adds the
      * option to the parameter request list; if the DHCP server sends the option back,
      * the host stops the DHCP client for the time interval specified in the option.
      *
      * Enable this feature if the host supports an IPv6-only mode, i.e. either all
-     * applications are IPv6-only capable or there is a form of 464XLAT deployed.
+     * applications are IPv6-only capable or there is a form of CLAT (464XLAT)
+     * deployed.
+     *
+     * If set to %NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_AUTO, the option is
+     * automatically turned on when the IPv6 method is "auto" and the connection
+     * profile has ipv4.clat set to "yes" or "auto". If these two conditions are
+     * met, the host can operate in IPv6-only mode and therefore it is safe to
+     * disable DHCPv4 when the network also supports it.
      *
      * When set to %NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_DEFAULT, the actual value
      * is looked up in the global configuration; if not specified, it defaults to
-     * %NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_NO.
+     * %NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_AUTO.
      *
      * If the connection has IPv6 method set to "disabled", this property does not
      * have effect and the "IPv6-Only Preferred" option is always disabled.
@@ -1382,6 +1409,39 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass)
                                             NMSettingIP4ConfigPrivate,
                                             dhcp_ipv6_only_preferred);
 
+    /**
+     * NMSettingIP4Config:clat
+     *
+     * Controls the CLAT (Customer-side translator) functionality. CLAT is used to implement the
+     * client part of 464XLAT (RFC 6877), an architecture that provides IPv4 connectivity to hosts
+     * on IPv6-only networks.
+     *
+     * When CLAT is enabled, NetworkManager discovers the NAT64 prefix from IPv6 Router Advertisements;
+     * if a NAT64 prefix is announced, NetworkManager installs a BPF program to perform the stateless
+     * translation of packets between IPv4 and IPv6.
+     *
+     * Setting %NM_SETTING_IP4_CONFIG_CLAT_NO completely disables CLAT. %NM_SETTING_IP4_CONFIG_CLAT_AUTO
+     * enables CLAT only when the IPv4 method is 'auto' and the device doesn't have a native IPv4 gateway.
+     * %NM_SETTING_IP4_CONFIG_CLAT_FORCE enables CLAT even if the IPv4 method is not 'auto' and even if
+     * the device has a native IPv4 gateway.
+     *
+     * When set to %NM_SETTING_IP4_CONFIG_CLAT_DEFAULT, the actual value is looked up in the global
+     * configuration; if not specified it defaults to %NM_SETTING_IP4_CONFIG_CLAT_NO. In the future the
+     * default fall back value will change to %NM_SETTING_IP4_CONFIG_CLAT_AUTO.
+     *
+     * Since: 1.58
+     */
+    _nm_setting_property_define_direct_enum(properties_override,
+                                            obj_properties,
+                                            NM_SETTING_IP4_CONFIG_CLAT,
+                                            PROP_CLAT,
+                                            NM_TYPE_SETTING_IP4_CONFIG_CLAT,
+                                            NM_SETTING_IP4_CONFIG_CLAT_DEFAULT,
+                                            NM_SETTING_PARAM_NONE,
+                                            NULL,
+                                            NMSettingIP4ConfigPrivate,
+                                            clat);
+
     g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
     _nm_setting_class_commit(setting_class,
diff --git a/src/libnm-core-impl/nm-setting-ip6-config.c b/src/libnm-core-impl/nm-setting-ip6-config.c
index c68be991..25997f75 100644
--- a/src/libnm-core-impl/nm-setting-ip6-config.c
+++ b/src/libnm-core-impl/nm-setting-ip6-config.c
@@ -1265,11 +1265,9 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass)
      * DUID and filled as an opaque value in the Client Identifier option.
      *
      * The special value "lease" will retrieve the DUID previously used from the
-     * lease file belonging to the connection. If no DUID is found and "dhclient"
-     * is the configured dhcp client, the DUID is searched in the system-wide
-     * dhclient lease file. If still no DUID is found, or another dhcp client is
-     * used, a global and permanent DUID-UUID (RFC 6355) will be generated based
-     * on the machine-id.
+     * lease file belonging to the connection. If no DUID is found, a global
+     * and permanent DUID-UUID (RFC 6355) will be generated based on the
+     * machine-id.
      *
      * The special values "llt" and "ll" will generate a DUID of type LLT or LL
      * (see RFC 3315) based on the current MAC address of the device. In order to
diff --git a/src/libnm-core-impl/nm-setting-private.h b/src/libnm-core-impl/nm-setting-private.h
index 61f96789..b3678d7c 100644
--- a/src/libnm-core-impl/nm-setting-private.h
+++ b/src/libnm-core-impl/nm-setting-private.h
@@ -809,7 +809,8 @@ _nm_properties_override(GArray *properties_override, const NMSettInfoProperty *p
         G_STATIC_ASSERT(!NM_FLAGS_ANY((param_flags),                                              \
                                       ~(NM_SETTING_PARAM_SECRET | NM_SETTING_PARAM_FUZZY_IGNORE   \
                                         | NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_REQUIRED \
-                                        | NM_SETTING_PARAM_REAPPLY_IMMEDIATELY)));                \
+                                        | NM_SETTING_PARAM_REAPPLY_IMMEDIATELY                    \
+                                        | NM_SETTING_PARAM_CERT_KEY_FILE)));                      \
                                                                                                   \
         nm_assert(_property_type);                                                                \
         nm_assert(g_variant_type_equal(_property_type->dbus_type, "s"));                          \
diff --git a/src/libnm-core-impl/nm-setting-wireless.c b/src/libnm-core-impl/nm-setting-wireless.c
index 1c5486bf..318e864b 100644
--- a/src/libnm-core-impl/nm-setting-wireless.c
+++ b/src/libnm-core-impl/nm-setting-wireless.c
@@ -1086,7 +1086,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
                                                NM_SETTING_WIRELESS_MODE_AP,
                                                NM_SETTING_WIRELESS_MODE_MESH,
                                                NULL};
-    const char               *valid_bands[] = {"a", "bg", NULL};
+    const char               *valid_bands[] = {"a", "bg", "6GHz", NULL};
     guint                     i;
     gsize                     length;
     GError                   *local = NULL;
@@ -1363,11 +1363,11 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
         }
 
         if (priv->channel_width == NM_SETTING_WIRELESS_CHANNEL_WIDTH_80MHZ
-            && !nm_streq0(priv->band, "a")) {
+            && !NM_IN_STRSET(priv->band, "a", "6GHz")) {
             g_set_error_literal(error,
                                 NM_CONNECTION_ERROR,
                                 NM_CONNECTION_ERROR_INVALID_PROPERTY,
-                                _("80MHz channels are only supported in the 5GHz band"));
+                                _("80MHz channels are only supported in the 5GHz and 6GHz bands"));
             g_prefix_error(error,
                            "%s.%s: ",
                            NM_SETTING_WIRELESS_SETTING_NAME,
@@ -1636,17 +1636,18 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass)
     /**
      * NMSettingWireless:band:
      *
-     * 802.11 frequency band of the network.  One of "a" for 5GHz 802.11a or
-     * "bg" for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network
-     * to the specific band, i.e. if "a" is specified, the device will not
-     * associate with the same network in the 2.4GHz band even if the network's
-     * settings are compatible.  This setting depends on specific driver
-     * capability and may not work with all drivers.
+     * 802.11 frequency band of the network.  One of "a" for 5GHz,
+     * "bg" for 2.4GHz or "6GHz".  This will lock associations to the
+     * Wi-Fi network to the specific band, i.e. if "a" is specified,
+     * the device will not associate with the same network in the
+     * 2.4GHz (bg) or 6GHz bands even if the network's settings are
+     * compatible.  This setting depends on specific driver capability
+     * and may not work with all drivers.
      **/
     /* ---ifcfg-rh---
      * property: band
      * variable: BAND(+)
-     * values: a, bg
+     * values: a, bg, 6GHz
      * description: BAND alone is honored, but CHANNEL overrides BAND since it
      *   implies a band.
      * example: BAND=bg
@@ -1673,8 +1674,6 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass)
      * property: channel
      * variable: CHANNEL
      * description: Channel used for the Wi-Fi communication.
-     *   Channels greater than 14 mean "a" band, otherwise the
-     *   band is "bg".
      * example: CHANNEL=6
      * ---end---
      */
diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c
index 1bf00831..50862708 100644
--- a/src/libnm-core-impl/nm-utils.c
+++ b/src/libnm-core-impl/nm-utils.c
@@ -25,6 +25,7 @@
 #include "libnm-glib-aux/nm-time-utils.h"
 #include "libnm-glib-aux/nm-secret-utils.h"
 #include "libnm-core-aux-intern/nm-common-macros.h"
+#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
 #include "nm-setting-bond.h"
@@ -3697,43 +3698,78 @@ struct cf_pair {
     guint32 freq;
 };
 
-static const struct cf_pair a_table[] = {
-    /* A band */
-    {7, 5035},   {8, 5040},   {9, 5045},   {11, 5055},  {12, 5060},  {16, 5080},  {34, 5170},
-    {36, 5180},  {38, 5190},  {40, 5200},  {42, 5210},  {44, 5220},  {46, 5230},  {48, 5240},
-    {50, 5250},  {52, 5260},  {56, 5280},  {58, 5290},  {60, 5300},  {64, 5320},  {100, 5500},
-    {104, 5520}, {108, 5540}, {112, 5560}, {116, 5580}, {120, 5600}, {124, 5620}, {128, 5640},
-    {132, 5660}, {136, 5680}, {140, 5700}, {149, 5745}, {152, 5760}, {153, 5765}, {157, 5785},
-    {160, 5800}, {161, 5805}, {165, 5825}, {183, 4915}, {184, 4920}, {185, 4925}, {187, 4935},
-    {188, 4945}, {192, 4960}, {196, 4980}, {0, 0}};
-
-static const guint a_table_freqs[G_N_ELEMENTS(a_table)] = {
-    /* A band */
-    5035, 5040, 5045, 5055, 5060, 5080, 5170, 5180, 5190, 5200, 5210, 5220, 5230, 5240, 5250, 5260,
-    5280, 5290, 5300, 5320, 5500, 5520, 5540, 5560, 5580, 5600, 5620, 5640, 5660, 5680, 5700, 5745,
-    5760, 5765, 5785, 5800, 5805, 5825, 4915, 4920, 4925, 4935, 4945, 4960, 4980, 0,
-};
+static const struct cf_pair table_5ghz[] = {
+    /* Special, 20MHz only */
+    {32, 5160},
+
+    /* UNII-1 (Indoor) */
+    {36, 5180},
+    {40, 5200},
+    {44, 5220},
+    {48, 5240},
+
+    /* UNII-2 (DFS) */
+    {52, 5260},
+    {56, 5280},
+    {60, 5300},
+    {64, 5320},
+
+    /* UNII-2C (DFS) */
+    {100, 5500},
+    {104, 5520},
+    {108, 5540},
+    {112, 5560},
+    {116, 5580},
+    {120, 5600},
+    {124, 5620},
+    {128, 5640},
+    {132, 5660},
+    {136, 5680},
+    {140, 5700},
+    {144, 5720},
+
+    /* UNII-3 */
+    {149, 5745},
+    {153, 5765},
+    {157, 5785},
+    {161, 5805},
+    {165, 5825},
+
+    /* 4.9 GHz Public Safety Band (802.11y/j) */
+    {183, 4915},
+    {184, 4920},
+    {185, 4925},
+    {187, 4935},
+    {188, 4940},
+    {189, 4945},
+    {192, 4960},
+    {196, 4980},
 
-static const struct cf_pair bg_table[] = {
-    /* B/G band */
-    {1, 2412},
-    {2, 2417},
-    {3, 2422},
-    {4, 2427},
-    {5, 2432},
-    {6, 2437},
-    {7, 2442},
-    {8, 2447},
-    {9, 2452},
-    {10, 2457},
-    {11, 2462},
-    {12, 2467},
-    {13, 2472},
-    {14, 2484},
     {0, 0}};
 
-static const guint bg_table_freqs[G_N_ELEMENTS(bg_table)] = {
-    /* B/G band */
+static const guint table_5ghz_freqs[G_N_ELEMENTS(table_5ghz)] = {
+    5160, 5180, 5200, 5220, 5240, 5260, 5280, 5300, 5320, 5500, 5520, 5540,
+    5560, 5580, 5600, 5620, 5640, 5660, 5680, 5700, 5720, 5745, 5765, 5785,
+    5805, 5825, 4915, 4920, 4925, 4935, 4940, 4945, 4960, 4980, 0,
+};
+
+static const struct cf_pair table_2ghz[] = {{1, 2412},
+                                            {2, 2417},
+                                            {3, 2422},
+                                            {4, 2427},
+                                            {5, 2432},
+                                            {6, 2437},
+                                            {7, 2442},
+                                            {8, 2447},
+                                            {9, 2452},
+                                            {10, 2457},
+                                            {11, 2462},
+                                            {12, 2467},
+                                            {13, 2472},
+                                            {14, 2484},
+                                            {0, 0}};
+
+static const guint table_2ghz_freqs[G_N_ELEMENTS(table_2ghz)] = {
     2412,
     2417,
     2422,
@@ -3751,6 +3787,24 @@ static const guint bg_table_freqs[G_N_ELEMENTS(bg_table)] = {
     0,
 };
 
+static const struct cf_pair table_6ghz[] = {
+    {1, 5955},   {5, 5975},   {9, 5995},   {13, 6015},  {17, 6035},  {21, 6055},  {25, 6075},
+    {29, 6095},  {33, 6115},  {37, 6135},  {41, 6155},  {45, 6175},  {49, 6195},  {53, 6215},
+    {57, 6235},  {61, 6255},  {65, 6275},  {69, 6295},  {73, 6315},  {77, 6335},  {81, 6355},
+    {85, 6375},  {89, 6395},  {93, 6415},  {97, 6435},  {101, 6455}, {105, 6475}, {109, 6495},
+    {113, 6515}, {117, 6535}, {121, 6555}, {125, 6575}, {129, 6595}, {133, 6615}, {137, 6635},
+    {141, 6655}, {145, 6675}, {149, 6695}, {153, 6715}, {157, 6735}, {161, 6755}, {169, 6775},
+    {173, 6815}, {177, 6835}, {181, 6855}, {185, 6875}, {189, 6895}, {193, 6915}, {197, 6935},
+    {201, 6955}, {205, 6975}, {209, 6995}, {213, 7015}, {217, 7035}, {221, 7055}, {225, 7075},
+    {229, 7095}, {233, 7115}, {0, 0}};
+
+static const guint table_6ghz_freqs[G_N_ELEMENTS(table_6ghz)] = {
+    5955, 5975, 5995, 6015, 6035, 6055, 6075, 6095, 6115, 6135, 6155, 6175, 6195, 6215, 6235,
+    6255, 6275, 6295, 6315, 6335, 6355, 6375, 6395, 6415, 6435, 6455, 6475, 6495, 6515, 6535,
+    6555, 6575, 6595, 6615, 6635, 6655, 6675, 6695, 6715, 6735, 6755, 6775, 6815, 6835, 6855,
+    6875, 6895, 6915, 6935, 6955, 6975, 6995, 7015, 7035, 7055, 7075, 7095, 7115, 0,
+};
+
 /**
  * nm_utils_wifi_freq_to_channel:
  * @freq: frequency
@@ -3762,42 +3816,51 @@ static const guint bg_table_freqs[G_N_ELEMENTS(bg_table)] = {
 guint32
 nm_utils_wifi_freq_to_channel(guint32 freq)
 {
-    int i = 0;
+    const struct cf_pair *table;
+    int                   i = 0;
 
-    if (freq > 4900) {
-        while (a_table[i].freq && (a_table[i].freq != freq))
-            i++;
-        return a_table[i].chan;
+    if (freq >= _NM_WIFI_FREQ_MIN_6GHZ) {
+        table = table_6ghz;
+    } else if (freq >= _NM_WIFI_FREQ_MIN_5GHZ) {
+        table = table_5ghz;
+    } else {
+        table = table_2ghz;
     }
 
-    while (bg_table[i].freq && (bg_table[i].freq != freq))
+    while (table[i].freq && (table[i].freq != freq))
         i++;
-    return bg_table[i].chan;
+
+    return table[i].chan;
 }
 
 /**
  * nm_utils_wifi_freq_to_band:
  * @freq: frequency
  *
- * Utility function to translate a Wi-Fi frequency to its corresponding band.
+ * Translates a Wi-Fi frequency to its corresponding band.
  *
- * Returns: the band containing the frequency or NULL if freq is invalid
+ * Returns: the band containing the frequency or %NM_WIFI_BAND_UNKNOWN if
+ * the frequency does not belong to a known band.
+ *
+ * Since: 1.58
  **/
-const char *
+NMWifiBand
 nm_utils_wifi_freq_to_band(guint32 freq)
 {
-    if (freq >= 4915 && freq <= 5825)
-        return "a";
-    else if (freq >= 2412 && freq <= 2484)
-        return "bg";
+    if (freq >= _NM_WIFI_FREQ_MIN_2GHZ && freq <= _NM_WIFI_FREQ_MAX_2GHZ)
+        return NM_WIFI_BAND_2_4_GHZ;
+    else if (freq >= _NM_WIFI_FREQ_MIN_5GHZ && freq <= _NM_WIFI_FREQ_MAX_5GHZ)
+        return NM_WIFI_BAND_5_GHZ;
+    else if (freq >= _NM_WIFI_FREQ_MIN_6GHZ && freq <= _NM_WIFI_FREQ_MAX_6GHZ)
+        return NM_WIFI_BAND_6_GHZ;
 
-    return NULL;
+    return NM_WIFI_BAND_UNKNOWN;
 }
 
 /**
  * nm_utils_wifi_channel_to_freq:
  * @channel: channel
- * @band: frequency band for wireless ("a" or "bg")
+ * @band: frequency band for wireless ("a", "bg", "6GHz")
  *
  * Utility function to translate a Wi-Fi channel to its corresponding frequency.
  *
@@ -3808,34 +3871,33 @@ nm_utils_wifi_freq_to_band(guint32 freq)
 guint32
 nm_utils_wifi_channel_to_freq(guint32 channel, const char *band)
 {
-    int i;
+    const struct cf_pair *table;
+    int                   i;
 
     g_return_val_if_fail(band, 0);
 
-    if (nm_streq(band, "a")) {
-        for (i = 0; a_table[i].chan; i++) {
-            if (a_table[i].chan == channel)
-                return a_table[i].freq;
-        }
-        return ((guint32) -1);
+    if (nm_streq0(band, "a")) {
+        table = table_5ghz;
+    } else if (nm_streq0(band, "bg")) {
+        table = table_2ghz;
+    } else if (nm_streq0(band, "6GHz")) {
+        table = table_6ghz;
+    } else {
+        return 0;
     }
 
-    if (nm_streq(band, "bg")) {
-        for (i = 0; bg_table[i].chan; i++) {
-            if (bg_table[i].chan == channel)
-                return bg_table[i].freq;
-        }
-        return ((guint32) -1);
+    for (i = 0; table[i].chan; i++) {
+        if (table[i].chan == channel)
+            return table[i].freq;
     }
-
-    return 0;
+    return ((guint32) -1);
 }
 
 /**
  * nm_utils_wifi_find_next_channel:
  * @channel: current channel
  * @direction: whether going downward (0 or less) or upward (1 or more)
- * @band: frequency band for wireless ("a" or "bg")
+ * @band: frequency band for wireless ("a", "bg", "6GHz")
  *
  * Utility function to find out next/previous Wi-Fi channel for a channel.
  *
@@ -3844,35 +3906,36 @@ nm_utils_wifi_channel_to_freq(guint32 channel, const char *band)
 guint32
 nm_utils_wifi_find_next_channel(guint32 channel, int direction, char *band)
 {
-    size_t                a_size  = G_N_ELEMENTS(a_table);
-    size_t                bg_size = G_N_ELEMENTS(bg_table);
-    const struct cf_pair *pair;
-
-    if (nm_streq(band, "a")) {
-        if (channel < a_table[0].chan)
-            return a_table[0].chan;
-        if (channel > a_table[a_size - 2].chan)
-            return a_table[a_size - 2].chan;
-        pair = &a_table[0];
-    } else if (nm_streq(band, "bg")) {
-        if (channel < bg_table[0].chan)
-            return bg_table[0].chan;
-        if (channel > bg_table[bg_size - 2].chan)
-            return bg_table[bg_size - 2].chan;
-        pair = &bg_table[0];
+    const struct cf_pair *table;
+    guint                 table_size;
+
+    if (nm_streq0(band, "a")) {
+        table      = table_5ghz;
+        table_size = G_N_ELEMENTS(table_5ghz);
+    } else if (nm_streq0(band, "bg")) {
+        table      = table_2ghz;
+        table_size = G_N_ELEMENTS(table_2ghz);
+    } else if (nm_streq0(band, "6GHz")) {
+        table      = table_6ghz;
+        table_size = G_N_ELEMENTS(table_6ghz);
     } else
         g_return_val_if_reached(0);
 
-    while (pair->chan) {
-        if (channel == pair->chan)
+    if (channel < table[0].chan)
+        return table[0].chan;
+    if (channel > table[table_size - 2].chan)
+        return table[table_size - 2].chan;
+
+    while (table->chan) {
+        if (channel == table->chan)
             return channel;
-        if ((channel < (pair + 1)->chan) && (channel > pair->chan)) {
+        if ((channel < (table + 1)->chan) && (channel > table->chan)) {
             if (direction > 0)
-                return (pair + 1)->chan;
+                return (table + 1)->chan;
             else
-                return pair->chan;
+                return table->chan;
         }
-        pair++;
+        table++;
     }
     return 0;
 }
@@ -3880,7 +3943,7 @@ nm_utils_wifi_find_next_channel(guint32 channel, int direction, char *band)
 /**
  * nm_utils_wifi_is_channel_valid:
  * @channel: channel
- * @band: frequency band for wireless ("a" or "bg")
+ * @band: frequency band for wireless ("a", "bg", "6GHz")
  *
  * Utility function to verify Wi-Fi channel validity.
  *
@@ -3930,8 +3993,8 @@ nm_utils_wifi_is_channel_valid(guint32 channel, const char *band)
 const guint *
 nm_utils_wifi_2ghz_freqs(void)
 {
-    _nm_assert_wifi_freqs(bg_table, bg_table_freqs);
-    return bg_table_freqs;
+    _nm_assert_wifi_freqs(table_2ghz, table_2ghz_freqs);
+    return table_2ghz_freqs;
 }
 
 /**
@@ -3946,8 +4009,24 @@ nm_utils_wifi_2ghz_freqs(void)
 const guint *
 nm_utils_wifi_5ghz_freqs(void)
 {
-    _nm_assert_wifi_freqs(a_table, a_table_freqs);
-    return a_table_freqs;
+    _nm_assert_wifi_freqs(table_5ghz, table_5ghz_freqs);
+    return table_5ghz_freqs;
+}
+
+/**
+ * nm_utils_wifi_6ghz_freqs:
+ *
+ * Utility function to return 6 GHz Wi-Fi frequencies (802.11ax/be, Wi-Fi 6E).
+ *
+ * Returns: zero-terminated array of frequencies numbers (in MHz)
+ *
+ * Since: 1.58
+ **/
+const guint *
+nm_utils_wifi_6ghz_freqs(void)
+{
+    _nm_assert_wifi_freqs(table_6ghz, table_6ghz_freqs);
+    return table_6ghz_freqs;
 }
 
 /**
@@ -6427,7 +6506,7 @@ nm_utils_copy_cert_as_user(const char *filename, const char *user, GError **erro
     nm_str_buf_destroy(&info.output_buffer);
     nm_str_buf_destroy(&info.error_buffer);
 
-    mkdir(RUN_CERT_DIR, 0600);
+    mkdir(RUN_CERT_DIR, 0700);
     fd = mkstemp(dst_path);
     if (fd < 0) {
         g_set_error_literal(error,
diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c
index cd480045..1e2904a1 100644
--- a/src/libnm-core-impl/tests/test-general.c
+++ b/src/libnm-core-impl/tests/test-general.c
@@ -4094,6 +4094,7 @@ test_connection_diff_a_only(void)
              {NM_SETTING_IP_CONFIG_DHCP_REJECT_SERVERS, NM_SETTING_DIFF_RESULT_IN_A},
              {NM_SETTING_IP4_CONFIG_LINK_LOCAL, NM_SETTING_DIFF_RESULT_IN_A},
              {NM_SETTING_IP4_CONFIG_DHCP_IPV6_ONLY_PREFERRED, NM_SETTING_DIFF_RESULT_IN_A},
+             {NM_SETTING_IP4_CONFIG_CLAT, NM_SETTING_DIFF_RESULT_IN_A},
              {NM_SETTING_IP_CONFIG_AUTO_ROUTE_EXT_GW, NM_SETTING_DIFF_RESULT_IN_A},
              {NM_SETTING_IP_CONFIG_REPLACE_LOCAL_RULE, NM_SETTING_DIFF_RESULT_IN_A},
              {NM_SETTING_IP_CONFIG_DHCP_SEND_RELEASE, NM_SETTING_DIFF_RESULT_IN_A},
@@ -11140,7 +11141,7 @@ _do_wifi_ghz_freqs(const guint *freqs, const char *band)
     int j;
     int i;
 
-    g_assert(NM_IN_STRSET(band, "a", "bg"));
+    g_assert(NM_IN_STRSET(band, "a", "bg", "6GHz"));
     g_assert(freqs);
     g_assert(freqs[0] != 0);
 
@@ -11178,6 +11179,7 @@ test_nm_utils_wifi_ghz_freqs(void)
 {
     _do_wifi_ghz_freqs(nm_utils_wifi_2ghz_freqs(), "bg");
     _do_wifi_ghz_freqs(nm_utils_wifi_5ghz_freqs(), "a");
+    _do_wifi_ghz_freqs(nm_utils_wifi_6ghz_freqs(), "6GHz");
 }
 
 /*****************************************************************************/
@@ -11611,6 +11613,328 @@ test_dhcp_iaid_hexstr(void)
 
 /*****************************************************************************/
 
+static void
+test_unreachable_gateways(void)
+{
+    NMConnection        *conn;
+    NMSettingIPConfig   *s_ip4;
+    NMSettingIPConfig   *s_ip6;
+    gs_free const char **result = NULL;
+
+    /* IPv4 gateway reachable via address prefix route */
+    {
+        conn =
+            nmtst_create_minimal_connection("test-ugw", NULL, NM_SETTING_WIRED_SETTING_NAME, NULL);
+        s_ip4 = (NMSettingIPConfig *) nm_setting_ip4_config_new();
+        g_object_set(s_ip4,
+                     NM_SETTING_IP_CONFIG_METHOD,
+                     NM_SETTING_IP4_CONFIG_METHOD_MANUAL,
+                     NM_SETTING_IP_CONFIG_GATEWAY,
+                     "192.168.1.1",
+                     NULL);
+        nmtst_setting_ip_config_add_address(s_ip4, "192.168.1.5", 24);
+        nm_connection_add_setting(conn, NM_SETTING(s_ip4));
+
+        result = nm_connection_get_unreachable_gateways(conn);
+        g_assert(!result);
+        g_object_unref(conn);
+    }
+
+    /* IPv4 gateway NOT reachable */
+    {
+        conn =
+            nmtst_create_minimal_connection("test-ugw", NULL, NM_SETTING_WIRED_SETTING_NAME, NULL);
+        s_ip4 = (NMSettingIPConfig *) nm_setting_ip4_config_new();
+        g_object_set(s_ip4,
+                     NM_SETTING_IP_CONFIG_METHOD,
+                     NM_SETTING_IP4_CONFIG_METHOD_MANUAL,
+                     NM_SETTING_IP_CONFIG_GATEWAY,
+                     "10.0.0.1",
+                     NULL);
+        nmtst_setting_ip_config_add_address(s_ip4, "192.168.1.5", 24);
+        nmtst_setting_ip_config_add_address(s_ip4, "172.16.1.1", 16);
+        nm_connection_add_setting(conn, NM_SETTING(s_ip4));
+
+        result = nm_connection_get_unreachable_gateways(conn);
+        g_assert(result);
+        g_assert_cmpint(g_strv_length((char **) result), ==, 1);
+        g_assert_cmpstr(result[0], ==, "10.0.0.1");
+        nm_clear_g_free(&result);
+        g_object_unref(conn);
+    }
+
+    /* IPv4 gateway NOT reachable. It's ignored because of method "auto" */
+    {
+        conn =
+            nmtst_create_minimal_connection("test-ugw", NULL, NM_SETTING_WIRED_SETTING_NAME, NULL);
+        s_ip4 = (NMSettingIPConfig *) nm_setting_ip4_config_new();
+        g_object_set(s_ip4,
+                     NM_SETTING_IP_CONFIG_METHOD,
+                     NM_SETTING_IP4_CONFIG_METHOD_AUTO,
+                     NM_SETTING_IP_CONFIG_GATEWAY,
+                     "10.0.0.1",
+                     NULL);
+        nmtst_setting_ip_config_add_address(s_ip4, "192.168.1.5", 24);
+        nmtst_setting_ip_config_add_address(s_ip4, "172.16.1.1", 16);
+        nm_connection_add_setting(conn, NM_SETTING(s_ip4));
+
+        result = nm_connection_get_unreachable_gateways(conn);
+        g_assert(!result);
+        g_object_unref(conn);
+    }
+
+    /* Route gateway reachable via address prefix route */
+    {
+        conn =
+            nmtst_create_minimal_connection("test-ugw", NULL, NM_SETTING_WIRED_SETTING_NAME, NULL);
+        s_ip4 = (NMSettingIPConfig *) nm_setting_ip4_config_new();
+        g_object_set(s_ip4, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_MANUAL, NULL);
+        nmtst_setting_ip_config_add_address(s_ip4, "192.168.1.5", 24);
+        nmtst_setting_ip_config_add_route(s_ip4, "10.0.0.0", 8, "192.168.1.254", 100);
+        nm_connection_add_setting(conn, NM_SETTING(s_ip4));
+
+        result = nm_connection_get_unreachable_gateways(conn);
+        g_assert(!result);
+        g_object_unref(conn);
+    }
+
+    /* Route gateway NOT reachable, check sorting */
+    {
+        conn =
+            nmtst_create_minimal_connection("test-ugw", NULL, NM_SETTING_WIRED_SETTING_NAME, NULL);
+        s_ip4 = (NMSettingIPConfig *) nm_setting_ip4_config_new();
+        g_object_set(s_ip4, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_MANUAL, NULL);
+        nmtst_setting_ip_config_add_address(s_ip4, "192.168.1.5", 24);
+        nmtst_setting_ip_config_add_route(s_ip4, "10.0.0.0", 16, "172.16.0.2", 100);
+        nmtst_setting_ip_config_add_route(s_ip4, "10.1.0.0", 16, "172.16.0.4", 100);
+        nmtst_setting_ip_config_add_route(s_ip4, "10.2.0.0", 16, "172.16.0.3", 100);
+        nmtst_setting_ip_config_add_route(s_ip4, "10.3.0.0", 16, "172.16.0.1", 100);
+        nm_connection_add_setting(conn, NM_SETTING(s_ip4));
+
+        result = nm_connection_get_unreachable_gateways(conn);
+        g_assert(result);
+        g_assert_cmpint(g_strv_length((char **) result), ==, 4);
+        g_assert_cmpstr(result[0], ==, "172.16.0.1");
+        g_assert_cmpstr(result[1], ==, "172.16.0.2");
+        g_assert_cmpstr(result[2], ==, "172.16.0.3");
+        g_assert_cmpstr(result[3], ==, "172.16.0.4");
+        nm_clear_g_free(&result);
+        g_object_unref(conn);
+    }
+
+    /* Route gateway reachable via a direct route in the setting */
+    {
+        conn =
+            nmtst_create_minimal_connection("test-ugw", NULL, NM_SETTING_WIRED_SETTING_NAME, NULL);
+        s_ip4 = (NMSettingIPConfig *) nm_setting_ip4_config_new();
+        g_object_set(s_ip4, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_MANUAL, NULL);
+        nmtst_setting_ip_config_add_address(s_ip4, "192.168.1.5", 24);
+        nmtst_setting_ip_config_add_route(s_ip4, "172.16.0.0", 16, NULL, 100);
+        nmtst_setting_ip_config_add_route(s_ip4, "10.0.0.0", 8, "172.16.0.1", 100);
+        nm_connection_add_setting(conn, NM_SETTING(s_ip4));
+
+        result = nm_connection_get_unreachable_gateways(conn);
+        g_assert(!result);
+        g_object_unref(conn);
+    }
+
+    /* No gateways */
+    {
+        conn =
+            nmtst_create_minimal_connection("test-ugw", NULL, NM_SETTING_WIRED_SETTING_NAME, NULL);
+        s_ip4 = (NMSettingIPConfig *) nm_setting_ip4_config_new();
+        g_object_set(s_ip4, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_MANUAL, NULL);
+        nmtst_setting_ip_config_add_address(s_ip4, "192.168.1.5", 24);
+        nm_connection_add_setting(conn, NM_SETTING(s_ip4));
+
+        result = nm_connection_get_unreachable_gateways(conn);
+        g_assert(!result);
+        g_object_unref(conn);
+    }
+
+    /* Both default gateway and route gateway unreachable */
+    {
+        conn =
+            nmtst_create_minimal_connection("test-ugw", NULL, NM_SETTING_WIRED_SETTING_NAME, NULL);
+        s_ip4 = (NMSettingIPConfig *) nm_setting_ip4_config_new();
+        g_object_set(s_ip4,
+                     NM_SETTING_IP_CONFIG_METHOD,
+                     NM_SETTING_IP4_CONFIG_METHOD_MANUAL,
+                     NM_SETTING_IP_CONFIG_GATEWAY,
+                     "10.0.0.1",
+                     NULL);
+        nmtst_setting_ip_config_add_address(s_ip4, "192.168.1.5", 24);
+        nmtst_setting_ip_config_add_route(s_ip4, "10.0.0.0", 8, "172.16.0.1", 100);
+        nm_connection_add_setting(conn, NM_SETTING(s_ip4));
+
+        result = nm_connection_get_unreachable_gateways(conn);
+        g_assert(result);
+        g_assert_cmpint(g_strv_length((char **) result), ==, 2);
+        g_assert_cmpstr(result[0], ==, "10.0.0.1");
+        g_assert_cmpstr(result[1], ==, "172.16.0.1");
+        nm_clear_g_free(&result);
+        g_object_unref(conn);
+    }
+
+    /* Test deduplication */
+    {
+        conn =
+            nmtst_create_minimal_connection("test-ugw", NULL, NM_SETTING_WIRED_SETTING_NAME, NULL);
+        s_ip4 = (NMSettingIPConfig *) nm_setting_ip4_config_new();
+        g_object_set(s_ip4,
+                     NM_SETTING_IP_CONFIG_METHOD,
+                     NM_SETTING_IP4_CONFIG_METHOD_MANUAL,
+                     NM_SETTING_IP_CONFIG_GATEWAY,
+                     "192.168.1.1",
+                     NULL);
+        nmtst_setting_ip_config_add_address(s_ip4, "192.168.1.5", 24);
+        nmtst_setting_ip_config_add_route(s_ip4, "10.0.0.0", 16, "172.16.0.1", 100);
+        nmtst_setting_ip_config_add_route(s_ip4, "10.1.0.0", 16, "172.16.0.1", 100);
+        nmtst_setting_ip_config_add_route(s_ip4, "10.2.0.0", 16, "172.16.0.1", 100);
+        nm_connection_add_setting(conn, NM_SETTING(s_ip4));
+
+        result = nm_connection_get_unreachable_gateways(conn);
+        g_assert(result);
+        g_assert_cmpint(g_strv_length((char **) result), ==, 1);
+        g_assert_cmpstr(result[0], ==, "172.16.0.1");
+        nm_clear_g_free(&result);
+        g_object_unref(conn);
+    }
+
+    /* IPv6 gateway reachable via address prefix route */
+    {
+        conn =
+            nmtst_create_minimal_connection("test-ugw", NULL, NM_SETTING_WIRED_SETTING_NAME, NULL);
+        s_ip6 = (NMSettingIPConfig *) nm_setting_ip6_config_new();
+        g_object_set(s_ip6,
+                     NM_SETTING_IP_CONFIG_METHOD,
+                     NM_SETTING_IP6_CONFIG_METHOD_MANUAL,
+                     NM_SETTING_IP_CONFIG_GATEWAY,
+                     "fd01::1",
+                     NULL);
+        nmtst_setting_ip_config_add_address(s_ip6, "fd01::10", 64);
+        nm_connection_add_setting(conn, NM_SETTING(s_ip6));
+
+        result = nm_connection_get_unreachable_gateways(conn);
+        g_assert(!result);
+        g_object_unref(conn);
+    }
+
+    /* IPv6 gateway NOT reachable */
+    {
+        conn =
+            nmtst_create_minimal_connection("test-ugw", NULL, NM_SETTING_WIRED_SETTING_NAME, NULL);
+        s_ip6 = (NMSettingIPConfig *) nm_setting_ip6_config_new();
+        g_object_set(s_ip6,
+                     NM_SETTING_IP_CONFIG_METHOD,
+                     NM_SETTING_IP6_CONFIG_METHOD_MANUAL,
+                     NM_SETTING_IP_CONFIG_GATEWAY,
+                     "fd02::1",
+                     NULL);
+        nmtst_setting_ip_config_add_address(s_ip6, "fd01::10", 64);
+        nm_connection_add_setting(conn, NM_SETTING(s_ip6));
+
+        result = nm_connection_get_unreachable_gateways(conn);
+        g_assert(result);
+        g_assert_cmpint(g_strv_length((char **) result), ==, 1);
+        g_assert_cmpstr(result[0], ==, "fd02::1");
+        nm_clear_g_free(&result);
+        g_object_unref(conn);
+    }
+
+    /* Multiple addresses, gateway reachable via second address */
+    {
+        conn =
+            nmtst_create_minimal_connection("test-ugw", NULL, NM_SETTING_WIRED_SETTING_NAME, NULL);
+        s_ip4 = (NMSettingIPConfig *) nm_setting_ip4_config_new();
+        g_object_set(s_ip4,
+                     NM_SETTING_IP_CONFIG_METHOD,
+                     NM_SETTING_IP4_CONFIG_METHOD_MANUAL,
+                     NM_SETTING_IP_CONFIG_GATEWAY,
+                     "10.0.0.1",
+                     NULL);
+        nmtst_setting_ip_config_add_address(s_ip4, "192.168.1.5", 24);
+        nmtst_setting_ip_config_add_address(s_ip4, "10.0.0.5", 24);
+        nm_connection_add_setting(conn, NM_SETTING(s_ip4));
+
+        result = nm_connection_get_unreachable_gateways(conn);
+        g_assert(!result);
+        g_object_unref(conn);
+    }
+
+    /* Unreachable gateways in both IPv4 and IPv6 */
+    {
+        conn =
+            nmtst_create_minimal_connection("test-ugw", NULL, NM_SETTING_WIRED_SETTING_NAME, NULL);
+        s_ip4 = (NMSettingIPConfig *) nm_setting_ip4_config_new();
+        g_object_set(s_ip4,
+                     NM_SETTING_IP_CONFIG_METHOD,
+                     NM_SETTING_IP4_CONFIG_METHOD_MANUAL,
+                     NM_SETTING_IP_CONFIG_GATEWAY,
+                     "10.0.0.1",
+                     NULL);
+        nmtst_setting_ip_config_add_address(s_ip4, "192.168.1.5", 24);
+        nm_connection_add_setting(conn, NM_SETTING(s_ip4));
+
+        s_ip6 = (NMSettingIPConfig *) nm_setting_ip6_config_new();
+        g_object_set(s_ip6,
+                     NM_SETTING_IP_CONFIG_METHOD,
+                     NM_SETTING_IP6_CONFIG_METHOD_MANUAL,
+                     NM_SETTING_IP_CONFIG_GATEWAY,
+                     "fd02::1",
+                     NULL);
+        nmtst_setting_ip_config_add_address(s_ip6, "fd01::10", 64);
+        nm_connection_add_setting(conn, NM_SETTING(s_ip6));
+
+        result = nm_connection_get_unreachable_gateways(conn);
+        g_assert(result);
+        g_assert_cmpint(g_strv_length((char **) result), ==, 2);
+        g_assert_cmpstr(result[0], ==, "10.0.0.1");
+        g_assert_cmpstr(result[1], ==, "fd02::1");
+        nm_clear_g_free(&result);
+        g_object_unref(conn);
+    }
+
+    /* Onlink and IPv6-link-local routes */
+    {
+        NMIPRoute *route;
+
+        conn =
+            nmtst_create_minimal_connection("test-ugw", NULL, NM_SETTING_WIRED_SETTING_NAME, NULL);
+
+        s_ip4 = (NMSettingIPConfig *) nm_setting_ip4_config_new();
+        g_object_set(s_ip4, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_MANUAL, NULL);
+        nmtst_setting_ip_config_add_address(s_ip4, "192.168.1.5", 24);
+
+        route = nm_ip_route_new(AF_INET, "10.0.0.1", 8, "192.168.20.1", 100, NULL);
+        g_assert(route);
+        nm_ip_route_set_attribute(route, NM_IP_ROUTE_ATTRIBUTE_ONLINK, g_variant_new_boolean(TRUE));
+        g_assert(nm_setting_ip_config_add_route(s_ip4, route));
+        nm_ip_route_unref(route);
+
+        nm_connection_add_setting(conn, NM_SETTING(s_ip4));
+
+        s_ip6 = (NMSettingIPConfig *) nm_setting_ip6_config_new();
+        g_object_set(s_ip6, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_MANUAL, NULL);
+        nmtst_setting_ip_config_add_address(s_ip6, "fd01::10", 64);
+        nm_connection_add_setting(conn, NM_SETTING(s_ip6));
+
+        route = nm_ip_route_new(AF_INET6, "fd02::", 64, "fd03::1111", 100, NULL);
+        g_assert(route);
+        nm_ip_route_set_attribute(route, NM_IP_ROUTE_ATTRIBUTE_ONLINK, g_variant_new_boolean(TRUE));
+        g_assert(nm_setting_ip_config_add_route(s_ip6, route));
+        nm_ip_route_unref(route);
+
+        nmtst_setting_ip_config_add_route(s_ip6, "fd04::", 64, "fe80::1111", 100);
+
+        result = nm_connection_get_unreachable_gateways(conn);
+        g_assert(!result);
+        g_object_unref(conn);
+    }
+}
+
+/*****************************************************************************/
+
 NMTST_DEFINE();
 
 int
@@ -11961,6 +12285,7 @@ main(int argc, char **argv)
     g_test_add_func("/core/general/test_dns_uri_get_legacy", test_dns_uri_parse_plain);
     g_test_add_func("/core/general/test_dns_uri_normalize", test_dns_uri_normalize);
     g_test_add_func("/core/general/test_dhcp_iaid_hexstr", test_dhcp_iaid_hexstr);
+    g_test_add_func("/core/general/test_unreachable_gateways", test_unreachable_gateways);
 
     return g_test_run();
 }
diff --git a/src/libnm-core-impl/tests/test-setting.c b/src/libnm-core-impl/tests/test-setting.c
index f3070c17..b9cafe4a 100644
--- a/src/libnm-core-impl/tests/test-setting.c
+++ b/src/libnm-core-impl/tests/test-setting.c
@@ -4082,13 +4082,12 @@ test_roundtrip_conversion(gconstpointer test_data)
             if (flag == NM_CONNECTION_SERIALIZE_ALL) {
                 s_wg2 = NM_SETTING_WIREGUARD(
                     nm_connection_get_setting(con2, NM_TYPE_SETTING_WIREGUARD));
-
-                if (flag == NM_CONNECTION_SERIALIZE_ALL)
-                    _rndt_wg_peers_assert_equal(s_wg2, wg_peers, TRUE, TRUE, FALSE);
-                else if (flag == NM_CONNECTION_SERIALIZE_WITH_NON_SECRET)
-                    _rndt_wg_peers_assert_equal(s_wg2, wg_peers, FALSE, FALSE, TRUE);
-                else
-                    g_assert_not_reached();
+                _rndt_wg_peers_assert_equal(s_wg2, wg_peers, TRUE, TRUE, FALSE);
+            } else if (flag == NM_CONNECTION_SERIALIZE_WITH_NON_SECRET) {
+                con2  = _connection_new_from_dbus_strict(con_var, FALSE);
+                s_wg2 = NM_SETTING_WIREGUARD(
+                    nm_connection_get_setting(con2, NM_TYPE_SETTING_WIREGUARD));
+                _rndt_wg_peers_assert_equal(s_wg2, wg_peers, FALSE, FALSE, TRUE);
             }
             break;
         }
@@ -5533,7 +5532,7 @@ test_bond_meta(void)
     _A(_nm_setting_bond_opt_value_as_u16, set, NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO, 0, EINVAL);
     _A(_nm_setting_bond_opt_value_as_u16, set, NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY, 0, EINVAL);
     _A(_nm_setting_bond_opt_value_as_u8, set, NM_SETTING_BOND_OPTION_NUM_GRAT_ARP, 1, 0);
-    _A(_nm_setting_bond_opt_value_as_u8, set, NM_SETTING_BOND_OPTION_ARP_MISSED_MAX, 0, 0);
+    _A(_nm_setting_bond_opt_value_as_u8, set, NM_SETTING_BOND_OPTION_ARP_MISSED_MAX, 2, 0);
     _A(_nm_setting_bond_opt_value_as_u8, set, NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE, 0, 0);
     _A(_nm_setting_bond_opt_value_as_intbool, set, NM_SETTING_BOND_OPTION_USE_CARRIER, 1, 0);
     _A(_nm_setting_bond_opt_value_as_intbool,
diff --git a/src/libnm-core-intern/nm-core-internal.h b/src/libnm-core-intern/nm-core-internal.h
index f74dfc59..9a763328 100644
--- a/src/libnm-core-intern/nm-core-internal.h
+++ b/src/libnm-core-intern/nm-core-internal.h
@@ -1136,8 +1136,6 @@ gboolean nm_utils_base64secret_normalize(const char *base64_key,
 
 gboolean nm_utils_connection_is_adhoc_wpa(NMConnection *connection);
 
-const char *nm_utils_wifi_freq_to_band(guint32 freq);
-
 gboolean _nm_utils_iaid_verify(const char *str, gint64 *out_value);
 
 gboolean
diff --git a/src/libnm-core-public/nm-connection.h b/src/libnm-core-public/nm-connection.h
index e14e23c2..db73711f 100644
--- a/src/libnm-core-public/nm-connection.h
+++ b/src/libnm-core-public/nm-connection.h
@@ -208,7 +208,7 @@ NMSettingDcb        *nm_connection_get_setting_dcb(NMConnection *connection);
 NM_AVAILABLE_IN_1_8
 NMSettingDummy   *nm_connection_get_setting_dummy(NMConnection *connection);
 NMSettingGeneric *nm_connection_get_setting_generic(NMConnection *connection);
-NM_AVAILABLE_IN_1_56_1
+NM_AVAILABLE_IN_1_58
 NMSettingGeneve     *nm_connection_get_setting_geneve(NMConnection *connection);
 NMSettingGsm        *nm_connection_get_setting_gsm(NMConnection *connection);
 NMSettingInfiniband *nm_connection_get_setting_infiniband(NMConnection *connection);
diff --git a/src/libnm-core-public/nm-dbus-interface.h b/src/libnm-core-public/nm-dbus-interface.h
index 513d1fa3..c16a115a 100644
--- a/src/libnm-core-public/nm-dbus-interface.h
+++ b/src/libnm-core-public/nm-dbus-interface.h
@@ -251,7 +251,7 @@ typedef enum {
  * @NM_DEVICE_TYPE_LOOPBACK: a loopback interface. Since: 1.42.
  * @NM_DEVICE_TYPE_HSR: A HSR/PRP device. Since: 1.46.
  * @NM_DEVICE_TYPE_IPVLAN: A IPVLAN device. Since: 1.52.
- * @NM_DEVICE_TYPE_GENEVE: A GENEVE device. Since: 1.58, 1.56.1.
+ * @NM_DEVICE_TYPE_GENEVE: A GENEVE device. Since: 1.58.
  *
  * #NMDeviceType values indicate the type of hardware represented by a
  * device object.
@@ -1256,7 +1256,7 @@ typedef enum /*< flags >*/ {
  *
  * Values for the SetManaged() D-Bus call of a device and nm_device_set_managed_async().
  *
- * Since: 1.58, 1.56.1
+ * Since: 1.58
  */
 typedef enum {
     NM_DEVICE_MANAGED_NO    = 0,
@@ -1283,7 +1283,7 @@ typedef enum {
  * are mutually exclusive, and they only make sense together with %NM_DEVICE_MANAGED_FLAGS_PERMANENT.
  * If none is set, the matching criteria is selected automatically.
  *
- * Since: 1.58, 1.56.1
+ * Since: 1.58
  */
 typedef enum /*< flags >*/ {
     NM_DEVICE_MANAGED_FLAGS_NONE              = 0,
diff --git a/src/libnm-core-public/nm-setting-geneve.h b/src/libnm-core-public/nm-setting-geneve.h
index 642697dc..bff8fba1 100644
--- a/src/libnm-core-public/nm-setting-geneve.h
+++ b/src/libnm-core-public/nm-setting-geneve.h
@@ -42,7 +42,7 @@ G_BEGIN_DECLS
  * #NMSettingGeneveDf values indicate how the Don't Fragment (DF) flag should be handled
  * in the outer IP header of GENEVE tunnel packets.
  *
- * Since: 1.58, 1.56.1
+ * Since: 1.58
  */
 typedef enum {
     NM_SETTING_GENEVE_DF_UNSET   = 0,
@@ -52,21 +52,21 @@ typedef enum {
 
 typedef struct _NMSettingGeneveClass NMSettingGeneveClass;
 
-NM_AVAILABLE_IN_1_56_1
+NM_AVAILABLE_IN_1_58
 GType nm_setting_geneve_get_type(void);
-NM_AVAILABLE_IN_1_56_1
+NM_AVAILABLE_IN_1_58
 NMSetting *nm_setting_geneve_new(void);
-NM_AVAILABLE_IN_1_56_1
+NM_AVAILABLE_IN_1_58
 guint nm_setting_geneve_get_id(NMSettingGeneve *setting);
-NM_AVAILABLE_IN_1_56_1
+NM_AVAILABLE_IN_1_58
 const char *nm_setting_geneve_get_remote(NMSettingGeneve *setting);
-NM_AVAILABLE_IN_1_56_1
+NM_AVAILABLE_IN_1_58
 guint nm_setting_geneve_get_destination_port(NMSettingGeneve *setting);
-NM_AVAILABLE_IN_1_56_1
+NM_AVAILABLE_IN_1_58
 guint nm_setting_geneve_get_tos(NMSettingGeneve *setting);
-NM_AVAILABLE_IN_1_56_1
+NM_AVAILABLE_IN_1_58
 guint nm_setting_geneve_get_ttl(NMSettingGeneve *setting);
-NM_AVAILABLE_IN_1_56_1
+NM_AVAILABLE_IN_1_58
 NMSettingGeneveDf nm_setting_geneve_get_df(NMSettingGeneve *setting);
 
 G_END_DECLS
diff --git a/src/libnm-core-public/nm-setting-ip4-config.h b/src/libnm-core-public/nm-setting-ip4-config.h
index c40a7603..f4224747 100644
--- a/src/libnm-core-public/nm-setting-ip4-config.h
+++ b/src/libnm-core-public/nm-setting-ip4-config.h
@@ -34,6 +34,7 @@ G_BEGIN_DECLS
 #define NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER "dhcp-vendor-class-identifier"
 #define NM_SETTING_IP4_CONFIG_DHCP_IPV6_ONLY_PREFERRED     "dhcp-ipv6-only-preferred"
 #define NM_SETTING_IP4_CONFIG_LINK_LOCAL                   "link-local"
+#define NM_SETTING_IP4_CONFIG_CLAT                         "clat"
 
 /**
  * NM_SETTING_IP4_CONFIG_METHOD_AUTO:
@@ -109,6 +110,8 @@ typedef enum {
  * @NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_DEFAULT: use the global default value
  * @NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_NO: the option is disabled
  * @NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_YES: the option is enabled
+ * @NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_AUTO: the option is enabled when
+ *    the IPv6 method is "auto" and CLAT is enabled. Since: 1.58
  *
  * #NMSettingIP4DhcpIpv6OnlyPreferred values specify if the "IPv6-Only Preferred"
  * option (RFC 8925) for DHCPv4 is enabled.
@@ -119,8 +122,32 @@ typedef enum {
     NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_DEFAULT = -1,
     NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_NO      = 0,
     NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_YES     = 1,
+    NM_SETTING_IP4_DHCP_IPV6_ONLY_PREFERRED_AUTO    = 2,
 } NMSettingIP4DhcpIpv6OnlyPreferred;
 
+/**
+ * NMSettingIp4ConfigClat:
+ * @NM_SETTING_IP4_CONFIG_CLAT_DEFAULT: use the global default value
+ * @NM_SETTING_IP4_CONFIG_CLAT_NO: disable CLAT
+ * @NM_SETTING_IP4_CONFIG_CLAT_AUTO: enable CLAT only when the IPv4 method
+ *   is 'auto' and the device doesn't have a native IPv4 gateway.
+ * @NM_SETTING_IP4_CONFIG_CLAT_FORCE: enable CLAT even with IPv4 methods
+ *   other than 'auto' and even if the device has a native IPv4 gateway.
+ *
+ * #NMSettingIP4ConfigClat values specify if CLAT (Customer-side translator)
+ * is enabled or not. CLAT is used to implement the client part of 464XLAT
+ * (RFC 6877), an architecture that provides IPv4 connectivity to hosts on
+ * IPv6-only networks.
+ *
+ * Since: 1.58
+ */
+typedef enum {
+    NM_SETTING_IP4_CONFIG_CLAT_DEFAULT = -1,
+    NM_SETTING_IP4_CONFIG_CLAT_NO      = 0,
+    NM_SETTING_IP4_CONFIG_CLAT_AUTO    = 1,
+    NM_SETTING_IP4_CONFIG_CLAT_FORCE   = 2,
+} NMSettingIp4ConfigClat;
+
 typedef struct _NMSettingIP4ConfigClass NMSettingIP4ConfigClass;
 
 GType nm_setting_ip4_config_get_type(void);
@@ -141,6 +168,9 @@ NM_AVAILABLE_IN_1_52
 NMSettingIP4DhcpIpv6OnlyPreferred
 nm_setting_ip4_config_get_dhcp_ipv6_only_preferred(NMSettingIP4Config *setting);
 
+NM_AVAILABLE_IN_1_58
+NMSettingIp4ConfigClat nm_setting_ip4_config_get_clat(NMSettingIP4Config *setting);
+
 G_END_DECLS
 
 #endif /* __NM_SETTING_IP4_CONFIG_H__ */
diff --git a/src/libnm-core-public/nm-utils.h b/src/libnm-core-public/nm-utils.h
index e46bf472..04398459 100644
--- a/src/libnm-core-public/nm-utils.h
+++ b/src/libnm-core-public/nm-utils.h
@@ -135,14 +135,36 @@ const char *nm_utils_file_search_in_paths(const char                       *prog
                                           gpointer                          user_data,
                                           GError                          **error);
 
-guint32  nm_utils_wifi_freq_to_channel(guint32 freq);
-guint32  nm_utils_wifi_channel_to_freq(guint32 channel, const char *band);
-guint32  nm_utils_wifi_find_next_channel(guint32 channel, int direction, char *band);
-gboolean nm_utils_wifi_is_channel_valid(guint32 channel, const char *band);
+/**
+ * NMWifiBand:
+ * @NM_WIFI_BAND_UNKNOWN: the band is unknown
+ * @NM_WIFI_BAND_2_4_GHZ: the 2.4 GHz band
+ * @NM_WIFI_BAND_5_GHZ: the 5 GHz band
+ * @NM_WIFI_BAND_6_GHZ: the 6 GHz band
+ *
+ * Describes a Wi-Fi radio frequency band.
+ *
+ * Since: 1.58
+ */
+typedef enum {
+    NM_WIFI_BAND_UNKNOWN,
+    NM_WIFI_BAND_2_4_GHZ,
+    NM_WIFI_BAND_5_GHZ,
+    NM_WIFI_BAND_6_GHZ,
+} NMWifiBand;
+
+guint32 nm_utils_wifi_freq_to_channel(guint32 freq);
+NM_AVAILABLE_IN_1_58
+NMWifiBand nm_utils_wifi_freq_to_band(guint32 freq);
+guint32    nm_utils_wifi_channel_to_freq(guint32 channel, const char *band);
+guint32    nm_utils_wifi_find_next_channel(guint32 channel, int direction, char *band);
+gboolean   nm_utils_wifi_is_channel_valid(guint32 channel, const char *band);
 NM_AVAILABLE_IN_1_2
 const guint *nm_utils_wifi_2ghz_freqs(void);
 NM_AVAILABLE_IN_1_2
 const guint *nm_utils_wifi_5ghz_freqs(void);
+NM_AVAILABLE_IN_1_58
+const guint *nm_utils_wifi_6ghz_freqs(void);
 
 const char *nm_utils_wifi_strength_bars(guint8 strength);
 
diff --git a/src/libnm-core-public/nm-version-macros.h.in b/src/libnm-core-public/nm-version-macros.h.in
index fdecfa68..c1e0ba54 100644
--- a/src/libnm-core-public/nm-version-macros.h.in
+++ b/src/libnm-core-public/nm-version-macros.h.in
@@ -79,7 +79,7 @@
 #define NM_VERSION_1_52   (NM_ENCODE_VERSION(1, 52, 0))
 #define NM_VERSION_1_54   (NM_ENCODE_VERSION(1, 54, 0))
 #define NM_VERSION_1_56   (NM_ENCODE_VERSION(1, 56, 0))
-#define NM_VERSION_1_56_1 (NM_ENCODE_VERSION(1, 56, 1))
+#define NM_VERSION_1_58   (NM_ENCODE_VERSION(1, 58, 0))
 
 /* For releases, NM_API_VERSION is equal to NM_VERSION.
  *
diff --git a/src/libnm-core-public/nm-version.h b/src/libnm-core-public/nm-version.h
index 6e18acdd..f9985119 100644
--- a/src/libnm-core-public/nm-version.h
+++ b/src/libnm-core-public/nm-version.h
@@ -453,10 +453,18 @@
 #define NM_AVAILABLE_IN_1_56
 #endif
 
-#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_56_1
-#define NM_AVAILABLE_IN_1_56_1 G_UNAVAILABLE(1, 56.1)
+#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_58
+#define NM_DEPRECATED_IN_1_58        G_DEPRECATED
+#define NM_DEPRECATED_IN_1_58_FOR(f) G_DEPRECATED_FOR(f)
 #else
-#define NM_AVAILABLE_IN_1_56_1
+#define NM_DEPRECATED_IN_1_58
+#define NM_DEPRECATED_IN_1_58_FOR(f)
+#endif
+
+#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_58
+#define NM_AVAILABLE_IN_1_58 G_UNAVAILABLE(1, 58)
+#else
+#define NM_AVAILABLE_IN_1_58
 #endif
 
 /*
diff --git a/src/libnm-glib-aux/nm-inet-utils.c b/src/libnm-glib-aux/nm-inet-utils.c
index f4f418cf..ead060bc 100644
--- a/src/libnm-glib-aux/nm-inet-utils.c
+++ b/src/libnm-glib-aux/nm-inet-utils.c
@@ -167,6 +167,92 @@ nm_ip6_addr_is_ula(const struct in6_addr *address)
     return (address->s6_addr32[0] & htonl(0xfe000000u)) == htonl(0xfc000000u);
 }
 
+/**
+ * nm_ip6_addr_common_prefix_len:
+ * @a: first IPv6 address
+ * @b: second IPv6 address
+ *
+ * Returns: the number of leading bits that @a and @b have in common,
+ * from 0 to 128.
+ */
+guint
+nm_ip6_addr_common_prefix_len(const struct in6_addr *a, const struct in6_addr *b)
+{
+    guint i;
+
+    for (i = 0; i < 16; i++) {
+        guint8 diff = a->s6_addr[i] ^ b->s6_addr[i];
+
+        if (diff != 0)
+            return i * 8u + __builtin_clz((guint) diff) - 24u;
+    }
+    return 128;
+}
+
+/**
+ * nm_ip6_addr_rfc6724_label:
+ * @addr: an IPv6 address
+ *
+ * Returns the label for @addr from the default policy table defined
+ * in RFC 6724, Section 2.1:
+ *
+ *   Prefix        Precedence Label
+ *   ::1/128               50     0
+ *   ::/0                  40     1
+ *   ::ffff:0:0/96         35     4
+ *   2002::/16             30     2
+ *   2001::/32              5     5
+ *   fc00::/7               3    13
+ *   ::/96                  1     3
+ *   fec0::/10              1    11
+ *   3ffe::/16              1    12
+ *
+ * Returns: the label value (0-13). It can be used in the Source
+ *   Address Selection algorithm to prefer a source whose label
+ *   matches with the label of the destination.
+ */
+guint
+nm_ip6_addr_rfc6724_label(const struct in6_addr *addr)
+{
+    /* Checked from most-specific to least-specific prefix length. */
+
+    /* ::1/128 (loopback) */
+    if (IN6_IS_ADDR_LOOPBACK(addr))
+        return 0;
+
+    /* ::ffff:0:0/96 (IPv4-mapped) */
+    if (IN6_IS_ADDR_V4MAPPED(addr))
+        return 4;
+
+    /* ::/96 (IPv4-compatible, deprecated) */
+    if (addr->s6_addr32[0] == 0 && addr->s6_addr32[1] == 0 && addr->s6_addr32[2] == 0
+        && !IN6_IS_ADDR_UNSPECIFIED(addr))
+        return 3;
+
+    /* 2001::/32 (Teredo) */
+    if (addr->s6_addr32[0] == htonl(0x20010000u))
+        return 5;
+
+    /* 2002::/16 (6to4) */
+    if ((addr->s6_addr32[0] & htonl(0xFFFF0000u)) == htonl(0x20020000u))
+        return 2;
+
+    /* 3ffe::/16 (deprecated 6bone) */
+    if ((addr->s6_addr32[0] & htonl(0xFFFF0000u)) == htonl(0x3FFE0000u))
+        return 12;
+
+    /* fec0::/10 (deprecated site-local) */
+    if ((addr->s6_addr32[0] & htonl(0xFFC00000u)) == htonl(0xFEC00000u))
+        return 11;
+
+    /* fc00::/7 (ULA) */
+    if (nm_ip6_addr_is_ula(addr))
+        return 13;
+
+    /* ::/0 (default) */
+    return 1;
+}
+
 /*****************************************************************************/
 
 gconstpointer
diff --git a/src/libnm-glib-aux/nm-inet-utils.h b/src/libnm-glib-aux/nm-inet-utils.h
index 999519f8..ab4361e6 100644
--- a/src/libnm-glib-aux/nm-inet-utils.h
+++ b/src/libnm-glib-aux/nm-inet-utils.h
@@ -280,6 +280,10 @@ nm_ip_addr_same_prefix(int addr_family, gconstpointer addr_a, gconstpointer addr
 gboolean nm_ip_addr_is_site_local(int addr_family, const void *address);
 gboolean nm_ip6_addr_is_ula(const struct in6_addr *address);
 
+guint nm_ip6_addr_common_prefix_len(const struct in6_addr *a, const struct in6_addr *b);
+
+guint nm_ip6_addr_rfc6724_label(const struct in6_addr *addr);
+
 /*****************************************************************************/
 
 #define NM_IPV4LL_NETWORK   ((in_addr_t) htonl(0xA9FE0000lu)) /* 169.254.0.0 */
diff --git a/src/libnm-glib-aux/tests/test-shared-general.c b/src/libnm-glib-aux/tests/test-shared-general.c
index 931c25c6..95255c7e 100644
--- a/src/libnm-glib-aux/tests/test-shared-general.c
+++ b/src/libnm-glib-aux/tests/test-shared-general.c
@@ -2380,6 +2380,60 @@ test_inet_utils(void)
 
 /*****************************************************************************/
 
+static void
+test_ip6_addr_common_prefix_len(void)
+{
+    struct in6_addr a;
+    struct in6_addr b;
+
+    /* identical addresses -> 128 */
+    a = nmtst_inet6_from_string("2001:db8::1");
+    b = nmtst_inet6_from_string("2001:db8::1");
+    g_assert_cmpuint(nm_ip6_addr_common_prefix_len(&a, &b), ==, 128);
+
+    /* completely different -> 0 */
+    a = nmtst_inet6_from_string("8000::");
+    b = nmtst_inet6_from_string("::");
+    g_assert_cmpuint(nm_ip6_addr_common_prefix_len(&a, &b), ==, 0);
+
+    /* first 64 bits in common, differ at bit 65 */
+    a = nmtst_inet6_from_string("2001:db8:abcd:1234:8000::");
+    b = nmtst_inet6_from_string("2001:db8:abcd:1234::");
+    g_assert_cmpuint(nm_ip6_addr_common_prefix_len(&a, &b), ==, 64);
+
+    /* same /48 prefix */
+    a = nmtst_inet6_from_string("2001:db8:abcd::");
+    b = nmtst_inet6_from_string("2001:db8:abcd:ffff::");
+    g_assert_cmpuint(nm_ip6_addr_common_prefix_len(&a, &b), ==, 48);
+
+    /* differ in 5th bit -> 4 common bits */
+    a = nmtst_inet6_from_string("f800::");
+    b = nmtst_inet6_from_string("f000::");
+    g_assert_cmpuint(nm_ip6_addr_common_prefix_len(&a, &b), ==, 4);
+
+    /* differ in 2nd bit -> 1 common bit */
+    a = nmtst_inet6_from_string("c000::");
+    b = nmtst_inet6_from_string("8000::");
+    g_assert_cmpuint(nm_ip6_addr_common_prefix_len(&a, &b), ==, 1);
+
+    /* both zero -> 128 */
+    a = nmtst_inet6_from_string("::");
+    b = nmtst_inet6_from_string("::");
+    g_assert_cmpuint(nm_ip6_addr_common_prefix_len(&a, &b), ==, 128);
+
+    /* first 120 bits in common, differ at MSB of last byte */
+    a = nmtst_inet6_from_string("2001:db8::80");
+    b = nmtst_inet6_from_string("2001:db8::");
+    g_assert_cmpuint(nm_ip6_addr_common_prefix_len(&a, &b), ==, 120);
+
+    /* first 127 bits in common, differ only in last bit */
+    a = nmtst_inet6_from_string("2001:db8::fe");
+    b = nmtst_inet6_from_string("2001:db8::ff");
+    g_assert_cmpuint(nm_ip6_addr_common_prefix_len(&a, &b), ==, 127);
+}
+
+/*****************************************************************************/
+
 static gboolean
 _inet_parse(int addr_family, const char *str, gboolean accept_legacy, gpointer out_addr)
 {
@@ -2940,6 +2994,7 @@ main(int argc, char **argv)
     g_test_add_func("/general/test_path_simplify", test_path_simplify);
     g_test_add_func("/general/test_hostname_is_valid", test_hostname_is_valid);
     g_test_add_func("/general/test_inet_utils", test_inet_utils);
+    g_test_add_func("/general/test_ip6_addr_common_prefix_len", test_ip6_addr_common_prefix_len);
     g_test_add_func("/general/test_inet_parse_ip4_legacy", test_inet_parse_ip4_legacy);
     g_test_add_func("/general/test_garray", test_garray);
     g_test_add_func("/general/test_nm_prioq", test_nm_prioq);
diff --git a/src/libnm-platform/nm-linux-platform.c b/src/libnm-platform/nm-linux-platform.c
index b5df8b17..7d4a6f3d 100644
--- a/src/libnm-platform/nm-linux-platform.c
+++ b/src/libnm-platform/nm-linux-platform.c
@@ -1766,8 +1766,12 @@ _parse_lnk_bond(const char *kind, struct nlattr *info_data)
         props->num_grat_arp = nla_get_u8(tb[IFLA_BOND_NUM_PEER_NOTIF]);
     if (tb[IFLA_BOND_ALL_PORTS_ACTIVE])
         props->all_ports_active = nla_get_u8(tb[IFLA_BOND_ALL_PORTS_ACTIVE]);
-    if (tb[IFLA_BOND_MISSED_MAX])
-        props->arp_missed_max = nla_get_u8(tb[IFLA_BOND_MISSED_MAX]);
+    if (tb[IFLA_BOND_MISSED_MAX]) {
+        props->arp_missed_max     = nla_get_u8(tb[IFLA_BOND_MISSED_MAX]);
+        props->arp_missed_max_has = TRUE;
+    } else {
+        props->arp_missed_max_has = FALSE;
+    }
     if (tb[IFLA_BOND_MIN_LINKS])
         props->min_links = nla_get_u32(tb[IFLA_BOND_MIN_LINKS]);
     if (tb[IFLA_BOND_LP_INTERVAL])
@@ -5126,7 +5130,7 @@ _nl_msg_new_link_set_linkinfo(struct nl_msg *msg, NMLinkType link_type, gconstpo
                     &props->ad_actor_system);
         if (props->ad_select)
             NLA_PUT_U8(msg, IFLA_BOND_AD_SELECT, props->ad_select);
-        if (props->arp_missed_max)
+        if (props->arp_missed_max_has)
             NLA_PUT_U8(msg, IFLA_BOND_MISSED_MAX, props->arp_missed_max);
 
         NLA_PUT_U8(msg, IFLA_BOND_ALL_PORTS_ACTIVE, props->all_ports_active);
diff --git a/src/libnm-platform/nm-platform.c b/src/libnm-platform/nm-platform.c
index 914dcd86..27888d6c 100644
--- a/src/libnm-platform/nm-platform.c
+++ b/src/libnm-platform/nm-platform.c
@@ -3223,7 +3223,6 @@ gboolean
 nm_platform_link_veth_get_properties(NMPlatform *self, int ifindex, int *out_peer_ifindex)
 {
     const NMPlatformLink *plink;
-    int                   peer_ifindex;
 
     plink = nm_platform_link_get(self, ifindex);
     if (!plink)
@@ -3232,23 +3231,10 @@ nm_platform_link_veth_get_properties(NMPlatform *self, int ifindex, int *out_pee
     if (plink->type != NM_LINK_TYPE_VETH)
         return FALSE;
 
-    if (plink->parent != 0) {
-        NM_SET_OUT(out_peer_ifindex, plink->parent);
-        return TRUE;
-    }
-
-    /* Pre-4.1 kernel did not expose the peer_ifindex as IFA_LINK. Lookup via ethtool. */
-    if (out_peer_ifindex) {
-        nm_auto_pop_netns NMPNetns *netns = NULL;
-
-        if (!nm_platform_netns_push(self, &netns))
-            return FALSE;
-        peer_ifindex = nmp_ethtool_ioctl_get_peer_ifindex(plink->ifindex);
-        if (peer_ifindex <= 0)
-            return FALSE;
+    if (plink->parent == 0)
+        return FALSE;
 
-        *out_peer_ifindex = peer_ifindex;
-    }
+    NM_SET_OUT(out_peer_ifindex, plink->parent);
     return TRUE;
 }
 
@@ -6387,6 +6373,7 @@ nm_platform_lnk_bond_to_string(const NMPlatformLnkBond *lnk, char *buf, gsize le
     char sbuf_resend_igmp[30];
     char sbuf_lp_interval[30];
     char sbuf_tlb_dynamic_lb[30];
+    char sbuf_arp_missed_max[30];
     int  i;
 
     if (!nm_utils_to_string_buffer_init_null(lnk, &buf, &len))
@@ -6417,7 +6404,7 @@ nm_platform_lnk_bond_to_string(const NMPlatformLnkBond *lnk, char *buf, gsize le
         " xmit_hash_policy %u"
         " num_gray_arp %u"
         " all_ports_active %u"
-        " arp_missed_max %u"
+        "%s" /* arp_missed_max %u */
         " lacp_rate %u"
         "%s" /* lacp_active */
         " ad_select %u"
@@ -6469,7 +6456,12 @@ nm_platform_lnk_bond_to_string(const NMPlatformLnkBond *lnk, char *buf, gsize le
         lnk->xmit_hash_policy,
         lnk->num_grat_arp,
         lnk->all_ports_active,
-        lnk->arp_missed_max,
+        lnk->arp_missed_max_has || lnk->arp_missed_max != 0
+            ? nm_sprintf_buf(sbuf_arp_missed_max,
+                             " arp_missed_max%s %u",
+                             !lnk->arp_missed_max_has ? "?" : "",
+                             (int) lnk->arp_missed_max)
+            : "",
         lnk->lacp_rate,
         lnk->lacp_active_has || lnk->lacp_active != 0
             ? nm_sprintf_buf(sbuf_lacp_active,
@@ -8402,7 +8394,8 @@ nm_platform_lnk_bond_hash_update(const NMPlatformLnkBond *obj, NMHashState *h)
                                               obj->tlb_dynamic_lb,
                                               obj->tlb_dynamic_lb_has,
                                               obj->updelay_has,
-                                              obj->use_carrier));
+                                              obj->use_carrier,
+                                              obj->arp_missed_max_has));
 
     nm_hash_update(h, obj->arp_ip_target, obj->arp_ip_targets_num * sizeof(obj->arp_ip_target[0]));
     nm_hash_update(h, obj->ns_ip6_target, obj->ns_ip6_targets_num * sizeof(obj->ns_ip6_target[0]));
@@ -8480,6 +8473,7 @@ nm_platform_lnk_bond_cmp(const NMPlatformLnkBond *a, const NMPlatformLnkBond *b)
     NM_CMP_FIELD_BOOL(a, b, tlb_dynamic_lb_has);
     NM_CMP_FIELD_BOOL(a, b, updelay_has);
     NM_CMP_FIELD_BOOL(a, b, use_carrier);
+    NM_CMP_FIELD_BOOL(a, b, arp_missed_max_has);
 
     return 0;
 }
diff --git a/src/libnm-platform/nm-platform.h b/src/libnm-platform/nm-platform.h
index ba37d3a2..4d46807b 100644
--- a/src/libnm-platform/nm-platform.h
+++ b/src/libnm-platform/nm-platform.h
@@ -840,6 +840,7 @@ typedef struct {
     bool            tlb_dynamic_lb_has : 1;
     bool            updelay_has : 1;
     bool            use_carrier : 1;
+    bool            arp_missed_max_has : 1;
 } _nm_alignas(NMPlatformObject) NMPlatformLnkBond;
 
 typedef struct {
diff --git a/src/libnm-platform/nmp-ethtool-ioctl.c b/src/libnm-platform/nmp-ethtool-ioctl.c
index 830b02f6..9694eaec 100644
--- a/src/libnm-platform/nmp-ethtool-ioctl.c
+++ b/src/libnm-platform/nmp-ethtool-ioctl.c
@@ -1190,33 +1190,6 @@ nmp_ethtool_ioctl_supports_vlans(int ifindex)
     return !(features->features[block].active & (1 << bit));
 }
 
-int
-nmp_ethtool_ioctl_get_peer_ifindex(int ifindex)
-{
-    nm_auto_socket_handle SocketHandle shandle = SOCKET_HANDLE_INIT(ifindex);
-    gsize                              stats_len;
-    gs_free struct ethtool_stats      *stats_free = NULL;
-    struct ethtool_stats              *stats;
-    int                                peer_ifindex_stat;
-
-    g_return_val_if_fail(ifindex > 0, 0);
-
-    peer_ifindex_stat = ethtool_get_stringset_index(&shandle, ETH_SS_STATS, "peer_ifindex");
-    if (peer_ifindex_stat < 0) {
-        nm_log_dbg(LOGD_PLATFORM, "ethtool[%d]: peer_ifindex stat does not exist?", ifindex);
-        return FALSE;
-    }
-
-    stats_len      = sizeof(*stats) + (peer_ifindex_stat + 1) * sizeof(guint64);
-    stats          = nm_malloc0_maybe_a(300, stats_len, &stats_free);
-    stats->cmd     = ETHTOOL_GSTATS;
-    stats->n_stats = peer_ifindex_stat + 1;
-    if (_ethtool_call_handle(&shandle, stats, stats_len) < 0)
-        return 0;
-
-    return stats->data[peer_ifindex_stat];
-}
-
 gboolean
 nmp_ethtool_ioctl_get_wake_on_lan(int ifindex)
 {
diff --git a/src/libnm-platform/nmp-ethtool-ioctl.h b/src/libnm-platform/nmp-ethtool-ioctl.h
index cb93e9cf..1c973649 100644
--- a/src/libnm-platform/nmp-ethtool-ioctl.h
+++ b/src/libnm-platform/nmp-ethtool-ioctl.h
@@ -9,8 +9,6 @@ gboolean nmp_ethtool_ioctl_supports_carrier_detect(int ifindex);
 
 gboolean nmp_ethtool_ioctl_supports_vlans(int ifindex);
 
-int nmp_ethtool_ioctl_get_peer_ifindex(int ifindex);
-
 gboolean nmp_ethtool_ioctl_get_wake_on_lan(int ifindex);
 
 gboolean nmp_ethtool_ioctl_set_wake_on_lan(int                      ifindex,
diff --git a/src/libnm-systemd-shared/nm-sd-utils-shared.c b/src/libnm-systemd-shared/nm-sd-utils-shared.c
index dad21596..b51faebc 100644
--- a/src/libnm-systemd-shared/nm-sd-utils-shared.c
+++ b/src/libnm-systemd-shared/nm-sd-utils-shared.c
@@ -54,6 +54,20 @@ nm_sd_dns_name_normalize(const char *s)
 /*****************************************************************************/
 
 static gboolean
+_http_url_is_valid_char(char ch)
+{
+    if (g_ascii_isalnum(ch))
+        return TRUE;
+
+    /* Allow symbols which are allowed by the URL standard, or unlikely
+     * to be problematic in this scenario. */
+    if (strchr(":/%=;&+|^`-._~?#<>{}[]@!$'()*, ", ch) != NULL)
+        return TRUE;
+
+    return FALSE;
+}
+
+static gboolean
 _http_url_is_valid(const char *url, gboolean only_https)
 {
     if (!url || !url[0])
@@ -69,7 +83,7 @@ _http_url_is_valid(const char *url, gboolean only_https)
     if (!url[0])
         return FALSE;
 
-    return !NM_STRCHAR_ANY(url, ch, (guchar) ch >= 128u);
+    return NM_STRCHAR_ALL(url, ch, _http_url_is_valid_char(ch));
 }
 
 gboolean
@@ -82,12 +96,13 @@ nm_sd_http_url_is_valid_https(const char *url)
      * assert with http_url_is_valid() that the argument is valid. We thus must make
      * sure to only pass URLs that are valid according to http_url_is_valid().
      *
-     * This is given, because our nm_sd_http_url_is_valid_https() is more strict
-     * than http_url_is_valid().
+     * This is given, because our nm_sd_http_url_is_valid_https() is more restrictive
+     * than http_url_is_valid(). The assertion below checks that anything we accept,
+     * systemd must also accept.
      *
      * We only must make sure that this is also correct in the future, when we
      * re-import systemd code. */
-    nm_assert(_http_url_is_valid(url, FALSE) == http_url_is_valid(url));
+    nm_assert(!_http_url_is_valid(url, FALSE) || http_url_is_valid(url));
     return _http_url_is_valid(url, TRUE);
 }
 
diff --git a/src/libnmc-base/nm-client-utils.c b/src/libnmc-base/nm-client-utils.c
index 10c2c295..9c825994 100644
--- a/src/libnmc-base/nm-client-utils.c
+++ b/src/libnmc-base/nm-client-utils.c
@@ -697,10 +697,29 @@ NM_PRAGMA_WARNING_DISABLE("-Wdeclaration-after-statement")
 NM_PRAGMA_WARNING_REENABLE
 #pragma GCC visibility pop
 
+/* Encode @str into @qrcode (sized qrcodegen_BUFFER_LEN_FOR_VERSION(VERSION_MAX)).
+ * Returns the QR side length in modules, or -1 if @str is too long to encode. */
+static int
+_qr_encode(const char *str, uint8_t *qrcode)
+{
+    uint8_t tempBuffer[qrcodegen_BUFFER_LEN_FOR_VERSION(qrcodegen_VERSION_MAX)];
+
+    if (!qrcodegen_encodeText(str,
+                              tempBuffer,
+                              qrcode,
+                              qrcodegen_Ecc_LOW,
+                              qrcodegen_VERSION_MIN,
+                              qrcodegen_VERSION_MAX,
+                              qrcodegen_Mask_AUTO,
+                              FALSE))
+        return -1;
+
+    return qrcodegen_getSize(qrcode);
+}
+
 void
 nmc_print_qrcode(const char *str)
 {
-    uint8_t  tempBuffer[qrcodegen_BUFFER_LEN_FOR_VERSION(qrcodegen_VERSION_MAX)];
     uint8_t  qrcode[qrcodegen_BUFFER_LEN_FOR_VERSION(qrcodegen_VERSION_MAX)];
     gboolean term_linux;
     int      size;
@@ -711,18 +730,9 @@ nmc_print_qrcode(const char *str)
     if (!term_linux && !can_show_graphics())
         return;
 
-    if (!qrcodegen_encodeText(str,
-                              tempBuffer,
-                              qrcode,
-                              qrcodegen_Ecc_LOW,
-                              qrcodegen_VERSION_MIN,
-                              qrcodegen_VERSION_MAX,
-                              qrcodegen_Mask_AUTO,
-                              FALSE)) {
+    size = _qr_encode(str, qrcode);
+    if (size < 0)
         return;
-    }
-
-    size = qrcodegen_getSize(qrcode);
 
     g_print("\n");
 
@@ -756,6 +766,124 @@ nmc_print_qrcode(const char *str)
     }
 }
 
+static void
+_qr_append_mecard(GString *string, const char *tag, const char *text)
+{
+    const char *p;
+    bool        is_hex = TRUE;
+    int         start;
+
+    if (!text)
+        return;
+
+    g_string_append(string, tag);
+    start = string->len;
+
+    for (p = text; *p; p++) {
+        if (!g_ascii_isxdigit(*p))
+            is_hex = FALSE;
+        if (strchr("\\\":;,", *p))
+            g_string_append_c(string, '\\');
+        g_string_append_c(string, *p);
+    }
+
+    if (is_hex && text[0]) {
+        g_string_insert_c(string, start, '\"');
+        g_string_append_c(string, '\"');
+    }
+    g_string_append_c(string, ';');
+}
+
+/**
+ * nmc_wifi_qr_uri_new:
+ * @ssid: the network SSID (UTF-8)
+ * @key_mgmt: the wireless security key management, or %NULL for an open network
+ * @psk: the pre-shared key, or %NULL
+ * @hidden: whether the network is hidden
+ *
+ * Builds a "WIFI:" provisioning URI (the format encoded in Wi-Fi QR codes).
+ *
+ * Returns: (transfer full): a newly-allocated URI string.
+ */
+char *
+nmc_wifi_qr_uri_new(const char *ssid, const char *key_mgmt, const char *psk, gboolean hidden)
+{
+    GString    *string;
+    const char *type = NULL;
+
+    string = g_string_sized_new(64);
+    g_string_append(string, "WIFI:");
+
+    if (key_mgmt == NULL)
+        type = "nopass";
+    else if (NM_IN_STRSET(key_mgmt, "none", "ieee8021x"))
+        type = "WEP";
+    else if (NM_IN_STRSET(key_mgmt, "wpa-none", "wpa-psk", "sae"))
+        type = "WPA";
+    else if (nm_streq(key_mgmt, "owe"))
+        type = "nopass";
+
+    _qr_append_mecard(string, "T:", type);
+    _qr_append_mecard(string, "S:", ssid);
+    _qr_append_mecard(string, "P:", psk);
+
+    if (hidden)
+        g_string_append(string, "H:true;");
+
+    g_string_append_c(string, ';');
+
+    return g_string_free(string, FALSE);
+}
+
+/**
+ * nmc_wifi_qr_render_string:
+ * @str: the text to encode
+ *
+ * Encodes @str as a QR code and renders it into a newline-joined string of
+ * Unicode half-block glyphs. Dark modules are drawn as foreground glyphs and
+ * light modules as spaces, so the result is scannable on a black-on-white
+ * surface (unlike nmc_print_qrcode(), which prints ANSI-colored output to a
+ * terminal). Two module rows are packed per character row.
+ *
+ * Returns: (transfer full): the rendered string, or %NULL if @str is too long
+ *   to encode.
+ */
+char *
+nmc_wifi_qr_render_string(const char *str)
+{
+    uint8_t  qrcode[qrcodegen_BUFFER_LEN_FOR_VERSION(qrcodegen_VERSION_MAX)];
+    GString *gstr;
+    int      size;
+    int      x;
+    int      y;
+
+    size = _qr_encode(str, qrcode);
+    if (size < 0)
+        return NULL;
+
+    gstr = g_string_sized_new(2048);
+
+    for (y = -2; y < size + 2; y += 2) {
+        for (x = -2; x < size + 2; x++) {
+            bool top    = qrcodegen_getModule(qrcode, x, y);
+            bool bottom = qrcodegen_getModule(qrcode, x, y + 1);
+
+            if (top && bottom)
+                g_string_append(gstr, "█");
+            else if (top)
+                g_string_append(gstr, "▀");
+            else if (bottom)
+                g_string_append(gstr, "▄");
+            else
+                g_string_append_c(gstr, ' ');
+        }
+        if (y + 2 < size + 2)
+            g_string_append_c(gstr, '\n');
+    }
+
+    return g_string_free(gstr, FALSE);
+}
+
 /**
  * nmc_utils_read_passwd_file:
  * @passwd_file: file with passwords to parse
diff --git a/src/libnmc-base/nm-client-utils.h b/src/libnmc-base/nm-client-utils.h
index 7d6ec707..c90219a5 100644
--- a/src/libnmc-base/nm-client-utils.h
+++ b/src/libnmc-base/nm-client-utils.h
@@ -62,6 +62,18 @@ const char *nmc_password_subst_char(void);
 
 void nmc_print_qrcode(const char *str);
 
+char *nmc_wifi_qr_uri_new(const char *ssid, const char *key_mgmt, const char *psk, gboolean hidden);
+
+char *nmc_wifi_qr_render_string(const char *str);
+
+/* Whether @key_mgmt denotes a passphrase-protected network (a "WPA"-type QR
+ * code), i.e. one whose QR code is useless without the password. */
+static inline gboolean
+nmc_wifi_key_mgmt_uses_psk(const char *key_mgmt)
+{
+    return NM_IN_STRSET(key_mgmt, "wpa-psk", "sae", "wpa-none");
+}
+
 GHashTable *nmc_utils_parse_passwd_file(char *contents, gssize *out_error_line, GError **error);
 
 GHashTable *
diff --git a/src/libnmc-base/tests/meson.build b/src/libnmc-base/tests/meson.build
new file mode 100644
index 00000000..e3119563
--- /dev/null
+++ b/src/libnmc-base/tests/meson.build
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+exe = executable(
+  'test-client-utils',
+  'test-client-utils.c',
+  dependencies: [
+    libnm_dep,
+    glib_dep,
+  ],
+  link_with: [
+    libnmc_base,
+    libnm_core_aux_extern,
+    libnm_core_aux_intern,
+    libnm_base,
+    libnm_log_null,
+    libnm_glib_aux,
+    libnm_std_aux,
+    libc_siphash,
+  ],
+)
+
+test(
+  'src/libnmc-base/tests/test-client-utils',
+  test_script,
+  args: test_args + [exe.full_path()],
+)
diff --git a/src/libnmc-base/tests/test-client-utils.c b/src/libnmc-base/tests/test-client-utils.c
new file mode 100644
index 00000000..41ea7262
--- /dev/null
+++ b/src/libnmc-base/tests/test-client-utils.c
@@ -0,0 +1,126 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2026 Red Hat, Inc.
+ */
+
+#include "libnm-client-aux-extern/nm-default-client.h"
+
+#include "libnmc-base/nm-client-utils.h"
+
+#include "libnm-glib-aux/nm-test-utils.h"
+
+/*****************************************************************************/
+
+static void
+_check_uri(const char *ssid,
+           const char *key_mgmt,
+           const char *psk,
+           gboolean    hidden,
+           const char *expected)
+{
+    gs_free char *uri = nmc_wifi_qr_uri_new(ssid, key_mgmt, psk, hidden);
+
+    g_assert_cmpstr(uri, ==, expected);
+}
+
+static void
+test_wifi_qr_uri_type(void)
+{
+    _check_uri("MyNet", NULL, NULL, FALSE, "WIFI:T:nopass;S:MyNet;;");
+    _check_uri("MyNet", "none", NULL, FALSE, "WIFI:T:WEP;S:MyNet;;");
+    _check_uri("MyNet", "ieee8021x", NULL, FALSE, "WIFI:T:WEP;S:MyNet;;");
+    _check_uri("MyNet", "wpa-psk", "passXY", FALSE, "WIFI:T:WPA;S:MyNet;P:passXY;;");
+    _check_uri("MyNet", "wpa-none", "passXY", FALSE, "WIFI:T:WPA;S:MyNet;P:passXY;;");
+    _check_uri("MyNet", "sae", "passXY", FALSE, "WIFI:T:WPA;S:MyNet;P:passXY;;");
+    _check_uri("MyNet", "owe", NULL, FALSE, "WIFI:T:nopass;S:MyNet;;");
+
+    /* Unhandled key_mgmt: no T: tag is emitted. */
+    _check_uri("MyNet", "wpa-eap", "passXY", FALSE, "WIFI:S:MyNet;P:passXY;;");
+}
+
+static void
+test_wifi_qr_uri_hidden(void)
+{
+    _check_uri("MyNet", "wpa-psk", "passXY", TRUE, "WIFI:T:WPA;S:MyNet;P:passXY;H:true;;");
+}
+
+static void
+test_wifi_qr_uri_escaping(void)
+{
+    /* Each of \ " : ; , is backslash-escaped. */
+    _check_uri("a;b:c,d\\e\"f", NULL, NULL, FALSE, "WIFI:T:nopass;S:a\\;b\\:c\\,d\\\\e\\\"f;;");
+
+    /* An all-hex value is wrapped in double quotes (per the MECARD format). */
+    _check_uri("MyNet", "wpa-psk", "deadbeef", FALSE, "WIFI:T:WPA;S:MyNet;P:\"deadbeef\";;");
+
+    /* A 64-hex-character PSK is also quoted. */
+    _check_uri("MyNet",
+               "wpa-psk",
+               "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
+               FALSE,
+               "WIFI:T:WPA;S:MyNet;P:\"0123456789abcdef0123456789abcdef0123456789abcdef012345"
+               "6789abcdef\";;");
+
+    /* Mixing hex and non-hex disables quoting. */
+    _check_uri("MyNet", "wpa-psk", "dead beef", FALSE, "WIFI:T:WPA;S:MyNet;P:dead beef;;");
+
+    /* An empty value is not quoted (it is not "all-hex"). */
+    _check_uri("", NULL, NULL, FALSE, "WIFI:T:nopass;S:;;");
+}
+
+/*****************************************************************************/
+
+static void
+test_wifi_qr_render(void)
+{
+    gs_free char      *qr    = nmc_wifi_qr_render_string("WIFI:T:WPA;S:MyNet;P:passXY;;");
+    gs_strfreev char **lines = NULL;
+
+    g_assert(qr);
+    /* Multiple rows packed two modules per character. */
+    lines = g_strsplit(qr, "\n", -1);
+    g_assert_cmpint(g_strv_length(lines), >, 1);
+}
+
+static void
+test_wifi_qr_render_too_long(void)
+{
+    /* Lowercase forces byte mode (capacity 2953 at version 40), so 4000 bytes
+     * exceed it and encoding fails. */
+    gs_free char *str = g_strnfill(4000, 'x');
+    gs_free char *qr  = nmc_wifi_qr_render_string(str);
+
+    g_assert(!qr);
+}
+
+static void
+test_wifi_key_mgmt_uses_psk(void)
+{
+    g_assert(nmc_wifi_key_mgmt_uses_psk("wpa-psk"));
+    g_assert(nmc_wifi_key_mgmt_uses_psk("sae"));
+    g_assert(nmc_wifi_key_mgmt_uses_psk("wpa-none"));
+
+    g_assert(!nmc_wifi_key_mgmt_uses_psk(NULL));
+    g_assert(!nmc_wifi_key_mgmt_uses_psk("none"));
+    g_assert(!nmc_wifi_key_mgmt_uses_psk("owe"));
+    g_assert(!nmc_wifi_key_mgmt_uses_psk("wpa-eap"));
+}
+
+/*****************************************************************************/
+
+NMTST_DEFINE();
+
+int
+main(int argc, char **argv)
+{
+    nmtst_init(&argc, &argv, TRUE);
+
+    g_test_add_func("/client-utils/wifi-qr/uri/type", test_wifi_qr_uri_type);
+    g_test_add_func("/client-utils/wifi-qr/uri/hidden", test_wifi_qr_uri_hidden);
+    g_test_add_func("/client-utils/wifi-qr/uri/escaping", test_wifi_qr_uri_escaping);
+    g_test_add_func("/client-utils/wifi-qr/render", test_wifi_qr_render);
+    g_test_add_func("/client-utils/wifi-qr/render-too-long", test_wifi_qr_render_too_long);
+    g_test_add_func("/client-utils/wifi/key-mgmt-uses-psk", test_wifi_key_mgmt_uses_psk);
+
+    return g_test_run();
+}
diff --git a/src/libnmc-setting/nm-meta-setting-access.c b/src/libnmc-setting/nm-meta-setting-access.c
index 14857048..bda1cd5c 100644
--- a/src/libnmc-setting/nm-meta-setting-access.c
+++ b/src/libnmc-setting/nm-meta-setting-access.c
@@ -191,6 +191,17 @@ nm_meta_abstract_info_get_name(const NMMetaAbstractInfo *abstract_info, gboolean
     return n;
 }
 
+const char *
+nm_meta_abstract_info_get_alias(const NMMetaAbstractInfo *abstract_info)
+{
+    nm_assert(abstract_info);
+    nm_assert(abstract_info->meta_type);
+
+    if (abstract_info->meta_type->get_alias)
+        return abstract_info->meta_type->get_alias(abstract_info);
+    return NULL;
+}
+
 const NMMetaAbstractInfo *const *
 nm_meta_abstract_info_get_nested(const NMMetaAbstractInfo *abstract_info,
                                  guint                    *out_len,
@@ -466,10 +477,15 @@ _output_selection_select_one(const NMMetaAbstractInfo *const *fields_array,
 
     for (i = 0; fields_array[i]; i++) {
         const NMMetaAbstractInfo        *fi = fields_array[i];
+        const char                      *name, *alias;
         const NMMetaAbstractInfo *const *nested;
         gs_free gpointer                 nested_to_free = NULL;
 
-        if (g_ascii_strcasecmp(i_name, nm_meta_abstract_info_get_name(fi, FALSE)) != 0)
+        name  = nm_meta_abstract_info_get_name(fi, FALSE);
+        alias = nm_meta_abstract_info_get_alias(fi);
+
+        if (g_ascii_strcasecmp(i_name, name) != 0
+            && (alias == NULL || g_ascii_strcasecmp(i_name, alias) != 0))
             continue;
 
         if (!right || !validate_nested) {
@@ -480,8 +496,11 @@ _output_selection_select_one(const NMMetaAbstractInfo *const *fields_array,
         nested = nm_meta_abstract_info_get_nested(fi, NULL, &nested_to_free);
         if (nested) {
             for (j = 0; nested[j]; nested++) {
-                if (g_ascii_strcasecmp(right, nm_meta_abstract_info_get_name(nested[j], FALSE))
-                    == 0) {
+                name  = nm_meta_abstract_info_get_name(nested[j], FALSE);
+                alias = nm_meta_abstract_info_get_alias(nested[j]);
+
+                if (g_ascii_strcasecmp(right, name) == 0
+                    || (alias && g_ascii_strcasecmp(right, alias) == 0)) {
                     found = TRUE;
                     break;
                 }
diff --git a/src/libnmc-setting/nm-meta-setting-access.h b/src/libnmc-setting/nm-meta-setting-access.h
index 9b00eb0a..34e02db7 100644
--- a/src/libnmc-setting/nm-meta-setting-access.h
+++ b/src/libnmc-setting/nm-meta-setting-access.h
@@ -36,6 +36,7 @@ const NMMetaSettingInfoEditor *const *nm_meta_setting_infos_editor_p(void);
 
 const char *nm_meta_abstract_info_get_name(const NMMetaAbstractInfo *abstract_info,
                                            gboolean                  for_header);
+const char *nm_meta_abstract_info_get_alias(const NMMetaAbstractInfo *abstract_info);
 
 const NMMetaAbstractInfo *const *
 nm_meta_abstract_info_get_nested(const NMMetaAbstractInfo *abstract_info,
diff --git a/src/libnmc-setting/nm-meta-setting-desc.c b/src/libnmc-setting/nm-meta-setting-desc.c
index ad75782c..0ac0596c 100644
--- a/src/libnmc-setting/nm-meta-setting-desc.c
+++ b/src/libnmc-setting/nm-meta-setting-desc.c
@@ -3845,7 +3845,7 @@ _objlist_set_fcn_ovs_port_trunks(NMSetting  *setting,
                            NM_UTILS_ERROR_INVALID_ARGUMENT,
                            "%s. %s",
                            local->message,
-                           _("The valid syntax is: '<value>' or '<start>-<end>"));
+                           _("The valid syntax is: '<value>' or '<start>-<end>'"));
         return FALSE;
     }
 
@@ -4292,7 +4292,8 @@ _set_fcn_wireless_channel(ARGS_SET_FCN)
     }
 
     if (!nm_utils_wifi_is_channel_valid(chan_int, "a")
-        && !nm_utils_wifi_is_channel_valid(chan_int, "bg")) {
+        && !nm_utils_wifi_is_channel_valid(chan_int, "bg")
+        && !nm_utils_wifi_is_channel_valid(chan_int, "6GHz")) {
         nm_utils_error_set(error,
                            NM_UTILS_ERROR_UNKNOWN,
                            _("'%ld' is not a valid channel"),
@@ -4927,7 +4928,7 @@ static const NMMetaPropertyType _pt_objlist = {
     ((guint32 (*) (NMSetting *)) ((sizeof (func == ((guint32 (*) (type *)) func))) ? func : func) )
 
 #define TEAM_DESCRIBE_MESSAGE \
-    N_("nmcli can accepts both direct JSON configuration data and a file name containing " \
+    N_("nmcli can accept both direct JSON configuration data and a file name containing " \
        "the configuration. In the latter case the file is read and the contents is put " \
        "into this property.\n\n" \
        "Examples: set team.config " \
@@ -6651,6 +6652,9 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = {
     PROPERTY_INFO_WITH_DESC (NM_SETTING_IP4_CONFIG_DHCP_IPV6_ONLY_PREFERRED,
         .property_type =                &_pt_gobject_enum,
     ),
+    PROPERTY_INFO (NM_SETTING_IP4_CONFIG_CLAT, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_CLAT,
+        .property_type =                &_pt_gobject_enum,
+    ),
     PROPERTY_INFO_WITH_DESC (NM_SETTING_IP4_CONFIG_LINK_LOCAL,
         .property_type =                &_pt_gobject_enum,
         .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
@@ -8581,7 +8585,7 @@ static const NMMetaPropertyInfo *const property_infos_WIRELESS[] = {
     PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_BAND,
         .property_type =                &_pt_gobject_string,
         .property_typ_data = DEFINE_PROPERTY_TYP_DATA (
-            .values_static =            NM_MAKE_STRV ("a", "bg"),
+            .values_static =            NM_MAKE_STRV ("a", "bg", "6GHz"),
         ),
     ),
     PROPERTY_INFO_WITH_DESC (NM_SETTING_WIRELESS_CHANNEL,
diff --git a/src/libnmc-setting/nm-meta-setting-desc.h b/src/libnmc-setting/nm-meta-setting-desc.h
index 9efbd15c..a796dcaf 100644
--- a/src/libnmc-setting/nm-meta-setting-desc.h
+++ b/src/libnmc-setting/nm-meta-setting-desc.h
@@ -482,6 +482,7 @@ struct _NMMetaType {
     NMObjBaseClass parent;
     const char    *type_name;
     const char *(*get_name)(const NMMetaAbstractInfo *abstract_info, gboolean for_header);
+    const char *(*get_alias)(const NMMetaAbstractInfo *abstract_info);
     const NMMetaAbstractInfo *const *(*get_nested)(const NMMetaAbstractInfo *abstract_info,
                                                    guint                    *out_len,
                                                    gpointer                 *out_to_free);
diff --git a/src/libnmc-setting/settings-docs.h.in b/src/libnmc-setting/settings-docs.h.in
index 17468497..5f752ce7 100644
--- a/src/libnmc-setting/settings-docs.h.in
+++ b/src/libnmc-setting/settings-docs.h.in
@@ -1,6 +1,6 @@
 /* Generated file. Do not edit. */
 
-#define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTH_RETRIES N_("The number of retries for the authentication. Zero means to try indefinitely; -1 means to use a global default. If the global default is not set, the authentication retries for 3 times before failing the connection. Currently, this only applies to 802-1x authentication.")
+#define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTH_RETRIES N_("The number of retries for the authentication. Zero means to try indefinitely; -1 means to use a global default. If the global default is not set, the authentication retries for 3 times before failing the connection. Connections using a pre-shared key to authenticate will only prompt for a new key during the last authentication attempt.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT N_("Whether or not the connection should be automatically connected by NetworkManager when the resources for the connection are available. TRUE to automatically activate the connection, FALSE to require manual intervention to activate the connection. Autoconnect happens when the circumstances are suitable. That means for example that the device is currently managed and not active. Autoconnect thus never replaces or competes with an already active profile. Note that autoconnect is not implemented for VPN profiles. See \"secondaries\" as an alternative to automatically connect VPN profiles. If multiple profiles are ready to autoconnect on the same device, the one with the better \"connection.autoconnect-priority\" is chosen. If the priorities are equal, then the most recently connected profile is activated. If the profiles were not connected earlier or their \"connection.timestamp\" is identical, the choice is undefined. Depending on \"connection.multi-connect\", a profile can (auto)connect only once at a time or multiple times.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT_PORTS N_("Whether or not ports of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for controller connections. The properties \"autoconnect\", \"autoconnect-priority\" and \"autoconnect-retries\" are unrelated to this setting. The permitted values are: 0: leave port connections untouched, 1: activate all the port connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-ports is read to determine the real value. If it is default as well, this fallbacks to 0.")
 #define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY N_("The autoconnect priority in range -999 to 999. If the connection is set to autoconnect, connections with higher priority will be preferred. The higher number means higher priority. Defaults to 0. Note that this property only matters if there are more than one candidate profile to select for autoconnect. In case of equal priority, the profile used most recently is chosen.")
@@ -186,14 +186,15 @@
 #define DESCRIBE_DOC_NM_SETTING_INFINIBAND_TRANSPORT_MODE N_("The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\".")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ADDRESSES N_("A list of IPv4 addresses and their prefix length. Multiple addresses can be separated by comma. For example \"192.168.1.5/24, 10.1.0.5/24\". The addresses are listed in decreasing priority, meaning the first address will be the primary address.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_AUTO_ROUTE_EXT_GW N_("VPN connections will default to add the route automatically unless this setting is set to FALSE. For other connection types, adding such an automatic route is currently not supported and setting this to TRUE has no effect.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DAD_TIMEOUT N_("Maximum timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail. The property is currently implemented only for IPv4. A zero value means that no duplicate address detection is performed, -1 means the default value (either the value configured globally in NetworkManger.conf or 200ms).  A value greater than zero is a timeout in milliseconds.  Note that the time intervals are subject to randomization as per RFC 5227 and so the actual duration can be between half and the full time specified in this property.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value \"ipv6-duid\" uses the DUID from \"ipv6.dhcp-duid\" property as an RFC4361-compliant client identifier. As IAID it uses \"ipv4.dhcp-iaid\" and falls back to \"ipv6.dhcp-iaid\" if unset. The special value \"duid\" generates a RFC4361-compliant client identifier based on \"ipv4.dhcp-iaid\" and uses a DUID generated by hashing /etc/machine-id. The special value \"stable\" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the \"${DEVICE}\" or \"${MAC}\" specifier to get a per-device key. The special value \"none\" prevents any client identifier from being sent. Note that this is normally not recommended. If unset, a globally configured default from NetworkManager.conf is used. If still unset, the default depends on the DHCP plugin. The internal dhcp client will default to \"mac\" and the dhclient plugin will try to use one from its config file if present, or won't sent any client-id otherwise.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_CLAT N_("Controls the CLAT (Customer-side translator) functionality. CLAT is used to implement the client part of 464XLAT (RFC 6877), an architecture that provides IPv4 connectivity to hosts on IPv6-only networks. When CLAT is enabled, NetworkManager discovers the NAT64 prefix from IPv6 Router Advertisements; if a NAT64 prefix is announced, NetworkManager installs a BPF program to perform the stateless translation of packets between IPv4 and IPv6. Setting \"no\" (0) completely disables CLAT. \"auto\" (1) enables CLAT only when the IPv4 method is 'auto' and the device doesn't have a native IPv4 gateway. \"force\" (2) enables CLAT even if the IPv4 method is not 'auto' and even if the device has a native IPv4 gateway. When set to \"default\" (-1), the actual value is looked up in the global configuration; if not specified it defaults to \"no\" (0). In the future the default fall back value will change to \"auto\" (1).")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DAD_TIMEOUT N_("Maximum timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail. The property is currently implemented only for IPv4. A zero value means that no duplicate address detection is performed, -1 means the default value (either the value configured globally in NetworkManager.conf or 200ms).  A value greater than zero is a timeout in milliseconds.  Note that the time intervals are subject to randomization as per RFC 5227 and so the actual duration can be between half and the full time specified in this property.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value \"ipv6-duid\" uses the DUID from \"ipv6.dhcp-duid\" property as an RFC4361-compliant client identifier. As IAID it uses \"ipv4.dhcp-iaid\" and falls back to \"ipv6.dhcp-iaid\" if unset. The special value \"duid\" generates a RFC4361-compliant client identifier based on \"ipv4.dhcp-iaid\" and uses a DUID generated by hashing /etc/machine-id. The special value \"stable\" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the \"${DEVICE}\" or \"${MAC}\" specifier to get a per-device key. The special value \"none\" prevents any client identifier from being sent. Note that this is normally not recommended. If unset, a globally configured default from NetworkManager.conf is used. If still unset, internal dhcp client will default to \"mac\".")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_DSCP N_("Specifies the value for the DSCP field (traffic class) of the IP header. When empty, the global default value is used; if no global default is specified, it is assumed to be \"CS0\". Allowed values are: \"CS0\", \"CS4\" and \"CS6\". The property is currently valid only for IPv4, and it is supported only by the \"internal\" DHCP plugin.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_FQDN N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-hostname\" are mutually exclusive and cannot be set at the same time.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME_FLAGS N_("Flags for the DHCP hostname and FQDN. Currently, this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are \"fqdn-serv-update\" (0x1), \"fqdn-encoded\" (0x2) and \"fqdn-no-update\" (0x4).  When no FQDN flag is set and \"fqdn-clear-flags\" (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and \"fqdn-clear-flags\" (0x8) is not set, the standard FQDN flags are set in the request: \"fqdn-serv-update\" (0x1), \"fqdn-encoded\" (0x2) for IPv4 and \"fqdn-serv-update\" (0x1) for IPv6. When this property is set to the default value \"none\" (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also \"none\" (0x0), then the standard FQDN flags described above are sent in the DHCP requests.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_IAID N_("A string containing the \"Identity Association Identifier\" (IAID) used by the DHCP client. The string can be a 32-bit number (either decimal, hexadecimal or as colon separated hexadecimal numbers). Alternatively it can be set to the special values \"mac\", \"perm-mac\", \"ifname\" or \"stable\". When set to \"mac\" (or \"perm-mac\"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to \"ifname\", the IAID is computed by hashing the interface name. The special value \"stable\" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be \"ifname\". For DHCPv4, the IAID is only used with \"ipv4.dhcp-client-id\" values \"duid\" and \"ipv6-duid\" to generate the client-id. For DHCPv6, note that at the moment this property is only supported by the \"internal\" DHCPv6 plugin. The \"dhclient\" DHCPv6 plugin always derives the IAID from the MAC address. The actually used DHCPv6 IAID for a currently activated interface is exposed in the lease information of the device.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_IPV6_ONLY_PREFERRED N_("Controls the \"IPv6-Only Preferred\" DHCPv4 option (RFC 8925). When set to \"yes\" (1), the host adds the option to the parameter request list; if the DHCP server sends the option back, the host stops the DHCP client for the time interval specified in the option. Enable this feature if the host supports an IPv6-only mode, i.e. either all applications are IPv6-only capable or there is a form of 464XLAT deployed. When set to \"default\" (-1), the actual value is looked up in the global configuration; if not specified, it defaults to \"no\" (0). If the connection has IPv6 method set to \"disabled\", this property does not have effect and the \"IPv6-Only Preferred\" option is always disabled.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_IAID N_("A string containing the \"Identity Association Identifier\" (IAID) used by the DHCP client. The string can be a 32-bit number (either decimal, hexadecimal or as colon separated hexadecimal numbers). Alternatively it can be set to the special values \"mac\", \"perm-mac\", \"ifname\" or \"stable\". When set to \"mac\" (or \"perm-mac\"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to \"ifname\", the IAID is computed by hashing the interface name. The special value \"stable\" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be \"ifname\". For DHCPv4, the IAID is only used with \"ipv4.dhcp-client-id\" values \"duid\" and \"ipv6-duid\" to generate the client-id. For DHCPv6, note that at the moment this property is only supported by the \"internal\" DHCPv6 plugin. The actually used DHCPv6 IAID for a currently activated interface is exposed in the lease information of the device.")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_IPV6_ONLY_PREFERRED N_("Controls the \"IPv6-Only Preferred\" DHCPv4 option (option 108 - RFC 8925). When set to \"yes\" (1), the host adds the option to the parameter request list; if the DHCP server sends the option back, the host stops the DHCP client for the time interval specified in the option. Enable this feature if the host supports an IPv6-only mode, i.e. either all applications are IPv6-only capable or there is a form of CLAT (464XLAT) deployed. If set to \"auto\" (2), the option is automatically turned on when the IPv6 method is \"auto\" and the connection profile has ipv4.clat set to \"yes\" or \"auto\". If these two conditions are met, the host can operate in IPv6-only mode and therefore it is safe to disable DHCPv4 when the network also supports it. When set to \"default\" (-1), the actual value is looked up in the global configuration; if not specified, it defaults to \"auto\" (2). If the connection has IPv6 method set to \"disabled\", this property does not have effect and the \"IPv6-Only Preferred\" option is always disabled.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_REJECT_SERVERS N_("Array of servers from which DHCP offers must be rejected. This property is useful to avoid getting a lease from misconfigured or rogue servers. For DHCPv4, each element must be an IPv4 address, optionally followed by a slash and a prefix length (e.g. \"192.168.122.0/24\"). This property is currently not implemented for DHCPv6.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME N_("Since 1.52 this property is deprecated and is only used as fallback value for dhcp-send-hostname if it's set to 'default'. This is only done to avoid breaking existing configurations, the new property should be used from now on.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME_V2 N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the dhcp-hostname property is NULL and this property is TRUE, the current persistent hostname of the computer is sent. The default value is default (-1). In this case the global value from NetworkManager configuration is looked up. If it's not set, the value from dhcp-send-hostname-deprecated, which defaults to TRUE, is used for backwards compatibility. In the future this will change and, in absence of a global default, it will always fallback to TRUE.")
@@ -213,7 +214,7 @@
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_METHOD N_("The IPv4 connection method.")
 #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_REPLACE_LOCAL_RULE N_("Connections will default to keep the autogenerated priority 0 local rule unless this setting is set to TRUE.")
-#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_REQUIRED_TIMEOUT N_("The minimum time interval in milliseconds for which dynamic IP configuration should be tried before the connection succeeds. This property is useful for example if both IPv4 and IPv6 are enabled and are allowed to fail. Normally the connection succeeds as soon as one of the two address families completes; by setting a required timeout for e.g. IPv4, one can ensure that even if IP6 succeeds earlier than IPv4, NetworkManager waits some time for IPv4 before the connection becomes active. Note that if \"may-fail\" is FALSE for the same address family, this property has no effect as NetworkManager needs to wait for the full DHCP timeout. A zero value means that no required timeout is present, -1 means the default value (either configuration ipvx.required-timeout override or zero).")
+#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_REQUIRED_TIMEOUT N_("The minimum time interval in milliseconds for which dynamic IP configuration should be tried before the connection succeeds. This property is useful for example if both IPv4 and IPv6 are enabled and are allowed to fail. Normally the connection succeeds as soon as one of the two address families completes; by setting a required timeout for e.g. IPv4, one can ensure that even if IPv6 succeeds earlier than IPv4, NetworkManager waits some time for IPv4 before the connection becomes active. Note that if \"may-fail\" is FALSE for the same address family, this property has no effect as NetworkManager needs to wait for the full DHCP timeout. A zero value means that no required timeout is present, -1 means the default value (either configuration ipvx.required-timeout override or zero).")
 #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.")
 #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ROUTED_DNS N_("Whether to add routes for DNS servers. When enabled, NetworkManager adds a route for each DNS server that is associated with this connection either statically (defined in the connection profile) or dynamically (for example, retrieved via DHCP). The route guarantees that the DNS server is reached via this interface. When set to \"default\" (-1), the value from global configuration is used; if no global default is defined, this feature is disabled.")
@@ -224,12 +225,12 @@
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE N_("Configure method for creating the IPv6 interface identifier of addresses with RFC4862 IPv6 Stateless Address Autoconfiguration and Link Local addresses. The permitted values are: \"eui64\" (0), \"stable-privacy\" (1), \"default\" (3) or \"default-or-eui64\" (2). If the property is set to \"eui64\", the addresses will be generated using the interface token derived from hardware address. This makes the host part of the address to stay constant, making it possible to track the host's presence when it changes networks. The address changes when the interface hardware is replaced. If a duplicate address is detected, there is also no fallback to generate another address. When configured, the \"ipv6.token\" is used instead of the MAC address to generate addresses for stateless autoconfiguration. If the property is set to \"stable-privacy\", the interface identifier is generated as specified by RFC7217. This works by hashing a host specific key (see NetworkManager(8) manual), the interface name, the connection's \"connection.stable-id\" property and the address prefix.  This improves privacy by making it harder to use the address to track the host's presence and the address is stable when the network interface hardware is replaced. The special values \"default\" and \"default-or-eui64\" will fallback to the global connection default as documented in the NetworkManager.conf(5) manual. If the global default is not specified, the fallback value is \"stable-privacy\" or \"eui64\", respectively. If not specified, when creating a new profile the default is \"default\". Note that this setting is distinct from the Privacy Extensions as configured by \"ip6-privacy\" property and it does not affect the temporary addresses configured with this option.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ADDRESSES N_("A list of IPv6 addresses and their prefix length. Multiple addresses can be separated by comma. For example \"2001:db8:85a3::8a2e:370:7334/64, 2001:db8:85a3::5/64\". The addresses are listed in decreasing priority, meaning the first address will be the primary address. This can make a difference with IPv6 source address selection (RFC 6724, section 5).")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_AUTO_ROUTE_EXT_GW N_("VPN connections will default to add the route automatically unless this setting is set to FALSE. For other connection types, adding such an automatic route is currently not supported and setting this to TRUE has no effect.")
-#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DAD_TIMEOUT N_("Maximum timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail. The property is currently implemented only for IPv4. A zero value means that no duplicate address detection is performed, -1 means the default value (either the value configured globally in NetworkManger.conf or 200ms).  A value greater than zero is a timeout in milliseconds.  Note that the time intervals are subject to randomization as per RFC 5227 and so the actual duration can be between half and the full time specified in this property.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DAD_TIMEOUT N_("Maximum timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail. The property is currently implemented only for IPv4. A zero value means that no duplicate address detection is performed, -1 means the default value (either the value configured globally in NetworkManager.conf or 200ms).  A value greater than zero is a timeout in milliseconds.  Note that the time intervals are subject to randomization as per RFC 5227 and so the actual duration can be between half and the full time specified in this property.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DSCP N_("Specifies the value for the DSCP field (traffic class) of the IP header. When empty, the global default value is used; if no global default is specified, it is assumed to be \"CS0\". Allowed values are: \"CS0\", \"CS4\" and \"CS6\". The property is currently valid only for IPv4, and it is supported only by the \"internal\" DHCP plugin.")
-#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DUID N_("A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value \"lease\" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and \"dhclient\" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values \"llt\" and \"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values \"stable-llt\", \"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. You may want to include the \"${DEVICE}\" or \"${MAC}\" specifier in the stable-id, in case this profile gets activated on multiple devices. So, the link-layer address of \"stable-ll\" and \"stable-llt\" will be a generated address derived from the stable id. The DUID-LLT time value in the \"stable-llt\" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in \"llt\"). When the property is unset, the global value provided for \"ipv6.dhcp-duid\" is used. If no global value is provided, the default \"lease\" value is assumed.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DUID N_("A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value \"lease\" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values \"llt\" and \"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values \"stable-llt\", \"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. You may want to include the \"${DEVICE}\" or \"${MAC}\" specifier in the stable-id, in case this profile gets activated on multiple devices. So, the link-layer address of \"stable-ll\" and \"stable-llt\" will be a generated address derived from the stable id. The DUID-LLT time value in the \"stable-llt\" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in \"llt\"). When the property is unset, the global value provided for \"ipv6.dhcp-duid\" is used. If no global value is provided, the default \"lease\" value is assumed.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME_FLAGS N_("Flags for the DHCP hostname and FQDN. Currently, this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are \"fqdn-serv-update\" (0x1), \"fqdn-encoded\" (0x2) and \"fqdn-no-update\" (0x4).  When no FQDN flag is set and \"fqdn-clear-flags\" (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and \"fqdn-clear-flags\" (0x8) is not set, the standard FQDN flags are set in the request: \"fqdn-serv-update\" (0x1), \"fqdn-encoded\" (0x2) for IPv4 and \"fqdn-serv-update\" (0x1) for IPv6. When this property is set to the default value \"none\" (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also \"none\" (0x0), then the standard FQDN flags described above are sent in the DHCP requests.")
-#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_IAID N_("A string containing the \"Identity Association Identifier\" (IAID) used by the DHCP client. The string can be a 32-bit number (either decimal, hexadecimal or as colon separated hexadecimal numbers). Alternatively it can be set to the special values \"mac\", \"perm-mac\", \"ifname\" or \"stable\". When set to \"mac\" (or \"perm-mac\"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to \"ifname\", the IAID is computed by hashing the interface name. The special value \"stable\" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be \"ifname\". For DHCPv4, the IAID is only used with \"ipv4.dhcp-client-id\" values \"duid\" and \"ipv6-duid\" to generate the client-id. For DHCPv6, note that at the moment this property is only supported by the \"internal\" DHCPv6 plugin. The \"dhclient\" DHCPv6 plugin always derives the IAID from the MAC address. The actually used DHCPv6 IAID for a currently activated interface is exposed in the lease information of the device.")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_IAID N_("A string containing the \"Identity Association Identifier\" (IAID) used by the DHCP client. The string can be a 32-bit number (either decimal, hexadecimal or as colon separated hexadecimal numbers). Alternatively it can be set to the special values \"mac\", \"perm-mac\", \"ifname\" or \"stable\". When set to \"mac\" (or \"perm-mac\"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to \"ifname\", the IAID is computed by hashing the interface name. The special value \"stable\" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be \"ifname\". For DHCPv4, the IAID is only used with \"ipv4.dhcp-client-id\" values \"duid\" and \"ipv6-duid\" to generate the client-id. For DHCPv6, note that at the moment this property is only supported by the \"internal\" DHCPv6 plugin. The actually used DHCPv6 IAID for a currently activated interface is exposed in the lease information of the device.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_PD_HINT N_("A IPv6 address followed by a slash and a prefix length. If set, the value is sent to the DHCPv6 server as hint indicating the prefix delegation (IA_PD) we want to receive. To only hint a prefix length without prefix, set the address part to the zero address (for example \"::/60\").")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_REJECT_SERVERS N_("Array of servers from which DHCP offers must be rejected. This property is useful to avoid getting a lease from misconfigured or rogue servers. For DHCPv4, each element must be an IPv4 address, optionally followed by a slash and a prefix length (e.g. \"192.168.122.0/24\"). This property is currently not implemented for DHCPv6.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_SEND_HOSTNAME N_("Since 1.52 this property is deprecated and is only used as fallback value for dhcp-send-hostname if it's set to 'default'. This is only done to avoid breaking existing configurations, the new property should be used from now on.")
@@ -251,7 +252,7 @@
 #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_RA_TIMEOUT N_("A timeout for waiting Router Advertisements in seconds. If zero (the default), a globally configured default is used. If still unspecified, the timeout depends on the sysctl settings of the device. Set to 2147483647 (MAXINT32) for infinity.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_REPLACE_LOCAL_RULE N_("Connections will default to keep the autogenerated priority 0 local rule unless this setting is set to TRUE.")
-#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_REQUIRED_TIMEOUT N_("The minimum time interval in milliseconds for which dynamic IP configuration should be tried before the connection succeeds. This property is useful for example if both IPv4 and IPv6 are enabled and are allowed to fail. Normally the connection succeeds as soon as one of the two address families completes; by setting a required timeout for e.g. IPv4, one can ensure that even if IP6 succeeds earlier than IPv4, NetworkManager waits some time for IPv4 before the connection becomes active. Note that if \"may-fail\" is FALSE for the same address family, this property has no effect as NetworkManager needs to wait for the full DHCP timeout. A zero value means that no required timeout is present, -1 means the default value (either configuration ipvx.required-timeout override or zero).")
+#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_REQUIRED_TIMEOUT N_("The minimum time interval in milliseconds for which dynamic IP configuration should be tried before the connection succeeds. This property is useful for example if both IPv4 and IPv6 are enabled and are allowed to fail. Normally the connection succeeds as soon as one of the two address families completes; by setting a required timeout for e.g. IPv4, one can ensure that even if IPv6 succeeds earlier than IPv4, NetworkManager waits some time for IPv4 before the connection becomes active. Note that if \"may-fail\" is FALSE for the same address family, this property has no effect as NetworkManager needs to wait for the full DHCP timeout. A zero value means that no required timeout is present, -1 means the default value (either configuration ipvx.required-timeout override or zero).")
 #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.")
 #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ROUTED_DNS N_("Whether to add routes for DNS servers. When enabled, NetworkManager adds a route for each DNS server that is associated with this connection either statically (defined in the connection profile) or dynamically (for example, retrieved via DHCP). The route guarantees that the DNS server is reached via this interface. When set to \"default\" (-1), the value from global configuration is used; if no global default is defined, this feature is disabled.")
@@ -452,7 +453,7 @@
 #define DESCRIBE_DOC_NM_SETTING_WIREGUARD_PRIVATE_KEY N_("The 256 bit private-key in base64 encoding.")
 #define DESCRIBE_DOC_NM_SETTING_WIREGUARD_PRIVATE_KEY_FLAGS N_("Flags indicating how to handle the \"private-key\" property.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_AP_ISOLATION N_("Configures AP isolation, which prevents communication between wireless devices connected to this AP. This property can be set to a value different from \"default\" (-1) only when the interface is configured in AP mode. If set to \"true\" (1), devices are not able to communicate with each other. This increases security because it protects devices against attacks from other clients in the network. At the same time, it prevents devices to access resources on the same wireless networks as file shares, printers, etc. If set to \"false\" (0), devices can talk to each other. When set to \"default\" (-1), the global default is used; in case the global default is unspecified it is assumed to be \"false\" (0).")
-#define DESCRIBE_DOC_NM_SETTING_WIRELESS_BAND N_("802.11 frequency band of the network.  One of \"a\" for 5GHz 802.11a or \"bg\" for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network to the specific band, i.e. if \"a\" is specified, the device will not associate with the same network in the 2.4GHz band even if the network's settings are compatible.  This setting depends on specific driver capability and may not work with all drivers.")
+#define DESCRIBE_DOC_NM_SETTING_WIRELESS_BAND N_("802.11 frequency band of the network.  One of \"a\" for 5GHz, \"bg\" for 2.4GHz or \"6GHz\".  This will lock associations to the Wi-Fi network to the specific band, i.e. if \"a\" is specified, the device will not associate with the same network in the 2.4GHz (bg) or 6GHz bands even if the network's settings are compatible.  This setting depends on specific driver capability and may not work with all drivers.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_BSSID N_("If specified, directs the device to only associate with the given access point.  This capability is highly driver dependent and not supported by all devices.  Note: this property does not control the BSSID used when creating an Ad-Hoc network and is unlikely to in the future. Locking a client profile to a certain BSSID will prevent roaming and also disable background scanning. That can be useful, if there is only one access point for the SSID.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_CHANNEL N_("Wireless channel to use for the Wi-Fi connection.  The device will only join (or create for Ad-Hoc networks) a Wi-Fi network on the specified channel.  Because channel numbers overlap between bands, this property also requires the \"band\" property to be set.")
 #define DESCRIBE_DOC_NM_SETTING_WIRELESS_CHANNEL_WIDTH N_("Specifies width of the wireless channel in Access Point (AP) mode. When set to \"auto\" (0) (the default), the channel width is automatically determined. At the moment, this means that the safest (smallest) width is chosen. If the value is not \"auto\" (0), then the 'channel' property must also be set. When using the 2.4GHz band, the width can be at most 40MHz. This property can be set to a value different from \"auto\" (0) only when the interface is configured in AP mode.")
diff --git a/src/libnmt-newt/meson.build b/src/libnmt-newt/meson.build
index 9a07fd58..e7a71e9c 100644
--- a/src/libnmt-newt/meson.build
+++ b/src/libnmt-newt/meson.build
@@ -27,6 +27,7 @@ libnmt_newt = static_library(
   dependencies: [
     libnm_dep,
     newt_dep,
+    slang_dep,
     glib_dep,
   ],
 )
diff --git a/src/libnmt-newt/nmt-newt-form.c b/src/libnmt-newt/nmt-newt-form.c
index 3565799c..3f87d0cf 100644
--- a/src/libnmt-newt/nmt-newt-form.c
+++ b/src/libnmt-newt/nmt-newt-form.c
@@ -14,6 +14,8 @@
 #include "libnm-client-aux-extern/nm-default-client.h"
 
 #include <fcntl.h>
+#include <signal.h>
+#include <slang.h>
 #include <unistd.h>
 
 #include "nmt-newt-form.h"
@@ -31,13 +33,17 @@ typedef struct {
     NmtNewtWidget *content;
 
     guint    x, y, width, height;
+    guint    form_width_max;
     guint    padding;
     gboolean fixed_x, fixed_y;
     gboolean fixed_width, fixed_height;
+    gboolean stable_width;
+    gboolean fullscreen_vertical, fullscreen_horizontal;
     char    *title_lc;
 
     gboolean       dirty;
     NmtNewtWidget *focus;
+    GArray        *hotkeys;
 #ifdef HAVE_NEWTFORMGETSCROLLPOSITION
     int scroll_position = 0;
 #endif
@@ -60,6 +66,7 @@ enum {
 
 enum {
     QUIT,
+    HOTKEY,
 
     LAST_SIGNAL
 };
@@ -118,6 +125,7 @@ nmt_newt_form_finalize(GObject *object)
 
     g_free(priv->title_lc);
     g_clear_object(&priv->focus);
+    nm_clear_pointer(&priv->hotkeys, g_array_unref);
 
     G_OBJECT_CLASS(nmt_newt_form_parent_class)->finalize(object);
 }
@@ -181,6 +189,15 @@ nmt_newt_form_build(NmtNewtForm *form)
     nmt_newt_widget_size_request(priv->content, &form_width, &form_height);
     newtGetScreenSize(&screen_width, &screen_height);
 
+    if (priv->stable_width) {
+        /* Never let the form get narrower across rebuilds. Otherwise content
+         * that shrinks (eg, a filtered list) makes the window recenter and
+         * "jump". Only forms that opt in get this; see
+         * nmt_newt_form_set_stable_width(). */
+        priv->form_width_max = NM_MAX(priv->form_width_max, (guint) NM_MAX(form_width, 0));
+        form_width           = priv->form_width_max;
+    }
+
     if (!priv->fixed_width)
         priv->width = NM_MIN(form_width + 2 * ((gint64) priv->padding), screen_width - 2);
     if (!priv->fixed_height)
@@ -191,6 +208,20 @@ nmt_newt_form_build(NmtNewtForm *form)
     if (!priv->fixed_y)
         priv->y = (screen_height - form_height) / 2;
 
+    if (priv->fullscreen_horizontal) {
+        priv->x     = 2;
+        priv->width = screen_width - 4;
+    }
+    if (priv->fullscreen_vertical) {
+        priv->y      = 2;
+        priv->height = screen_height - 4;
+    }
+
+    if ((int) priv->x < 0)
+        priv->x = 0;
+    if ((int) priv->y < 0)
+        priv->y = 0;
+
     nmt_newt_widget_size_allocate(priv->content,
                                   priv->padding,
                                   priv->padding,
@@ -211,6 +242,12 @@ nmt_newt_form_build(NmtNewtForm *form)
         priv->form = newtForm(NULL, NULL, NEWT_FLAG_NOF12);
 
     newtFormAddHotKey(priv->form, NEWT_KEY_ESCAPE);
+    if (priv->hotkeys) {
+        guint h;
+
+        for (h = 0; h < priv->hotkeys->len; h++)
+            newtFormAddHotKey(priv->form, nm_g_array_index(priv->hotkeys, int, h));
+    }
 
     cos = nmt_newt_widget_get_components(priv->content);
     for (i = 0; cos[i]; i++)
@@ -270,6 +307,17 @@ nmt_newt_form_iterate(NmtNewtForm *form)
     newtFormSetTimer(priv->form, 1);
     newtFormRun(priv->form, &es);
 
+    if (es.reason == NEWT_EXIT_HOTKEY) {
+        gboolean handled = FALSE;
+
+        /* Give listeners (eg, the connection-list search) a chance to consume the
+         * key. Esc is included, so a listener can make it cancel a transient mode
+         * instead of closing the form. */
+        g_signal_emit(form, signals[HOTKEY], 0, (int) es.u.key, &handled);
+        if (handled)
+            return;
+    }
+
     if (es.reason == NEWT_EXIT_HOTKEY || es.reason == NEWT_EXIT_ERROR) {
         /* The user hit Esc or there was an error. */
         g_clear_object(&priv->focus);
@@ -301,6 +349,7 @@ nmt_newt_form_iterate(NmtNewtForm *form)
  */
 static GSList  *form_stack;
 static GSource *keypress_source;
+static GSource *winch_source;
 
 static gboolean
 nmt_newt_form_keypress_callback(int fd, GIOCondition condition, gpointer user_data)
@@ -311,6 +360,48 @@ nmt_newt_form_keypress_callback(int fd, GIOCondition condition, gpointer user_da
     return TRUE;
 }
 
+/* On SIGWINCH, refit every form in the stack to the new terminal size. The
+ * windows must be popped top-to-bottom (newt's window stack is LIFO) and rebuilt
+ * bottom-to-top to restore the original z-order.
+ */
+static void
+nmt_newt_form_resize(void)
+{
+    GSList *bottom_up;
+    GSList *iter;
+
+    for (iter = form_stack; iter; iter = iter->next) {
+        NmtNewtForm        *form = iter->data;
+        NmtNewtFormPrivate *priv = NMT_NEWT_FORM_GET_PRIVATE(form);
+
+        if (priv->form)
+            nmt_newt_form_destroy(form);
+    }
+
+    /* newtResizeScreen() updates SLtt's screen size but skips the
+     * SLsmg_reinit_smg() that resizes the screen buffer (commented out
+     * upstream), so rows newly exposed by a taller terminal go unpainted. Do
+     * it ourselves, then repaint the root. */
+    SLtt_get_screen_size();
+    SLsmg_reinit_smg();
+    newtCls();
+
+    bottom_up = g_slist_reverse(g_slist_copy(form_stack));
+    for (iter = bottom_up; iter; iter = iter->next)
+        nmt_newt_form_build(iter->data);
+    g_slist_free(bottom_up);
+
+    nmt_newt_form_redraw(form_stack->data);
+}
+
+static gboolean
+nmt_newt_form_winch_callback(gpointer user_data)
+{
+    if (form_stack)
+        nmt_newt_form_resize();
+    return G_SOURCE_CONTINUE;
+}
+
 static gboolean
 nmt_newt_form_timeout_callback(gpointer user_data)
 {
@@ -338,6 +429,8 @@ nmt_newt_form_real_show(NmtNewtForm *form)
         g_source_set_can_recurse(keypress_source, TRUE);
         g_source_attach(keypress_source, NULL);
     }
+    if (!winch_source)
+        winch_source = nm_g_unix_signal_add_source(SIGWINCH, nmt_newt_form_winch_callback, NULL);
 
     nmt_newt_form_build(form);
     form_stack = g_slist_prepend(form_stack, g_object_ref(form));
@@ -403,8 +496,10 @@ nmt_newt_form_quit(NmtNewtForm *form)
 
     if (form_stack)
         nmt_newt_form_iterate(form_stack->data);
-    else
+    else {
         nm_clear_g_source_inst(&keypress_source);
+        nm_clear_g_source_inst(&winch_source);
+    }
 
     g_signal_emit(form, signals[QUIT], 0);
     g_object_unref(form);
@@ -434,11 +529,47 @@ nmt_newt_form_set_focus(NmtNewtForm *form, NmtNewtWidget *widget)
         g_object_ref(priv->focus);
 }
 
+/**
+ * nmt_newt_form_add_hotkey:
+ * @form: an #NmtNewtForm
+ * @key: a key code (eg, a character, or an %NEWT_KEY_ value)
+ *
+ * Registers @key as a hotkey on @form. When the user presses it, the
+ * #NmtNewtForm::hotkey signal is emitted; a handler returning %TRUE consumes
+ * the key, otherwise the form's default handling applies.
+ */
+void
+nmt_newt_form_add_hotkey(NmtNewtForm *form, int key)
+{
+    NmtNewtFormPrivate *priv = NMT_NEWT_FORM_GET_PRIVATE(form);
+
+    if (!priv->hotkeys)
+        priv->hotkeys = g_array_new(FALSE, FALSE, sizeof(int));
+    g_array_append_val(priv->hotkeys, key);
+
+    if (priv->form)
+        newtFormAddHotKey(priv->form, key);
+}
+
+/**
+ * nmt_newt_form_set_stable_width:
+ * @form: an #NmtNewtForm
+ *
+ * Stops @form from getting narrower across rebuilds: its width grows to fit
+ * content but never shrinks. Use for forms whose content shrinks in place (eg,
+ * a list filtered by a search box) where recentering would make the window
+ * "jump".
+ */
+void
+nmt_newt_form_set_stable_width(NmtNewtForm *form)
+{
+    NMT_NEWT_FORM_GET_PRIVATE(form)->stable_width = TRUE;
+}
+
 static void
 nmt_newt_form_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
 {
     NmtNewtFormPrivate *priv = NMT_NEWT_FORM_GET_PRIVATE(object);
-    int                 screen_width, screen_height;
 
     switch (prop_id) {
     case PROP_TITLE:
@@ -448,32 +579,13 @@ nmt_newt_form_set_property(GObject *object, guint prop_id, const GValue *value,
             priv->title_lc = NULL;
         break;
     case PROP_FULLSCREEN:
-        if (g_value_get_boolean(value)) {
-            newtGetScreenSize(&screen_width, &screen_height);
-            priv->x = priv->y = 2;
-            priv->fixed_x = priv->fixed_y = TRUE;
-            priv->width                   = screen_width - 4;
-            priv->height                  = screen_height - 4;
-            priv->fixed_width = priv->fixed_height = TRUE;
-        }
+        priv->fullscreen_horizontal = priv->fullscreen_vertical = g_value_get_boolean(value);
         break;
     case PROP_FULLSCREEN_VERTICAL:
-        if (g_value_get_boolean(value)) {
-            newtGetScreenSize(&screen_width, &screen_height);
-            priv->y            = 2;
-            priv->fixed_y      = TRUE;
-            priv->height       = screen_height - 4;
-            priv->fixed_height = TRUE;
-        }
+        priv->fullscreen_vertical = g_value_get_boolean(value);
         break;
     case PROP_FULLSCREEN_HORIZONTAL:
-        if (g_value_get_boolean(value)) {
-            newtGetScreenSize(&screen_width, &screen_height);
-            priv->x           = 2;
-            priv->fixed_x     = TRUE;
-            priv->width       = screen_width - 4;
-            priv->fixed_width = TRUE;
-        }
+        priv->fullscreen_horizontal = g_value_get_boolean(value);
         break;
     case PROP_X:
         if (g_value_get_uint(value)) {
@@ -580,6 +692,28 @@ nmt_newt_form_class_init(NmtNewtFormClass *form_class)
                                  0);
 
     /**
+     * NmtNewtForm::hotkey:
+     * @form: the #NmtNewtForm
+     * @key: the key that was pressed
+     *
+     * Emitted when a key registered via nmt_newt_form_add_hotkey() (or Esc) is
+     * pressed. A handler returning %TRUE consumes the key; otherwise the form's
+     * default handling applies (Esc closes the form).
+     *
+     * Returns: %TRUE if the key was handled.
+     */
+    signals[HOTKEY] = g_signal_new("hotkey",
+                                   G_OBJECT_CLASS_TYPE(object_class),
+                                   G_SIGNAL_RUN_LAST,
+                                   G_STRUCT_OFFSET(NmtNewtFormClass, hotkey),
+                                   g_signal_accumulator_true_handled,
+                                   NULL,
+                                   NULL,
+                                   G_TYPE_BOOLEAN,
+                                   1,
+                                   G_TYPE_INT);
+
+    /**
      * NmtNewtForm:title:
      *
      * The form's title. If non-%NULL, this will be displayed above
diff --git a/src/libnmt-newt/nmt-newt-form.h b/src/libnmt-newt/nmt-newt-form.h
index 6a2ff9dc..63b64be6 100644
--- a/src/libnmt-newt/nmt-newt-form.h
+++ b/src/libnmt-newt/nmt-newt-form.h
@@ -26,6 +26,7 @@ typedef struct {
 
     /* signals */
     void (*quit)(NmtNewtForm *form);
+    gboolean (*hotkey)(NmtNewtForm *form, int key);
 
     /* methods */
     void (*show)(NmtNewtForm *form);
@@ -45,4 +46,8 @@ void           nmt_newt_form_quit(NmtNewtForm *form);
 
 void nmt_newt_form_set_focus(NmtNewtForm *form, NmtNewtWidget *widget);
 
+void nmt_newt_form_add_hotkey(NmtNewtForm *form, int key);
+
+void nmt_newt_form_set_stable_width(NmtNewtForm *form);
+
 #endif /* NMT_NEWT_FORM_H */
diff --git a/src/libnmt-newt/nmt-newt-textbox.c b/src/libnmt-newt/nmt-newt-textbox.c
index bf9b6a294..01e3b1c7 100644
--- a/src/libnmt-newt/nmt-newt-textbox.c
+++ b/src/libnmt-newt/nmt-newt-textbox.c
@@ -95,7 +95,7 @@ nmt_newt_textbox_set_text(NmtNewtTextbox *textbox, const char *text)
             priv->width = width;
     }
     g_free(lines);
-    priv->height = NM_MIN(i, 1);
+    priv->height = NM_MAX(i, 1);
 
     g_object_notify(G_OBJECT(textbox), "text");
     nmt_newt_widget_needs_rebuild(NMT_NEWT_WIDGET(textbox));
diff --git a/src/libnmt-newt/nmt-newt-utils.c b/src/libnmt-newt/nmt-newt-utils.c
index 36a47b2b..1864b4a4 100644
--- a/src/libnmt-newt/nmt-newt-utils.c
+++ b/src/libnmt-newt/nmt-newt-utils.c
@@ -17,6 +17,7 @@
 #include <sys/wait.h>
 
 #include "libnm-glib-aux/nm-io-utils.h"
+#include "libnm-glib-aux/nm-str-buf.h"
 
 static void
 nmt_newt_dialog_g_log_handler(const char    *log_domain,
@@ -387,6 +388,44 @@ nmt_newt_text_width(const char *str)
 }
 
 /**
+ * nmt_newt_text_truncate
+ * @str: a UTF-8 string
+ * @max_width: the maximum width in terminal columns
+ *
+ * Truncates @str to at most @max_width columns, appending an ellipsis if
+ * anything was dropped (the ellipsis is counted in @max_width).
+ *
+ * Returns: (transfer full): a newly-allocated truncated copy of @str.
+ */
+char *
+nmt_newt_text_truncate(const char *str, int max_width)
+{
+    nm_auto_str_buf NMStrBuf buf = NM_STR_BUF_INIT(0, FALSE);
+    const char              *p;
+    int                      width = 0;
+
+    if (max_width <= 0)
+        return g_strdup("");
+    if (nmt_newt_text_width(str) <= max_width)
+        return g_strdup(str);
+
+    max_width--; /* reserve one column for the ellipsis */
+
+    for (p = str; *p; p = g_utf8_next_char(p)) {
+        gunichar ch = g_utf8_get_char(p);
+        int      w  = g_unichar_iszerowidth(ch) ? 0 : (g_unichar_iswide(ch) ? 2 : 1);
+
+        if (width + w > max_width)
+            break;
+        width += w;
+        nm_str_buf_append_len(&buf, p, g_utf8_next_char(p) - p);
+    }
+    nm_str_buf_append(&buf, "\xe2\x80\xa6"); /* U+2026 HORIZONTAL ELLIPSIS */
+
+    return nm_str_buf_dup_str(&buf);
+}
+
+/**
  * nmt_newt_edit_string:
  * @data: data to edit
  *
diff --git a/src/libnmt-newt/nmt-newt-utils.h b/src/libnmt-newt/nmt-newt-utils.h
index 04089f9f..32237ae2 100644
--- a/src/libnmt-newt/nmt-newt-utils.h
+++ b/src/libnmt-newt/nmt-newt-utils.h
@@ -23,6 +23,8 @@ char *nmt_newt_locale_from_utf8(const char *str_utf8);
 
 int nmt_newt_text_width(const char *str);
 
+char *nmt_newt_text_truncate(const char *str, int max_width);
+
 void nmt_newt_message_dialog(const char *message, ...) _nm_printf(1, 2);
 int  nmt_newt_choice_dialog(const char *button1, const char *button2, const char *message, ...)
     _nm_printf(3, 4);
diff --git a/src/meson.build b/src/meson.build
index 7c020809..4c9f4734 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -123,6 +123,7 @@ if enable_tests
   subdir('libnm-core-impl/tests')
   subdir('libnm-client-impl/tests')
   subdir('libnm-client-aux-extern/tests')
+  subdir('libnmc-base/tests')
   subdir('libnmc-setting/tests')
   subdir('nm-dispatcher/tests')
   subdir('nm-initrd-generator/tests')
diff --git a/src/n-acd/src/n-acd.c b/src/n-acd/src/n-acd.c
index 9bc32244..402f00c2 100644
--- a/src/n-acd/src/n-acd.c
+++ b/src/n-acd/src/n-acd.c
@@ -366,14 +366,17 @@ _c_public_ int n_acd_new(NAcd **acdp, NAcdConfig *config) {
 
         acd->max_bpf_map = 8;
 
-        /* Let's try to create a BPF map. If we fail, we want to ignore it
-         * only if we lack permissions to create it, and proceed without eBPF. */
+        /* Let's try to create a BPF map. If we fail, we want to ignore it and
+         * proceed without eBPF when we lack permissions to create it (-EPERM)
+         * or the bpf() syscall is unavailable (-ENOSYS), e.g. blocked by a
+         * seccomp policy or missing from the kernel. Other errors signal a real
+         * bpf problem and stay fatal. */
         r = n_acd_bpf_map_create(&acd->fd_bpf_map, acd->max_bpf_map);
         if (r == 0) {
                 r = n_acd_bpf_compile(&fd_bpf_prog, acd->fd_bpf_map, (struct ether_addr*) acd->mac);
                 if (r)
                         return r;
-        } else if (r != -EPERM) {
+        } else if (r != -EPERM && r != -ENOSYS) {
                 return r;
         }
 
diff --git a/src/n-dhcp4/src/n-dhcp4-c-connection.c b/src/n-dhcp4/src/n-dhcp4-c-connection.c
index 707c6604..6a3216f3 100644
--- a/src/n-dhcp4/src/n-dhcp4-c-connection.c
+++ b/src/n-dhcp4/src/n-dhcp4-c-connection.c
@@ -430,7 +430,8 @@ static int n_dhcp4_c_connection_udp_send(NDhcp4CConnection *connection,
 }
 
 static void n_dhcp4_c_connection_init_header(NDhcp4CConnection *connection,
-                                             NDhcp4Header *header) {
+                                             NDhcp4Header *header,
+                                             uint8_t type) {
         bool broadcast = connection->client_config->request_broadcast;
 
         header->op = N_DHCP4_OP_BOOTREQUEST;
@@ -455,22 +456,37 @@ static void n_dhcp4_c_connection_init_header(NDhcp4CConnection *connection,
                 break;
         }
 
-        if (connection->client_ip != INADDR_ANY) {
+        /*
+         * Set ciaddr according to RFC2131 section 4:
+         * - must be zero for initial messages (DISCOVER, SELECT)
+         * - must be zero for REBOOT and DECLINE
+         * - must be client's IP for all other messages (RENEW, REBIND, RELEASE, INFORM)
+         */
+        switch (type) {
+        case N_DHCP4_C_MESSAGE_DISCOVER:    /* 4.4.1 - must be zero */
+        case N_DHCP4_C_MESSAGE_SELECT:      /* 4.3.2 - must be zero in SELECTING */
+        case N_DHCP4_C_MESSAGE_REBOOT:      /* 4.3.2 - must be zero in INIT-REBOOT */
+        case N_DHCP4_C_MESSAGE_DECLINE:     /* 4.4   - must be zero per RFC2131 table */
+                header->ciaddr = INADDR_ANY;
+                break;
+        default:
+                /* All other message types must use client's current IP */
                 header->ciaddr = connection->client_ip;
-        } else {
-                /*
-                 * When the IP stack has not been configured, we may
-                 * not be able to receive unicast packets, depending
-                 * on the hardware. If that is the case we must request
-                 * replies from the server to be broadcast.
-                 *
-                 * Once the IP stack has been configured, receiving
-                 * unicast packets is never a problem, so the broadcast
-                 * flag should not be set.
-                 */
-                if (broadcast)
-                        header->flags |= N_DHCP4_MESSAGE_FLAG_BROADCAST;
+                break;
         }
+
+        /*
+         * When the IP stack has not been configured, we may
+         * not be able to receive unicast packets, depending
+         * on the hardware. If that is the case we must request
+         * replies from the server to be broadcast.
+         *
+         * Once the IP stack has been configured, receiving
+         * unicast packets is never a problem, so the broadcast
+         * flag should not be set.
+         */
+        if (connection->client_ip == INADDR_ANY && broadcast)
+                header->flags |= N_DHCP4_MESSAGE_FLAG_BROADCAST;
 }
 
 static int n_dhcp4_c_connection_new_message(NDhcp4CConnection *connection,
@@ -535,7 +551,7 @@ static int n_dhcp4_c_connection_new_message(NDhcp4CConnection *connection,
                 return r;
 
         header = n_dhcp4_outgoing_get_header(message);
-        n_dhcp4_c_connection_init_header(connection, header);
+        n_dhcp4_c_connection_init_header(connection, header, type);
 
         message->userdata.type = type;
         message->userdata.message_type = message_type;
diff --git a/src/n-dhcp4/src/util/packet.c b/src/n-dhcp4/src/util/packet.c
index cbf09c06..21f4ce4d 100644
--- a/src/n-dhcp4/src/util/packet.c
+++ b/src/n-dhcp4/src/util/packet.c
@@ -241,7 +241,7 @@ int packet_sendto_udp(int sockfd,
 }
 
 /**
- * packet_recvfrom_upd() - receive UDP packet from AF_PACKET socket
+ * packet_recvfrom_udp() - receive UDP packet from AF_PACKET socket
  * @sockfd:             AF_PACKET/SOCK_DGRAM socket
  * @buf:                buffor for payload
  * @n_buf:              max length of payload in bytes
@@ -373,6 +373,12 @@ int packet_recvfrom_udp(int sockfd,
                  * packet, so discard it entirely.
                  */
                 return 0;
+        } else if (ntohs(udp_hdr.len) < sizeof(struct udphdr)) {
+                /*
+                 * The UDP length field is smaller than the UDP header it is
+                 * supposed to count, so discard it entirely.
+                 */
+                return 0;
         }
 
         /*
diff --git a/src/n-dhcp4/src/util/test-packet.c b/src/n-dhcp4/src/util/test-packet.c
index 44dbc300..b66c87d7 100644
--- a/src/n-dhcp4/src/util/test-packet.c
+++ b/src/n-dhcp4/src/util/test-packet.c
@@ -7,6 +7,7 @@
 #include <c-stdaux.h>
 #include <errno.h>
 #include <net/if_arp.h>
+#include <netinet/udp.h>
 #include <stdlib.h>
 #include <string.h>
 #include "n-dhcp4-private.h"
@@ -322,6 +323,119 @@ static void test_shutdown(Link *link_src,
         link_del_ip4(link_src, &paddr_src->sin_addr, 8);
 }
 
+/*
+ * @udp_len:     value to write into the UDP length field
+ * @payload_len: bytes of UDP payload actually sent
+ * @udp_check:   UDP checksum field (non-zero exercises the checksum gate)
+ * @expect_drop: whether packet_recvfrom_udp() must discard the packet
+ */
+struct udp_len_case {
+        uint16_t udp_len;
+        size_t   payload_len;
+        uint16_t udp_check;
+        bool     expect_drop;
+};
+
+static void test_udp_packet_len_one(Link *link_src,
+                                    Link *link_dst,
+                                    const struct sockaddr_in *paddr_src,
+                                    const struct sockaddr_in *paddr_dst,
+                                    const struct udp_len_case *tc) {
+        _c_cleanup_(c_closep) int sk_src = -1, sk_dst = -1;
+        struct sockaddr_ll addr = {
+                .sll_family = AF_PACKET,
+                .sll_protocol = htons(ETH_P_IP),
+                .sll_ifindex = link_src->ifindex,
+                .sll_halen = ETH_ALEN,
+        };
+        struct {
+                struct iphdr ip;
+                struct udphdr udp;
+                uint8_t payload[8];
+        } _c_packed_ frame = {};
+        size_t frame_len = sizeof(frame.ip) + sizeof(frame.udp) + tc->payload_len;
+        uint16_t accept_sentinel = 0xffff;
+        struct sockaddr_in src = { .sin_port = accept_sentinel };
+        uint8_t buf[1024];
+        size_t len;
+        ssize_t slen;
+        int r;
+
+        c_assert(tc->payload_len <= sizeof(frame.payload));
+
+        link_socket(link_src, &sk_src, AF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC);
+        test_new_packet_socket(link_dst, &sk_dst);
+
+        memcpy(addr.sll_addr, &link_dst->mac, ETH_ALEN);
+
+        frame.ip.version  = IPVERSION;
+        frame.ip.ihl      = 5;
+        frame.ip.tot_len  = htons(frame_len);
+        frame.ip.ttl      = 64;
+        frame.ip.protocol = IPPROTO_UDP;
+        frame.ip.saddr    = paddr_src->sin_addr.s_addr;
+        frame.ip.daddr    = paddr_dst->sin_addr.s_addr;
+        frame.ip.check    = packet_internet_checksum((uint8_t *)&frame.ip,
+                                                     sizeof(frame.ip));
+
+        frame.udp.source  = paddr_src->sin_port;
+        frame.udp.dest    = paddr_dst->sin_port;
+        frame.udp.len     = htons(tc->udp_len);
+        frame.udp.check   = tc->udp_check;
+
+        slen = sendto(sk_src, &frame, frame_len, 0,
+                      (struct sockaddr *)&addr, sizeof(addr));
+        c_assert(slen == (ssize_t)frame_len);
+
+        /*
+         * packet_recvfrom_udp() fills @src only when it accepts the packet.
+         * A zero-payload accept and a drop both report a zero length, so the
+         * sentinel sin_port is what tells them apart: it survives a drop and
+         * is overwritten with the source port on accept.
+         */
+        r = packet_recvfrom_udp(sk_dst, buf, sizeof(buf), &len, &src);
+        c_assert(!r);
+        if (tc->expect_drop) {
+                c_assert(len == 0);
+                c_assert(src.sin_port == accept_sentinel);
+        } else {
+                c_assert(len == tc->payload_len);
+                c_assert(src.sin_port == frame.udp.source);
+        }
+}
+
+/*
+ * Regression test: a UDP packet whose udp.len is shorter than the 8-byte
+ * UDP header underflows the payload-length computation in
+ * packet_recvfrom_udp() and triggers an out-of-bounds read. Sampled lengths
+ * from the underflowing range (0, 1, and the top value 7) must be discarded
+ * whether or not the packet carries a UDP checksum, while the zero-payload
+ * udp.len == sizeof(struct udphdr) boundary and a header+payload packet must
+ * still be accepted.
+ */
+static void test_udp_packet_short_len(Link *link_src,
+                                      Link *link_dst,
+                                      const struct sockaddr_in *paddr_src,
+                                      const struct sockaddr_in *paddr_dst) {
+        static const struct udp_len_case cases[] = {
+                /* malformed, with a UDP checksum: an unguarded parser reaches the read */
+                { .udp_len = 0,                         .udp_check = 1, .expect_drop = true },
+                { .udp_len = 1,                         .udp_check = 1, .expect_drop = true },
+                { .udp_len = sizeof(struct udphdr) - 1, .udp_check = 1, .expect_drop = true },
+                /* malformed, without a UDP checksum: the checksum gate is skipped */
+                { .udp_len = 0,                         .udp_check = 0, .expect_drop = true },
+                { .udp_len = 1,                         .udp_check = 0, .expect_drop = true },
+                { .udp_len = sizeof(struct udphdr) - 1, .udp_check = 0, .expect_drop = true },
+                /* valid: the zero-payload boundary pins the check to '<' */
+                { .udp_len = sizeof(struct udphdr),     .expect_drop = false },
+                /* valid: header plus payload */
+                { .udp_len = sizeof(struct udphdr) + 4, .payload_len = 4, .expect_drop = false },
+        };
+
+        for (size_t i = 0; i < sizeof(cases) / sizeof(cases[0]); ++i)
+                test_udp_packet_len_one(link_src, link_dst, paddr_src, paddr_dst, &cases[i]);
+}
+
 static void test_ip_hdr(Link *link_src,
                         Link *link_dst,
                         const struct sockaddr_in *paddr_src,
@@ -393,6 +507,7 @@ static void test_packet(void) {
         test_packet_packet(&link_src, &link_dst, &paddr_src, &paddr_dst);
         test_packet_udp(&link_src, &link_dst, &paddr_src, &paddr_dst);
         test_udp_packet(&link_src, &link_dst, &paddr_src, &paddr_dst);
+        test_udp_packet_short_len(&link_src, &link_dst, &paddr_src, &paddr_dst);
         test_udp_udp(&link_src, &link_dst, &paddr_src, &paddr_dst);
 
         /* behavior tests */
diff --git a/src/nm-initrd-generator/meson.build b/src/nm-initrd-generator/meson.build
index 6b02e066..2315ebe4 100644
--- a/src/nm-initrd-generator/meson.build
+++ b/src/nm-initrd-generator/meson.build
@@ -46,3 +46,10 @@ executable(
   install: true,
   install_dir: nm_libexecdir,
 )
+
+if install_systemdgeneratordir
+  install_data(
+    'nm-initrd-generator.sh',
+    install_dir: systemd_systemdsystemgeneratordir,
+  )
+endif
diff --git a/src/nm-initrd-generator/nm-initrd-generator.sh b/src/nm-initrd-generator/nm-initrd-generator.sh
new file mode 100755
index 00000000..20ff78cc
--- /dev/null
+++ b/src/nm-initrd-generator/nm-initrd-generator.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+# initrd-specific units
+initrd_units=(
+    NetworkManager-config-initrd.service
+    NetworkManager-initrd.service
+    NetworkManager-wait-online-initrd.service
+)
+
+# host-specific units
+host_units=(
+    NetworkManager.service
+    NetworkManager-dispatcher.service
+    NetworkManager-wait-online.service
+)
+
+# Get generator normal directory
+normal_dir=$1
+
+# Since NetworkManager-initrd.service and NetworkManager.service are allocated
+# for the same bus name org.freedesktop.NetworkManager, we should mask one of
+# them depending on if we are in the initrd or on the host.
+if [ "$SYSTEMD_IN_INITRD" != 1 ]; then
+    # Mask initrd units in the host
+    for unit in "${initrd_units[@]}"; do
+        ln -s /dev/null "$normal_dir"/"$unit" 2> /dev/null
+    done
+    # Nothing else to do
+    exit 0
+fi
+
+# Mask host units in the initrd
+for unit in "${host_units[@]}"; do
+    ln -s /dev/null "$normal_dir"/"$unit" 2> /dev/null
+done
+
+# Install initrd units in the unit file hierarchy
+mkdir -p "$normal_dir"/initrd.target.wants
+mkdir -p "$normal_dir"/network-online.target.wants
+for unit in "${initrd_units[@]}"; do
+    ln -s /usr/lib/systemd/system/"$unit" \
+        "$normal_dir"/initrd.target.wants/"$unit"
+    if [ "$unit" = "NetworkManager-wait-online-initrd.service" ]; then
+        ln -s /usr/lib/systemd/system/"$unit" \
+            "$normal_dir"/network-online.target.wants/"$unit"
+    fi
+done
+
+exit 0
diff --git a/src/nm-initrd-generator/nmi-cmdline-reader.c b/src/nm-initrd-generator/nmi-cmdline-reader.c
index f9b0fa16..5d91d157 100644
--- a/src/nm-initrd-generator/nmi-cmdline-reader.c
+++ b/src/nm-initrd-generator/nmi-cmdline-reader.c
@@ -409,7 +409,7 @@ reader_read_all_connections_from_fw(Reader *reader, const char *sysfs_dir)
 
         if (!nmi_ibft_update_connection_from_nic(connection, nic, &error)) {
             _LOGW(LOGD_CORE, "Unable to merge iBFT configuration: %s", error->message);
-            g_error_free(error);
+            g_clear_error(&error);
             continue;
         }
 
diff --git a/src/nmcli/common.c b/src/nmcli/common.c
index 15a7927b..5940f2f0 100644
--- a/src/nmcli/common.c
+++ b/src/nmcli/common.c
@@ -156,6 +156,11 @@ _metagen_ip4_config_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
             return NULL;
         arrc = nm_ip_config_get_wins_servers(cfg4);
         goto arrc_out;
+    case NMC_GENERIC_INFO_TYPE_IP4_CONFIG_CLAT_ADDRESS:
+        *out_flags |= NM_META_ACCESSOR_GET_OUT_FLAGS_HIDE;
+        str = nm_ip_config_get_clat_address(cfg4);
+        NM_SET_OUT(out_is_default, !str);
+        return str;
     default:
         break;
     }
@@ -184,6 +189,7 @@ const NmcMetaGenericInfo *const metagen_ip4_config[_NMC_GENERIC_INFO_TYPE_IP4_CO
     _METAGEN_IP4_CONFIG(NMC_GENERIC_INFO_TYPE_IP4_CONFIG_DOMAIN, "DOMAIN"),
     _METAGEN_IP4_CONFIG(NMC_GENERIC_INFO_TYPE_IP4_CONFIG_SEARCHES, "SEARCHES"),
     _METAGEN_IP4_CONFIG(NMC_GENERIC_INFO_TYPE_IP4_CONFIG_WINS, "WINS"),
+    _METAGEN_IP4_CONFIG(NMC_GENERIC_INFO_TYPE_IP4_CONFIG_CLAT_ADDRESS, "CLAT-ADDRESS"),
 };
 
 /*****************************************************************************/
@@ -245,6 +251,16 @@ _metagen_ip6_config_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
             return NULL;
         arrc = nm_ip_config_get_searches(cfg6);
         goto arrc_out;
+    case NMC_GENERIC_INFO_TYPE_IP6_CONFIG_CLAT_ADDRESS:
+        *out_flags |= NM_META_ACCESSOR_GET_OUT_FLAGS_HIDE;
+        str = nm_ip_config_get_clat_address(cfg6);
+        NM_SET_OUT(out_is_default, !str);
+        return str;
+    case NMC_GENERIC_INFO_TYPE_IP6_CONFIG_CLAT_PREF64:
+        *out_flags |= NM_META_ACCESSOR_GET_OUT_FLAGS_HIDE;
+        str = nm_ip_config_get_clat_pref64(cfg6);
+        NM_SET_OUT(out_is_default, !str);
+        return str;
     default:
         break;
     }
@@ -272,6 +288,8 @@ const NmcMetaGenericInfo *const metagen_ip6_config[_NMC_GENERIC_INFO_TYPE_IP6_CO
     _METAGEN_IP6_CONFIG(NMC_GENERIC_INFO_TYPE_IP6_CONFIG_DNS, "DNS"),
     _METAGEN_IP6_CONFIG(NMC_GENERIC_INFO_TYPE_IP6_CONFIG_DOMAIN, "DOMAIN"),
     _METAGEN_IP6_CONFIG(NMC_GENERIC_INFO_TYPE_IP6_CONFIG_SEARCHES, "SEARCHES"),
+    _METAGEN_IP6_CONFIG(NMC_GENERIC_INFO_TYPE_IP6_CONFIG_CLAT_ADDRESS, "CLAT-ADDRESS"),
+    _METAGEN_IP6_CONFIG(NMC_GENERIC_INFO_TYPE_IP6_CONFIG_CLAT_PREF64, "CLAT-PREF64"),
 };
 
 /*****************************************************************************/
diff --git a/src/nmcli/connections.c b/src/nmcli/connections.c
index a3b03efe..6f0356c5 100644
--- a/src/nmcli/connections.c
+++ b/src/nmcli/connections.c
@@ -818,8 +818,11 @@ _metagen_con_show_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
 }
 
 const NmcMetaGenericInfo *const metagen_con_show[_NMC_GENERIC_INFO_TYPE_CON_SHOW_NUM + 1] = {
-#define _METAGEN_CON_SHOW(type, name) \
-    [type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_con_show_get_fcn)
+#define _METAGEN_CON_SHOW(type, name, ...)                            \
+    [type] = NMC_META_GENERIC(name,                                   \
+                              .info_type = type,                      \
+                              .get_fcn   = _metagen_con_show_get_fcn, \
+                              __VA_ARGS__)
     _METAGEN_CON_SHOW(NMC_GENERIC_INFO_TYPE_CON_SHOW_NAME, "NAME"),
     _METAGEN_CON_SHOW(NMC_GENERIC_INFO_TYPE_CON_SHOW_UUID, "UUID"),
     _METAGEN_CON_SHOW(NMC_GENERIC_INFO_TYPE_CON_SHOW_TYPE, "TYPE"),
@@ -833,7 +836,7 @@ const NmcMetaGenericInfo *const metagen_con_show[_NMC_GENERIC_INFO_TYPE_CON_SHOW
     _METAGEN_CON_SHOW(NMC_GENERIC_INFO_TYPE_CON_SHOW_DEVICE, "DEVICE"),
     _METAGEN_CON_SHOW(NMC_GENERIC_INFO_TYPE_CON_SHOW_STATE, "STATE"),
     _METAGEN_CON_SHOW(NMC_GENERIC_INFO_TYPE_CON_SHOW_ACTIVE_PATH, "ACTIVE-PATH"),
-    _METAGEN_CON_SHOW(NMC_GENERIC_INFO_TYPE_CON_SHOW_PORT, "SLAVE"),
+    _METAGEN_CON_SHOW(NMC_GENERIC_INFO_TYPE_CON_SHOW_PORT, "PORT", .alias = "SLAVE"),
     _METAGEN_CON_SHOW(NMC_GENERIC_INFO_TYPE_CON_SHOW_FILENAME, "FILENAME"),
 };
 #define NMC_FIELDS_CON_SHOW_COMMON "NAME,UUID,TYPE,DEVICE"
@@ -920,6 +923,7 @@ _metagen_con_active_general_get_fcn(NMC_META_GENERIC_INFO_GET_FCN_ARGS)
          * but the settings-connection profile. There is no guarantee, that they agree. */
         return s_con ? nm_setting_connection_get_zone(s_con) : NULL;
     case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_CONTROLLER_PATH:
+    case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_MASTER_PATH:
         dev = nm_active_connection_get_controller(ac);
         return dev ? nm_object_get_path(NM_OBJECT(dev)) : NULL;
     default:
@@ -949,6 +953,8 @@ const NmcMetaGenericInfo
         _METAGEN_CON_ACTIVE_GENERAL(NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_CON_PATH, "CON-PATH"),
         _METAGEN_CON_ACTIVE_GENERAL(NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_ZONE, "ZONE"),
         _METAGEN_CON_ACTIVE_GENERAL(NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_CONTROLLER_PATH,
+                                    "CONTROLLER-PATH"),
+        _METAGEN_CON_ACTIVE_GENERAL(NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_MASTER_PATH,
                                     "MASTER-PATH"),
 };
 
@@ -5645,6 +5651,7 @@ connection_warnings(NmCli *nmc, NMConnection *connection)
     guint            i, found;
     const char      *id;
     const char      *deprecated;
+    gs_free char    *gw_warning = NULL;
 
     deprecated = nmc_connection_check_deprecated(NM_CONNECTION(connection));
     if (deprecated)
@@ -5673,6 +5680,10 @@ connection_warnings(NmCli *nmc, NMConnection *connection)
                      nm_connection_get_uuid(NM_CONNECTION(connection)),
                      found);
     }
+
+    gw_warning = nm_connection_get_unreachable_gateways_warning(connection, TRUE);
+    if (gw_warning)
+        nmc_printerr("Warning: %s.\n", gw_warning);
 }
 
 static void
diff --git a/src/nmcli/devices.c b/src/nmcli/devices.c
index 2787439e..bc24bcde 100644
--- a/src/nmcli/devices.c
+++ b/src/nmcli/devices.c
@@ -732,21 +732,22 @@ const NmcMetaGenericInfo *const nmc_fields_dev_wifi_list[] = {
     NMC_META_GENERIC("BSSID"),     /* 3 */
     NMC_META_GENERIC("MODE"),      /* 4 */
     NMC_META_GENERIC("CHAN"),      /* 5 */
-    NMC_META_GENERIC("FREQ"),      /* 6 */
-    NMC_META_GENERIC("RATE"),      /* 7 */
-    NMC_META_GENERIC("BANDWIDTH"), /* 8 */
-    NMC_META_GENERIC("SIGNAL"),    /* 9 */
-    NMC_META_GENERIC("BARS"),      /* 10 */
-    NMC_META_GENERIC("SECURITY"),  /* 11 */
-    NMC_META_GENERIC("WPA-FLAGS"), /* 12 */
-    NMC_META_GENERIC("RSN-FLAGS"), /* 13 */
-    NMC_META_GENERIC("DEVICE"),    /* 14 */
-    NMC_META_GENERIC("ACTIVE"),    /* 15 */
-    NMC_META_GENERIC("IN-USE"),    /* 16 */
-    NMC_META_GENERIC("DBUS-PATH"), /* 17 */
+    NMC_META_GENERIC("BAND"),      /* 6 */
+    NMC_META_GENERIC("FREQ"),      /* 7 */
+    NMC_META_GENERIC("RATE"),      /* 8 */
+    NMC_META_GENERIC("BANDWIDTH"), /* 9 */
+    NMC_META_GENERIC("SIGNAL"),    /* 10 */
+    NMC_META_GENERIC("BARS"),      /* 11 */
+    NMC_META_GENERIC("SECURITY"),  /* 12 */
+    NMC_META_GENERIC("WPA-FLAGS"), /* 13 */
+    NMC_META_GENERIC("RSN-FLAGS"), /* 14 */
+    NMC_META_GENERIC("DEVICE"),    /* 15 */
+    NMC_META_GENERIC("ACTIVE"),    /* 16 */
+    NMC_META_GENERIC("IN-USE"),    /* 17 */
+    NMC_META_GENERIC("DBUS-PATH"), /* 18 */
     NULL,
 };
-#define NMC_FIELDS_DEV_WIFI_LIST_COMMON       "IN-USE,BSSID,SSID,MODE,CHAN,RATE,SIGNAL,BARS,SECURITY"
+#define NMC_FIELDS_DEV_WIFI_LIST_COMMON       "IN-USE,BSSID,SSID,MODE,BAND,CHAN,RATE,SIGNAL,BARS,SECURITY"
 #define NMC_FIELDS_DEV_WIFI_LIST_FOR_DEV_LIST "NAME," NMC_FIELDS_DEV_WIFI_LIST_COMMON
 
 const NmcMetaGenericInfo *const nmc_fields_dev_wimax_list[] = {
@@ -765,17 +766,19 @@ const NmcMetaGenericInfo *const nmc_fields_dev_wimax_list[] = {
 const NmcMetaGenericInfo *const nmc_fields_dev_show_controller_prop[] = {
     NMC_META_GENERIC("NAME"),   /* 0 */
     NMC_META_GENERIC("SLAVES"), /* 1 */
+    NMC_META_GENERIC("PORTS"),  /* 2 */
     NULL,
 };
-#define NMC_FIELDS_DEV_SHOW_CONTROLLER_PROP_COMMON "NAME,SLAVES"
+#define NMC_FIELDS_DEV_SHOW_CONTROLLER_PROP_COMMON "NAME,SLAVES,PORTS"
 
 const NmcMetaGenericInfo *const nmc_fields_dev_show_team_prop[] = {
     NMC_META_GENERIC("NAME"),   /* 0 */
     NMC_META_GENERIC("SLAVES"), /* 1 */
-    NMC_META_GENERIC("CONFIG"), /* 2 */
+    NMC_META_GENERIC("PORTS"),  /* 2 */
+    NMC_META_GENERIC("CONFIG"), /* 3 */
     NULL,
 };
-#define NMC_FIELDS_DEV_SHOW_TEAM_PROP_COMMON "NAME,SLAVES,CONFIG"
+#define NMC_FIELDS_DEV_SHOW_TEAM_PROP_COMMON "NAME,SLAVES,PORTS,CONFIG"
 
 const NmcMetaGenericInfo *const nmc_fields_dev_show_vlan_prop[] = {
     NMC_META_GENERIC("NAME"),   /* 0 */
@@ -867,7 +870,7 @@ usage(void)
           "<ifname>]\n"
           "                         [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
           "yes|no]\n\n"
-          "  wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>] [band a|bg] "
+          "  wifi hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>] [band a|bg|6GHz] "
           "[channel <channel>] [password <password>]\n\n"
           "  wifi rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n\n"
           "  wifi show-password [ifname <ifname>]\n\n"
@@ -1023,7 +1026,7 @@ usage_device_wifi(void)
           "It is also assumed that IP configuration is obtained via DHCP.\n"
           "\n"
           "ARGUMENTS := hotspot [ifname <ifname>] [con-name <name>] [ssid <SSID>]\n"
-          "                     [band a|bg] [channel <channel>] [password <password>]\n"
+          "                     [band a|bg|6GHz] [channel <channel>] [password <password>]\n"
           "\n"
           "Create a Wi-Fi hotspot. Use 'connection down' or 'device disconnect'\n"
           "to stop the hotspot.\n"
@@ -1325,6 +1328,7 @@ fill_output_access_point(NMAccessPoint *ap, const APInfo *info)
     const char            *bssid;
     NM80211Mode            mode;
     char                  *channel_str;
+    const char            *band_str;
     char                  *freq_str;
     char                  *ssid_str     = NULL;
     char                  *ssid_hex_str = NULL;
@@ -1369,6 +1373,22 @@ fill_output_access_point(NMAccessPoint *ap, const APInfo *info)
     rsn_flags_str = ap_wpa_rsn_flags_to_string(rsn_flags, NM_META_ACCESSOR_GET_TYPE_PRETTY);
     sig_bars      = nmc_wifi_strength_bars(strength);
 
+    switch (nm_utils_wifi_freq_to_band(freq)) {
+    case NM_WIFI_BAND_2_4_GHZ:
+        band_str = _("2.4 GHz");
+        break;
+    case NM_WIFI_BAND_5_GHZ:
+        band_str = _("5 GHz");
+        break;
+    case NM_WIFI_BAND_6_GHZ:
+        band_str = _("6 GHz");
+        break;
+    default:
+    case NM_WIFI_BAND_UNKNOWN:
+        band_str = "";
+        break;
+    }
+
     security_str = g_string_new(NULL);
 
     if (_ap_is_wep(ap)) {
@@ -1417,18 +1437,19 @@ fill_output_access_point(NMAccessPoint *ap, const APInfo *info)
                  : mode == NM_802_11_MODE_MESH  ? _("Mesh")
                                                 : _("N/A"));
     set_val_str(arr, 5, channel_str);
-    set_val_str(arr, 6, freq_str);
-    set_val_str(arr, 7, bitrate_str);
-    set_val_str(arr, 8, bandwidth_str);
-    set_val_str(arr, 9, strength_str);
-    set_val_strc(arr, 10, sig_bars);
-    set_val_str(arr, 11, g_string_free(security_str, FALSE));
-    set_val_str(arr, 12, wpa_flags_str);
-    set_val_str(arr, 13, rsn_flags_str);
-    set_val_strc(arr, 14, info->device);
-    set_val_strc(arr, 15, active ? _("yes") : _("no"));
-    set_val_strc(arr, 16, active ? "*" : " ");
-    set_val_strc(arr, 17, nm_object_get_path(NM_OBJECT(ap)));
+    set_val_strc(arr, 6, band_str);
+    set_val_str(arr, 7, freq_str);
+    set_val_str(arr, 8, bitrate_str);
+    set_val_str(arr, 9, bandwidth_str);
+    set_val_str(arr, 10, strength_str);
+    set_val_strc(arr, 11, sig_bars);
+    set_val_str(arr, 12, g_string_free(security_str, FALSE));
+    set_val_str(arr, 13, wpa_flags_str);
+    set_val_str(arr, 14, rsn_flags_str);
+    set_val_strc(arr, 15, info->device);
+    set_val_strc(arr, 16, active ? _("yes") : _("no"));
+    set_val_strc(arr, 17, active ? "*" : " ");
+    set_val_strc(arr, 18, nm_object_get_path(NM_OBJECT(ap)));
 
     /* Set colors */
     color = wifi_signal_to_color(strength);
@@ -1520,7 +1541,8 @@ print_bond_bridge_info(NMDevice   *device,
 
     arr = nmc_dup_fields_array(tmpl, NMC_OF_FLAG_SECTION_PREFIX);
     set_val_strc(arr, 0, group_prefix); /* i.e. BOND, TEAM, BRIDGE */
-    set_val_str(arr, 1, g_string_free(ports_str, FALSE));
+    set_val_str(arr, 1, g_strdup(ports_str->str));
+    set_val_str(arr, 2, g_string_free(ports_str, FALSE));
     g_ptr_array_add(out.output_data, arr);
 
     print_data_prepare_width(out.output_data);
@@ -1583,8 +1605,9 @@ print_team_info(NMDevice *device, NmCli *nmc, const char *group_prefix, const ch
 
     arr = nmc_dup_fields_array(tmpl, NMC_OF_FLAG_SECTION_PREFIX);
     set_val_strc(arr, 0, group_prefix); /* TEAM */
-    set_val_str(arr, 1, g_string_free(ports_str, FALSE));
-    set_val_str(arr, 2, sanitize_team_config(nm_device_team_get_config(NM_DEVICE_TEAM(device))));
+    set_val_str(arr, 1, g_strdup(ports_str->str));
+    set_val_str(arr, 2, g_string_free(ports_str, FALSE));
+    set_val_str(arr, 3, sanitize_team_config(nm_device_team_get_config(NM_DEVICE_TEAM(device))));
     g_ptr_array_add(out.output_data, arr);
 
     print_data_prepare_width(out.output_data);
@@ -4571,10 +4594,11 @@ do_device_wifi_hotspot(const NMCCommand *cmd, NmCli *nmc, int argc, const char *
             }
             band = *argv;
             if (argc == 1 && nmc->complete)
-                nmc_complete_strings(band, "a", "bg");
-            if (strcmp(band, "a") && strcmp(band, "bg")) {
+                nmc_complete_strings(band, "a", "bg", "6GHz");
+            if (!NM_IN_STRSET(band, "a", "bg", "6GHz")) {
                 g_string_printf(nmc->return_text,
-                                _("Error: band argument value '%s' is invalid; use 'a' or 'bg'."),
+                                _("Error: band argument value '%s' is invalid; use 'a', 'bg' "
+                                  "or '6GHz'."),
                                 band);
                 nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
                 return;
@@ -4622,7 +4646,7 @@ do_device_wifi_hotspot(const NMCCommand *cmd, NmCli *nmc, int argc, const char *
             nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
             return;
         }
-        if (!nmc_string_to_uint(channel, TRUE, 1, 5825, &value)
+        if (!nmc_string_to_uint(channel, TRUE, 1, G_MAXUINT32, &value)
             || !nm_utils_wifi_is_channel_valid(value, band)) {
             g_string_printf(nmc->return_text,
                             _("Error: channel '%s' not valid for band '%s'."),
@@ -4810,44 +4834,15 @@ do_device_wifi_rescan(const NMCCommand *cmd, NmCli *nmc, int argc, const char *c
 }
 
 static void
-string_append_mecard(GString *string, const char *tag, const char *text)
-{
-    const char *p;
-    bool        is_hex = TRUE;
-    int         start;
-
-    if (!text)
-        return;
-
-    g_string_append(string, tag);
-    start = string->len;
-
-    for (p = text; *p; p++) {
-        if (!g_ascii_isxdigit(*p))
-            is_hex = FALSE;
-        if (strchr("\\\":;,", *p))
-            g_string_append_c(string, '\\');
-        g_string_append_c(string, *p);
-    }
-
-    if (is_hex) {
-        g_string_insert_c(string, start, '\"');
-        g_string_append_c(string, '\"');
-    }
-    g_string_append_c(string, ';');
-}
-
-static void
 print_wifi_connection(const NmcConfig *nmc_config, NMConnection *connection)
 {
-    NMSettingWireless            *s_wireless;
-    NMSettingWirelessSecurity    *s_wsec;
-    const char                   *key_mgmt = NULL;
-    const char                   *psk      = NULL;
-    const char                   *type     = NULL;
-    GBytes                       *ssid_bytes;
-    gs_free char                 *ssid   = NULL;
-    nm_auto_free_gstring GString *string = NULL;
+    NMSettingWireless         *s_wireless;
+    NMSettingWirelessSecurity *s_wsec;
+    const char                *key_mgmt = NULL;
+    const char                *psk      = NULL;
+    GBytes                    *ssid_bytes;
+    gs_free char              *ssid = NULL;
+    nm_auto_free_secret char  *uri  = NULL;
 
     s_wireless = nm_connection_get_setting_wireless(connection);
     g_return_if_fail(s_wireless);
@@ -4858,9 +4853,6 @@ print_wifi_connection(const NmcConfig *nmc_config, NMConnection *connection)
     g_return_if_fail(ssid);
     nmc_print("SSID: %s\n", ssid);
 
-    string = g_string_sized_new(64);
-    g_string_append(string, "WIFI:");
-
     s_wsec = nm_connection_get_setting_wireless_security(connection);
     if (s_wsec) {
         key_mgmt = nm_setting_wireless_security_get_key_mgmt(s_wsec);
@@ -4868,33 +4860,30 @@ print_wifi_connection(const NmcConfig *nmc_config, NMConnection *connection)
     }
 
     if (key_mgmt == NULL) {
-        type = "nopass";
         nmc_print("%s: %s\n", _("Security"), _("None"));
     } else if (strcmp(key_mgmt, "none") == 0 || strcmp(key_mgmt, "ieee8021x") == 0) {
-        type = "WEP";
         nmc_print("%s: WEP\n", _("Security"));
     } else if (strcmp(key_mgmt, "wpa-none") == 0 || strcmp(key_mgmt, "wpa-psk") == 0
                || strcmp(key_mgmt, "sae") == 0) {
-        type = "WPA";
         nmc_print("%s: WPA\n", _("Security"));
     } else if (strcmp(key_mgmt, "owe") == 0) {
-        type = "nopass";
         nmc_print("%s: OWE\n", _("Security"));
     }
 
-    if (psk)
+    if (psk && psk[0]) {
         nmc_print("%s: %s\n", _("Password"), psk);
+    } else if (nmc_wifi_key_mgmt_uses_psk(key_mgmt)) {
+        /* A QR code for a secured network without its password connects to
+         * nothing, so don't print one. */
+        nmc_printerr(
+            _("Warning: cannot read the Wi-Fi password due to insufficient privileges.\n"));
+        return;
+    }
 
-    string_append_mecard(string, "T:", type);
-    string_append_mecard(string, "S:", ssid);
-    string_append_mecard(string, "P:", psk);
-
-    if (nm_setting_wireless_get_hidden(s_wireless))
-        g_string_append(string, "H:true;");
+    uri = nmc_wifi_qr_uri_new(ssid, key_mgmt, psk, nm_setting_wireless_get_hidden(s_wireless));
 
-    g_string_append_c(string, ';');
     if (nmc_config->use_colors)
-        nmc_print_qrcode(string->str);
+        nmc_print_qrcode(uri);
 
     nmc_print("\n");
 }
diff --git a/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in b/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in
index 7a9f4e9c..801c760d 100644
--- a/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in
+++ b/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in
@@ -33,9 +33,9 @@
                   format="string"
                   values="infrastructure, adhoc, ap, mesh" />
         <property name="band"
-                  nmcli-description="802.11 frequency band of the network.  One of &quot;a&quot; for 5GHz 802.11a or &quot;bg&quot; for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network to the specific band, i.e. if &quot;a&quot; is specified, the device will not associate with the same network in the 2.4GHz band even if the network&apos;s settings are compatible.  This setting depends on specific driver capability and may not work with all drivers."
+                  nmcli-description="802.11 frequency band of the network.  One of &quot;a&quot; for 5GHz, &quot;bg&quot; for 2.4GHz or &quot;6GHz&quot;.  This will lock associations to the Wi-Fi network to the specific band, i.e. if &quot;a&quot; is specified, the device will not associate with the same network in the 2.4GHz (bg) or 6GHz bands even if the network&apos;s settings are compatible.  This setting depends on specific driver capability and may not work with all drivers."
                   format="string"
-                  values="a, bg" />
+                  values="a, bg, 6GHz" />
         <property name="channel"
                   nmcli-description="Wireless channel to use for the Wi-Fi connection.  The device will only join (or create for Ad-Hoc networks) a Wi-Fi network on the specified channel.  Because channel numbers overlap between bands, this property also requires the &quot;band&quot; property to be set."
                   format="integer"
@@ -653,7 +653,7 @@
                   format="choice (NMConnectionMultiConnect)"
                   values="default (0), single (1), manual-multiple (2), multiple (3)" />
         <property name="auth-retries"
-                  nmcli-description="The number of retries for the authentication. Zero means to try indefinitely; -1 means to use a global default. If the global default is not set, the authentication retries for 3 times before failing the connection. Currently, this only applies to 802-1x authentication."
+                  nmcli-description="The number of retries for the authentication. Zero means to try indefinitely; -1 means to use a global default. If the global default is not set, the authentication retries for 3 times before failing the connection. Connections using a pre-shared key to authenticate will only prompt for a new key during the last authentication attempt."
                   format="integer"
                   values="-1 - 2147483647" />
         <property name="timestamp"
@@ -1424,10 +1424,10 @@
                   format="boolean"
                   values="true/yes/on, false/no/off" />
         <property name="dhcp-client-id"
-                  nmcli-description="A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string (&apos;aa:bb:cc&apos;) it is interpreted as a binary client ID, in which case the first byte is assumed to be the &apos;type&apos; field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. &apos;01:xx:xx:xx:xx:xx:xx&apos; where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the &apos;type&apos; field is set to 0. The special values &quot;mac&quot; and &quot;perm-mac&quot; are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value &quot;ipv6-duid&quot; uses the DUID from &quot;ipv6.dhcp-duid&quot; property as an RFC4361-compliant client identifier. As IAID it uses &quot;ipv4.dhcp-iaid&quot; and falls back to &quot;ipv6.dhcp-iaid&quot; if unset. The special value &quot;duid&quot; generates a RFC4361-compliant client identifier based on &quot;ipv4.dhcp-iaid&quot; and uses a DUID generated by hashing /etc/machine-id. The special value &quot;stable&quot; is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the &quot;${DEVICE}&quot; or &quot;${MAC}&quot; specifier to get a per-device key. The special value &quot;none&quot; prevents any client identifier from being sent. Note that this is normally not recommended. If unset, a globally configured default from NetworkManager.conf is used. If still unset, the default depends on the DHCP plugin. The internal dhcp client will default to &quot;mac&quot; and the dhclient plugin will try to use one from its config file if present, or won&apos;t sent any client-id otherwise."
+                  nmcli-description="A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string (&apos;aa:bb:cc&apos;) it is interpreted as a binary client ID, in which case the first byte is assumed to be the &apos;type&apos; field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. &apos;01:xx:xx:xx:xx:xx:xx&apos; where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the &apos;type&apos; field is set to 0. The special values &quot;mac&quot; and &quot;perm-mac&quot; are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value &quot;ipv6-duid&quot; uses the DUID from &quot;ipv6.dhcp-duid&quot; property as an RFC4361-compliant client identifier. As IAID it uses &quot;ipv4.dhcp-iaid&quot; and falls back to &quot;ipv6.dhcp-iaid&quot; if unset. The special value &quot;duid&quot; generates a RFC4361-compliant client identifier based on &quot;ipv4.dhcp-iaid&quot; and uses a DUID generated by hashing /etc/machine-id. The special value &quot;stable&quot; is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the &quot;${DEVICE}&quot; or &quot;${MAC}&quot; specifier to get a per-device key. The special value &quot;none&quot; prevents any client identifier from being sent. Note that this is normally not recommended. If unset, a globally configured default from NetworkManager.conf is used. If still unset, internal dhcp client will default to &quot;mac&quot;."
                   format="string" />
         <property name="dhcp-iaid"
-                  nmcli-description="A string containing the &quot;Identity Association Identifier&quot; (IAID) used by the DHCP client. The string can be a 32-bit number (either decimal, hexadecimal or as colon separated hexadecimal numbers). Alternatively it can be set to the special values &quot;mac&quot;, &quot;perm-mac&quot;, &quot;ifname&quot; or &quot;stable&quot;. When set to &quot;mac&quot; (or &quot;perm-mac&quot;), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to &quot;ifname&quot;, the IAID is computed by hashing the interface name. The special value &quot;stable&quot; can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be &quot;ifname&quot;. For DHCPv4, the IAID is only used with &quot;ipv4.dhcp-client-id&quot; values &quot;duid&quot; and &quot;ipv6-duid&quot; to generate the client-id. For DHCPv6, note that at the moment this property is only supported by the &quot;internal&quot; DHCPv6 plugin. The &quot;dhclient&quot; DHCPv6 plugin always derives the IAID from the MAC address. The actually used DHCPv6 IAID for a currently activated interface is exposed in the lease information of the device."
+                  nmcli-description="A string containing the &quot;Identity Association Identifier&quot; (IAID) used by the DHCP client. The string can be a 32-bit number (either decimal, hexadecimal or as colon separated hexadecimal numbers). Alternatively it can be set to the special values &quot;mac&quot;, &quot;perm-mac&quot;, &quot;ifname&quot; or &quot;stable&quot;. When set to &quot;mac&quot; (or &quot;perm-mac&quot;), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to &quot;ifname&quot;, the IAID is computed by hashing the interface name. The special value &quot;stable&quot; can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be &quot;ifname&quot;. For DHCPv4, the IAID is only used with &quot;ipv4.dhcp-client-id&quot; values &quot;duid&quot; and &quot;ipv6-duid&quot; to generate the client-id. For DHCPv6, note that at the moment this property is only supported by the &quot;internal&quot; DHCPv6 plugin. The actually used DHCPv6 IAID for a currently activated interface is exposed in the lease information of the device."
                   format="string" />
         <property name="dhcp-dscp"
                   nmcli-description="Specifies the value for the DSCP field (traffic class) of the IP header. When empty, the global default value is used; if no global default is specified, it is assumed to be &quot;CS0&quot;. Allowed values are: &quot;CS0&quot;, &quot;CS4&quot; and &quot;CS6&quot;. The property is currently valid only for IPv4, and it is supported only by the &quot;internal&quot; DHCP plugin."
@@ -1469,12 +1469,12 @@
                   format="boolean"
                   values="true/yes/on, false/no/off" />
         <property name="required-timeout"
-                  nmcli-description="The minimum time interval in milliseconds for which dynamic IP configuration should be tried before the connection succeeds. This property is useful for example if both IPv4 and IPv6 are enabled and are allowed to fail. Normally the connection succeeds as soon as one of the two address families completes; by setting a required timeout for e.g. IPv4, one can ensure that even if IP6 succeeds earlier than IPv4, NetworkManager waits some time for IPv4 before the connection becomes active. Note that if &quot;may-fail&quot; is FALSE for the same address family, this property has no effect as NetworkManager needs to wait for the full DHCP timeout. A zero value means that no required timeout is present, -1 means the default value (either configuration ipvx.required-timeout override or zero)."
+                  nmcli-description="The minimum time interval in milliseconds for which dynamic IP configuration should be tried before the connection succeeds. This property is useful for example if both IPv4 and IPv6 are enabled and are allowed to fail. Normally the connection succeeds as soon as one of the two address families completes; by setting a required timeout for e.g. IPv4, one can ensure that even if IPv6 succeeds earlier than IPv4, NetworkManager waits some time for IPv4 before the connection becomes active. Note that if &quot;may-fail&quot; is FALSE for the same address family, this property has no effect as NetworkManager needs to wait for the full DHCP timeout. A zero value means that no required timeout is present, -1 means the default value (either configuration ipvx.required-timeout override or zero)."
                   format="integer"
                   values="-1 - 2147483647"
                   special-values="default (-1), infinity (2147483647)" />
         <property name="dad-timeout"
-                  nmcli-description="Maximum timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail. The property is currently implemented only for IPv4. A zero value means that no duplicate address detection is performed, -1 means the default value (either the value configured globally in NetworkManger.conf or 200ms).  A value greater than zero is a timeout in milliseconds.  Note that the time intervals are subject to randomization as per RFC 5227 and so the actual duration can be between half and the full time specified in this property."
+                  nmcli-description="Maximum timeout in milliseconds used to check for the presence of duplicate IP addresses on the network.  If an address conflict is detected, the activation will fail. The property is currently implemented only for IPv4. A zero value means that no duplicate address detection is performed, -1 means the default value (either the value configured globally in NetworkManager.conf or 200ms).  A value greater than zero is a timeout in milliseconds.  Note that the time intervals are subject to randomization as per RFC 5227 and so the actual duration can be between half and the full time specified in this property."
                   format="integer"
                   values="-1 - 30000"
                   special-values="default (-1), off (0)" />
@@ -1482,9 +1482,13 @@
                   nmcli-description="The Vendor Class Identifier DHCP option (60). Special characters in the data string may be escaped using C-style escapes, nevertheless this property cannot contain nul bytes. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the DHCP option is not sent to the server."
                   format="string" />
         <property name="dhcp-ipv6-only-preferred"
-                  nmcli-description="Controls the &quot;IPv6-Only Preferred&quot; DHCPv4 option (RFC 8925). When set to &quot;yes&quot; (1), the host adds the option to the parameter request list; if the DHCP server sends the option back, the host stops the DHCP client for the time interval specified in the option. Enable this feature if the host supports an IPv6-only mode, i.e. either all applications are IPv6-only capable or there is a form of 464XLAT deployed. When set to &quot;default&quot; (-1), the actual value is looked up in the global configuration; if not specified, it defaults to &quot;no&quot; (0). If the connection has IPv6 method set to &quot;disabled&quot;, this property does not have effect and the &quot;IPv6-Only Preferred&quot; option is always disabled."
+                  nmcli-description="Controls the &quot;IPv6-Only Preferred&quot; DHCPv4 option (option 108 - RFC 8925). When set to &quot;yes&quot; (1), the host adds the option to the parameter request list; if the DHCP server sends the option back, the host stops the DHCP client for the time interval specified in the option. Enable this feature if the host supports an IPv6-only mode, i.e. either all applications are IPv6-only capable or there is a form of CLAT (464XLAT) deployed. If set to &quot;auto&quot; (2), the option is automatically turned on when the IPv6 method is &quot;auto&quot; and the connection profile has ipv4.clat set to &quot;yes&quot; or &quot;auto&quot;. If these two conditions are met, the host can operate in IPv6-only mode and therefore it is safe to disable DHCPv4 when the network also supports it. When set to &quot;default&quot; (-1), the actual value is looked up in the global configuration; if not specified, it defaults to &quot;auto&quot; (2). If the connection has IPv6 method set to &quot;disabled&quot;, this property does not have effect and the &quot;IPv6-Only Preferred&quot; option is always disabled."
                   format="choice (NMSettingIP4DhcpIpv6OnlyPreferred)"
-                  values="default (-1), no (0), yes (1)" />
+                  values="default (-1), no (0), yes (1), auto (2)" />
+        <property name="clat"
+                  nmcli-description="Controls the CLAT (Customer-side translator) functionality. CLAT is used to implement the client part of 464XLAT (RFC 6877), an architecture that provides IPv4 connectivity to hosts on IPv6-only networks. When CLAT is enabled, NetworkManager discovers the NAT64 prefix from IPv6 Router Advertisements; if a NAT64 prefix is announced, NetworkManager installs a BPF program to perform the stateless translation of packets between IPv4 and IPv6. Setting &quot;no&quot; (0) completely disables CLAT. &quot;auto&quot; (1) enables CLAT only when the IPv4 method is &apos;auto&apos; and the device doesn&apos;t have a native IPv4 gateway. &quot;force&quot; (2) enables CLAT even if the IPv4 method is not &apos;auto&apos; and even if the device has a native IPv4 gateway. When set to &quot;default&quot; (-1), the actual value is looked up in the global configuration; if not specified it defaults to &quot;no&quot; (0). In the future the default fall back value will change to &quot;auto&quot; (1)."
+                  format="choice (NMSettingIp4ConfigClat)"
+                  values="default (-1), no (0), auto (1), force (2)" />
         <property name="link-local"
                   nmcli-description="Enable and disable the IPv4 link-local configuration independently of the ipv4.method configuration. This allows a link-local address (169.254.x.y/16) to be obtained in addition to other addresses, such as those manually configured or obtained from a DHCP server. When set to &quot;auto&quot;, the value is dependent on &quot;ipv4.method&quot;. When set to &quot;default&quot;, it honors the global connection default, before falling back to &quot;auto&quot;. Note that if &quot;ipv4.method&quot; is &quot;disabled&quot;, then link local addressing is always disabled too. The default is &quot;default&quot;. Since 1.52, when set to &quot;fallback&quot;, a link-local address is obtained if no other IPv4 address is set."
                   format="choice (NMSettingIP4LinkLocal)"
@@ -1574,7 +1578,7 @@
                   format="boolean"
                   values="true/yes/on, false/no/off" />
         <property name="required-timeout"
-                  nmcli-description="The minimum time interval in milliseconds for which dynamic IP configuration should be tried before the connection succeeds. This property is useful for example if both IPv4 and IPv6 are enabled and are allowed to fail. Normally the connection succeeds as soon as one of the two address families completes; by setting a required timeout for e.g. IPv4, one can ensure that even if IP6 succeeds earlier than IPv4, NetworkManager waits some time for IPv4 before the connection becomes active. Note that if &quot;may-fail&quot; is FALSE for the same address family, this property has no effect as NetworkManager needs to wait for the full DHCP timeout. A zero value means that no required timeout is present, -1 means the default value (either configuration ipvx.required-timeout override or zero)."
+                  nmcli-description="The minimum time interval in milliseconds for which dynamic IP configuration should be tried before the connection succeeds. This property is useful for example if both IPv4 and IPv6 are enabled and are allowed to fail. Normally the connection succeeds as soon as one of the two address families completes; by setting a required timeout for e.g. IPv4, one can ensure that even if IPv6 succeeds earlier than IPv4, NetworkManager waits some time for IPv4 before the connection becomes active. Note that if &quot;may-fail&quot; is FALSE for the same address family, this property has no effect as NetworkManager needs to wait for the full DHCP timeout. A zero value means that no required timeout is present, -1 means the default value (either configuration ipvx.required-timeout override or zero)."
                   format="integer"
                   values="-1 - 2147483647"
                   special-values="default (-1), infinity (2147483647)" />
@@ -1609,10 +1613,10 @@
                   nmcli-description="A IPv6 address followed by a slash and a prefix length. If set, the value is sent to the DHCPv6 server as hint indicating the prefix delegation (IA_PD) we want to receive. To only hint a prefix length without prefix, set the address part to the zero address (for example &quot;::/60&quot;)."
                   format="string" />
         <property name="dhcp-duid"
-                  nmcli-description="A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string (&apos;aa:bb:cc&apos;) it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value &quot;lease&quot; will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and &quot;dhclient&quot; is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values &quot;llt&quot; and &quot;ll&quot; will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values &quot;stable-llt&quot;, &quot;stable-ll&quot; and &quot;stable-uuid&quot; will generate a DUID of the corresponding type, derived from the connection&apos;s stable-id and a per-host unique key. You may want to include the &quot;${DEVICE}&quot; or &quot;${MAC}&quot; specifier in the stable-id, in case this profile gets activated on multiple devices. So, the link-layer address of &quot;stable-ll&quot; and &quot;stable-llt&quot; will be a generated address derived from the stable id. The DUID-LLT time value in the &quot;stable-llt&quot; option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in &quot;llt&quot;). When the property is unset, the global value provided for &quot;ipv6.dhcp-duid&quot; is used. If no global value is provided, the default &quot;lease&quot; value is assumed."
+                  nmcli-description="A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string (&apos;aa:bb:cc&apos;) it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value &quot;lease&quot; will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values &quot;llt&quot; and &quot;ll&quot; will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values &quot;stable-llt&quot;, &quot;stable-ll&quot; and &quot;stable-uuid&quot; will generate a DUID of the corresponding type, derived from the connection&apos;s stable-id and a per-host unique key. You may want to include the &quot;${DEVICE}&quot; or &quot;${MAC}&quot; specifier in the stable-id, in case this profile gets activated on multiple devices. So, the link-layer address of &quot;stable-ll&quot; and &quot;stable-llt&quot; will be a generated address derived from the stable id. The DUID-LLT time value in the &quot;stable-llt&quot; option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in &quot;llt&quot;). When the property is unset, the global value provided for &quot;ipv6.dhcp-duid&quot; is used. If no global value is provided, the default &quot;lease&quot; value is assumed."
                   format="string" />
         <property name="dhcp-iaid"
-                  nmcli-description="A string containing the &quot;Identity Association Identifier&quot; (IAID) used by the DHCP client. The string can be a 32-bit number (either decimal, hexadecimal or as colon separated hexadecimal numbers). Alternatively it can be set to the special values &quot;mac&quot;, &quot;perm-mac&quot;, &quot;ifname&quot; or &quot;stable&quot;. When set to &quot;mac&quot; (or &quot;perm-mac&quot;), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to &quot;ifname&quot;, the IAID is computed by hashing the interface name. The special value &quot;stable&quot; can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be &quot;ifname&quot;. For DHCPv4, the IAID is only used with &quot;ipv4.dhcp-client-id&quot; values &quot;duid&quot; and &quot;ipv6-duid&quot; to generate the client-id. For DHCPv6, note that at the moment this property is only supported by the &quot;internal&quot; DHCPv6 plugin. The &quot;dhclient&quot; DHCPv6 plugin always derives the IAID from the MAC address. The actually used DHCPv6 IAID for a currently activated interface is exposed in the lease information of the device."
+                  nmcli-description="A string containing the &quot;Identity Association Identifier&quot; (IAID) used by the DHCP client. The string can be a 32-bit number (either decimal, hexadecimal or as colon separated hexadecimal numbers). Alternatively it can be set to the special values &quot;mac&quot;, &quot;perm-mac&quot;, &quot;ifname&quot; or &quot;stable&quot;. When set to &quot;mac&quot; (or &quot;perm-mac&quot;), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to &quot;ifname&quot;, the IAID is computed by hashing the interface name. The special value &quot;stable&quot; can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be &quot;ifname&quot;. For DHCPv4, the IAID is only used with &quot;ipv4.dhcp-client-id&quot; values &quot;duid&quot; and &quot;ipv6-duid&quot; to generate the client-id. For DHCPv6, note that at the moment this property is only supported by the &quot;internal&quot; DHCPv6 plugin. The actually used DHCPv6 IAID for a currently activated interface is exposed in the lease information of the device."
                   format="string" />
         <property name="dhcp-timeout"
                   nmcli-description="A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity."
diff --git a/src/nmcli/general.c b/src/nmcli/general.c
index a2772ca3..11704020 100644
--- a/src/nmcli/general.c
+++ b/src/nmcli/general.c
@@ -1486,6 +1486,24 @@ ac_overview(NmCli *nmc, NMActiveConnection *ac)
             }
         }
     }
+
+    {
+        NMIPConfig *ip4 = nm_active_connection_get_ip4_config(ac);
+        NMIPConfig *ip6 = nm_active_connection_get_ip6_config(ac);
+        const char *clat4;
+        const char *clat6;
+        const char *pref64;
+
+        if (ip4 && ip6) {
+            clat4  = nm_ip_config_get_clat_address(ip4);
+            clat6  = nm_ip_config_get_clat_address(ip6);
+            pref64 = nm_ip_config_get_clat_pref64(ip6);
+
+            if (clat4 && clat6 && pref64) {
+                nmc_print("\tclat inet4 %s inet6 %s pref64 %s\n", clat4, clat6, pref64);
+            }
+        }
+    }
 }
 
 void
diff --git a/src/nmcli/utils.c b/src/nmcli/utils.c
index a613c28f..7048b231 100644
--- a/src/nmcli/utils.c
+++ b/src/nmcli/utils.c
@@ -38,6 +38,14 @@ _meta_type_nmc_generic_info_get_name(const NMMetaAbstractInfo *abstract_info, gb
     return info->name;
 }
 
+static const char *
+_meta_type_nmc_generic_info_get_alias(const NMMetaAbstractInfo *abstract_info)
+{
+    const NmcMetaGenericInfo *info = (const NmcMetaGenericInfo *) abstract_info;
+
+    return info->alias;
+}
+
 static const NMMetaAbstractInfo *const *
 _meta_type_nmc_generic_info_get_nested(const NMMetaAbstractInfo *abstract_info,
                                        guint                    *out_len,
@@ -101,6 +109,7 @@ _meta_type_nmc_generic_info_get_fcn(const NMMetaAbstractInfo  *abstract_info,
 const NMMetaType nmc_meta_type_generic_info = {
     .type_name  = "nmc-generic-info",
     .get_name   = _meta_type_nmc_generic_info_get_name,
+    .get_alias  = _meta_type_nmc_generic_info_get_alias,
     .get_nested = _meta_type_nmc_generic_info_get_nested,
     .get_fcn    = _meta_type_nmc_generic_info_get_fcn,
 };
@@ -1103,8 +1112,9 @@ _print_fill(const NmcConfig    *nmc_config,
 
             nm_assert(!to_free || value == to_free);
 
-            if ((is_default && nmc_config->overview)
-                || NM_FLAGS_HAS(text_out_flags, NM_META_ACCESSOR_GET_OUT_FLAGS_HIDE)) {
+            if (is_default
+                && (nmc_config->overview
+                    || NM_FLAGS_HAS(text_out_flags, NM_META_ACCESSOR_GET_OUT_FLAGS_HIDE))) {
                 /* don't mark the entry for display. This is to shorten the output in case
                  * the property is the default value. But we only do that, if the user
                  * opts in to this behavior (-overview), or of the property marks itself
diff --git a/src/nmcli/utils.h b/src/nmcli/utils.h
index b2539bf4..effb3340 100644
--- a/src/nmcli/utils.h
+++ b/src/nmcli/utils.h
@@ -111,6 +111,7 @@ typedef enum {
     NMC_GENERIC_INFO_TYPE_IP4_CONFIG_DOMAIN,
     NMC_GENERIC_INFO_TYPE_IP4_CONFIG_SEARCHES,
     NMC_GENERIC_INFO_TYPE_IP4_CONFIG_WINS,
+    NMC_GENERIC_INFO_TYPE_IP4_CONFIG_CLAT_ADDRESS,
     _NMC_GENERIC_INFO_TYPE_IP4_CONFIG_NUM,
 
     NMC_GENERIC_INFO_TYPE_IP6_CONFIG_ADDRESS = 0,
@@ -119,6 +120,8 @@ typedef enum {
     NMC_GENERIC_INFO_TYPE_IP6_CONFIG_DNS,
     NMC_GENERIC_INFO_TYPE_IP6_CONFIG_DOMAIN,
     NMC_GENERIC_INFO_TYPE_IP6_CONFIG_SEARCHES,
+    NMC_GENERIC_INFO_TYPE_IP6_CONFIG_CLAT_ADDRESS,
+    NMC_GENERIC_INFO_TYPE_IP6_CONFIG_CLAT_PREF64,
     _NMC_GENERIC_INFO_TYPE_IP6_CONFIG_NUM,
 
     NMC_GENERIC_INFO_TYPE_DHCP_CONFIG_OPTION = 0,
@@ -154,6 +157,7 @@ typedef enum {
     NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_CON_PATH,
     NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_ZONE,
     NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_CONTROLLER_PATH,
+    NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_MASTER_PATH,
     _NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_NUM,
 
     NMC_GENERIC_INFO_TYPE_CON_VPN_TYPE = 0,
@@ -257,6 +261,7 @@ struct _NmcMetaGenericInfo {
     NmcGenericInfoType               info_type;
     const char                      *name;
     const char                      *name_header;
+    const char                      *alias;
     const NmcMetaGenericInfo *const *nested;
 
 #define NMC_META_GENERIC_INFO_GET_FCN_ARGS                                     \
diff --git a/src/nmtui/meson.build b/src/nmtui/meson.build
index 40bb40b9..56812cfa 100644
--- a/src/nmtui/meson.build
+++ b/src/nmtui/meson.build
@@ -6,7 +6,6 @@ executable(
     'nm-editor-bindings.c',
     'nm-editor-utils.c',
     'nmt-8021x-fields.c',
-    'nmt-address-list.c',
     'nmt-connect-connection-list.c',
     'nmt-device-entry.c',
     'nmt-edit-connection-list.c',
@@ -16,6 +15,7 @@ executable(
     'nmt-editor-page-device.c',
     'nmt-editor-section.c',
     'nmt-ip-entry.c',
+    'nmt-list.c',
     'nmt-mac-entry.c',
     'nmt-mtu-entry.c',
     'nmt-page-bond.c',
@@ -42,6 +42,7 @@ executable(
     'nmt-route-editor.c',
     'nmt-route-entry.c',
     'nmt-route-table.c',
+    'nmt-wifi-qr-dialog.c',
     'nmt-port-list.c',
     'nmt-wireguard-peer-list.c',
     'nmt-wireguard-peer-editor.c',
@@ -56,6 +57,7 @@ executable(
   dependencies: [
     libnm_dep,
     newt_dep,
+    slang_dep,
     glib_dep,
   ],
   link_with: [
diff --git a/src/nmtui/nm-editor-bindings.c b/src/nmtui/nm-editor-bindings.c
index 360cf3ad..1408d263 100644
--- a/src/nmtui/nm-editor-bindings.c
+++ b/src/nmtui/nm-editor-bindings.c
@@ -195,7 +195,7 @@ ip_addresses_with_prefix_from_strv(GBinding     *binding,
  * @source: the source object (eg, an #NMSettingIP4Config)
  * @source_property: the property on @source to bind (eg,
  *   %NM_SETTING_IP4_CONFIG_ADDRESSES)
- * @target: the target object (eg, an #NmtAddressList)
+ * @target: the target object (eg, an #NmtList)
  * @target_property: the property on @target to bind
  *   (eg, "strings")
  * @flags: %GBindingFlags
@@ -253,7 +253,7 @@ ip_addresses_check_and_copy(GBinding     *binding,
  * @source: the source object (eg, an #NMSettingIP4Config)
  * @source_property: the property on @source to bind (eg,
  *   %NM_SETTING_IP4_CONFIG_DNS)
- * @target: the target object (eg, an #NmtAddressList)
+ * @target: the target object (eg, an #NmtList)
  * @target_property: the property on @target to bind
  *   (eg, "strings")
  * @flags: %GBindingFlags
diff --git a/src/nmtui/nmt-address-list.h b/src/nmtui/nmt-address-list.h
deleted file mode 100644
index 01669fbd..00000000
--- a/src/nmtui/nmt-address-list.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (C) 2013 Red Hat, Inc.
- */
-
-#ifndef NMT_ADDRESS_LIST_H
-#define NMT_ADDRESS_LIST_H
-
-#include "nmt-widget-list.h"
-
-#define NMT_TYPE_ADDRESS_LIST (nmt_address_list_get_type())
-#define NMT_ADDRESS_LIST(obj) \
-    (_NM_G_TYPE_CHECK_INSTANCE_CAST((obj), NMT_TYPE_ADDRESS_LIST, NmtAddressList))
-#define NMT_ADDRESS_LIST_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_CAST((klass), NMT_TYPE_ADDRESS_LIST, NmtAddressListClass))
-#define NMT_IS_ADDRESS_LIST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), NMT_TYPE_ADDRESS_LIST))
-#define NMT_IS_ADDRESS_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NMT_TYPE_ADDRESS_LIST))
-#define NMT_ADDRESS_LIST_GET_CLASS(obj) \
-    (G_TYPE_INSTANCE_GET_CLASS((obj), NMT_TYPE_ADDRESS_LIST, NmtAddressListClass))
-
-typedef struct {
-    NmtWidgetList parent;
-
-} NmtAddressList;
-
-typedef struct {
-    NmtWidgetListClass parent;
-
-} NmtAddressListClass;
-
-GType nmt_address_list_get_type(void);
-
-typedef enum {
-    NMT_ADDRESS_LIST_IP4_WITH_PREFIX,
-    NMT_ADDRESS_LIST_IP4,
-    NMT_ADDRESS_LIST_IP6_WITH_PREFIX,
-    NMT_ADDRESS_LIST_IP6,
-    NMT_ADDRESS_LIST_HOSTNAME
-} NmtAddressListType;
-
-NmtNewtWidget *nmt_address_list_new(NmtAddressListType list_type);
-
-#endif /* NMT_ADDRESS_LIST_H */
diff --git a/src/nmtui/nmt-connect-connection-list.c b/src/nmtui/nmt-connect-connection-list.c
index 8e7dc807..1980c30d 100644
--- a/src/nmtui/nmt-connect-connection-list.c
+++ b/src/nmtui/nmt-connect-connection-list.c
@@ -17,6 +17,7 @@
 
 #include "nmtui.h"
 #include "nmt-connect-connection-list.h"
+#include "nmt-utils.h"
 #include "libnmc-base/nm-client-utils.h"
 
 G_DEFINE_TYPE(NmtConnectConnectionList, nmt_connect_connection_list, NMT_TYPE_NEWT_LISTBOX)
@@ -47,6 +48,8 @@ typedef struct {
 
 typedef struct {
     GSList *nmt_devices;
+    char   *filter_text;
+    int     match_count;
 } NmtConnectConnectionListPrivate;
 
 /**
@@ -444,6 +447,13 @@ connection_find_ac(NMConnection *conn, const GPtrArray *acs)
     return NULL;
 }
 
+static gboolean
+connection_matches(NmtConnectConnection *nmtconn, const char *needle)
+{
+    return nmt_utils_filter_match(nmtconn->name, needle)
+           || nmt_utils_filter_match(nmtconn->ssid, needle);
+}
+
 static void
 nmt_connect_connection_list_rebuild(NmtConnectConnectionList *list)
 {
@@ -456,6 +466,8 @@ nmt_connect_connection_list_rebuild(NmtConnectConnectionList *list)
     GSList                          *nmt_devices, *diter, *citer;
     NmtConnectDevice                *nmtdev;
     NmtConnectConnection            *nmtconn;
+    gboolean                         did_group;
+    int                              n_matches = 0;
 
     g_slist_free_full(priv->nmt_devices, (GDestroyNotify) nmt_connect_device_free);
     priv->nmt_devices = NULL;
@@ -486,18 +498,32 @@ nmt_connect_connection_list_rebuild(NmtConnectConnectionList *list)
         }
     }
 
+    did_group = FALSE;
     for (diter = nmt_devices; diter; diter = diter->next) {
+        gboolean dev_matches = FALSE;
+
         nmtdev = diter->data;
 
-        if (nmtdev->conns) {
-            if (diter != nmt_devices)
-                nmt_newt_listbox_append(listbox, "", NULL);
-            nmt_newt_listbox_append(listbox, nmtdev->name, NULL);
+        for (citer = nmtdev->conns; citer; citer = citer->next) {
+            if (connection_matches(citer->data, priv->filter_text)) {
+                dev_matches = TRUE;
+                break;
+            }
         }
+        if (!dev_matches)
+            continue;
+
+        if (did_group)
+            nmt_newt_listbox_append(listbox, "", NULL);
+        nmt_newt_listbox_append(listbox, nmtdev->name, NULL);
+        did_group = TRUE;
 
         for (citer = nmtdev->conns; citer; citer = citer->next) {
             nmtconn = citer->data;
 
+            if (!connection_matches(nmtconn, priv->filter_text))
+                continue;
+
             if (nmtconn->conn)
                 nmtconn->active = connection_find_ac(nmtconn->conn, acs);
             if (nmtconn->active) {
@@ -523,15 +549,36 @@ nmt_connect_connection_list_rebuild(NmtConnectConnectionList *list)
 
             nmt_newt_listbox_append(listbox, row, nmtconn);
             g_free(row);
+            n_matches++;
         }
     }
 
     priv->nmt_devices = nmt_devices;
+    priv->match_count = n_matches;
 
     g_object_notify(G_OBJECT(listbox), "active");
     g_object_notify(G_OBJECT(listbox), "active-key");
 }
 
+void
+nmt_connect_connection_list_set_filter_text(NmtConnectConnectionList *list, const char *text)
+{
+    NmtConnectConnectionListPrivate *priv = NMT_CONNECT_CONNECTION_LIST_GET_PRIVATE(list);
+
+    if (nm_streq0(text, priv->filter_text))
+        return;
+
+    g_free(priv->filter_text);
+    priv->filter_text = g_strdup(text);
+    nmt_connect_connection_list_rebuild(list);
+}
+
+int
+nmt_connect_connection_list_get_match_count(NmtConnectConnectionList *list)
+{
+    return NMT_CONNECT_CONNECTION_LIST_GET_PRIVATE(list)->match_count;
+}
+
 static void
 rebuild_on_property_changed(GObject *object, GParamSpec *spec, gpointer list)
 {
@@ -567,6 +614,7 @@ nmt_connect_connection_list_finalize(GObject *object)
     NmtConnectConnectionListPrivate *priv = NMT_CONNECT_CONNECTION_LIST_GET_PRIVATE(object);
 
     g_slist_free_full(priv->nmt_devices, (GDestroyNotify) nmt_connect_device_free);
+    nm_clear_g_free(&priv->filter_text);
 
     g_signal_handlers_disconnect_by_func(nm_client,
                                          G_CALLBACK(rebuild_on_property_changed),
diff --git a/src/nmtui/nmt-connect-connection-list.h b/src/nmtui/nmt-connect-connection-list.h
index bfc0c007..7b8d4a4b 100644
--- a/src/nmtui/nmt-connect-connection-list.h
+++ b/src/nmtui/nmt-connect-connection-list.h
@@ -40,6 +40,10 @@ GType nmt_connect_connection_list_get_type(void);
 
 NmtNewtWidget *nmt_connect_connection_list_new(void);
 
+void nmt_connect_connection_list_set_filter_text(NmtConnectConnectionList *list, const char *text);
+
+int nmt_connect_connection_list_get_match_count(NmtConnectConnectionList *list);
+
 gboolean nmt_connect_connection_list_get_connection(NmtConnectConnectionList *list,
                                                     const char               *identifier,
                                                     NMConnection            **connection,
diff --git a/src/nmtui/nmt-device-entry.c b/src/nmtui/nmt-device-entry.c
index 99cc43ad..2034aabd 100644
--- a/src/nmtui/nmt-device-entry.c
+++ b/src/nmtui/nmt-device-entry.c
@@ -14,11 +14,6 @@
  * the entry recognizes the interface name or mac address typed in as
  * matching a known #NMDevice, then it will also display the other
  * property in parentheses.
- *
- * FIXME: #NmtDeviceEntry is currently an #NmtEditorGrid object, so that
- * we can possibly eventually add a button to its "extra" field, that
- * would pop up a form for selecting a device. But if we're not going
- * to implement that then we should make it just an #NmtNewtEntry.
  */
 
 #include "libnm-client-aux-extern/nm-default-client.h"
@@ -49,6 +44,7 @@ typedef struct {
     NmtNewtWidget *button;
 
     gboolean updating;
+    gboolean show_select_button;
 } NmtDeviceEntryPrivate;
 
 enum {
@@ -58,6 +54,7 @@ enum {
     PROP_HARDWARE_TYPE,
     PROP_INTERFACE_NAME,
     PROP_MAC_ADDRESS,
+    PROP_SHOW_SELECT_BUTTON,
 
     LAST_PROP
 };
@@ -68,16 +65,18 @@ enum {
  * @width: the width of the entry
  * @hardware_type: the type of #NMDevice to be selected, or
  *   %G_TYPE_NONE if this is for a virtual device type.
+ * @show_select_button: whether to show select button or not.
  *
  * Creates a new #NmtDeviceEntry, for identifying a device of type
  * @hardware_type. If @hardware_type is %G_TYPE_NONE (and you do not
  * set a #NmtDeviceEntryDeviceFilter), then this will only allow
- * specifying an interface name, not a hardware address.
+ * specifying an interface name, not a hardware address. @show_select_button
+ * will allow the user to select from a list of available devices of type @hardware_type.
  *
  * Returns: a new #NmtDeviceEntry.
  */
 NmtNewtWidget *
-nmt_device_entry_new(const char *label, int width, GType hardware_type)
+nmt_device_entry_new(const char *label, int width, GType hardware_type, gboolean show_select_button)
 {
     return g_object_new(NMT_TYPE_DEVICE_ENTRY,
                         "label",
@@ -86,6 +85,8 @@ nmt_device_entry_new(const char *label, int width, GType hardware_type)
                         width,
                         "hardware-type",
                         hardware_type,
+                        "show-select-button",
+                        show_select_button,
                         NULL);
 }
 
@@ -334,6 +335,133 @@ entry_text_changed(GObject *object, GParamSpec *pspec, gpointer deventry)
 }
 
 static void
+device_selected(NmtNewtWidget *listbox, gpointer user_data)
+{
+    NMDevice       *candidate = nmt_newt_listbox_get_active_key(NMT_NEWT_LISTBOX(listbox));
+    NmtDeviceEntry *deventry  = NMT_DEVICE_ENTRY(user_data);
+    const char     *ifname;
+
+    if (!candidate)
+        return;
+
+    ifname = nm_device_get_iface(candidate);
+    if (!ifname)
+        return;
+
+    if (nmt_device_entry_set_interface_name(deventry, ifname))
+        update_entry(deventry);
+}
+
+static int
+compare_devices_by_name(gconstpointer a, gconstpointer b)
+{
+    NMDevice **dev_a = (NMDevice **) a;
+    NMDevice **dev_b = (NMDevice **) b;
+
+    return nm_strcmp0(nm_device_get_iface(*dev_a), nm_device_get_iface(*dev_b));
+}
+
+static void
+do_select_dialog(NmtNewtWidget *button, gpointer user_data)
+{
+    NmtDeviceEntry              *deventry;
+    NmtDeviceEntryPrivate       *priv;
+    gs_unref_object NmtNewtForm *popup_form = NULL;
+    NmtNewtWidget               *listbox_widget;
+    NmtNewtForm                 *parent_form;
+    const GPtrArray             *devices;
+    gs_unref_ptrarray GPtrArray *matching_devices = NULL;
+    const char                  *ifname, *driver;
+    int                          i;
+    int                          entry_x, entry_y;
+    int                          window_x, window_y;
+    int                          popup_x, popup_y;
+    int                          list_w, list_h;
+    newtComponent                entry_component;
+
+    deventry    = NMT_DEVICE_ENTRY(user_data);
+    priv        = NMT_DEVICE_ENTRY_GET_PRIVATE(deventry);
+    parent_form = nmt_newt_widget_get_form(NMT_NEWT_WIDGET(deventry));
+    if (!parent_form)
+        return;
+
+    matching_devices = g_ptr_array_new();
+
+    entry_component = nmt_newt_component_get_component(NMT_NEWT_COMPONENT(priv->entry));
+    newtComponentGetPosition(entry_component, &entry_x, &entry_y);
+    g_object_get(parent_form, "x", &window_x, "y", &window_y, NULL);
+
+    listbox_widget = nmt_newt_listbox_new(5, NMT_NEWT_LISTBOX_SCROLL);
+    nmt_newt_widget_set_exit_on_activate(listbox_widget, TRUE);
+
+    nmt_newt_widget_set_padding(listbox_widget, 1, 0, 1, 0);
+
+    devices = nm_client_get_devices(nm_client);
+    for (i = 0; i < devices->len; i++) {
+        NMDevice *candidate = devices->pdata[i];
+
+        if (!G_TYPE_CHECK_INSTANCE_TYPE(candidate, priv->hardware_type))
+            continue;
+
+        if (priv->device_filter
+            && !priv->device_filter(deventry, candidate, priv->device_filter_data))
+            continue;
+
+        ifname = nm_device_get_iface(candidate);
+        if (!ifname)
+            continue;
+
+        g_ptr_array_add(matching_devices, candidate);
+    }
+
+    if (matching_devices->len == 0) {
+        nmt_newt_message_dialog(_("No devices available"));
+        return;
+    }
+
+    g_ptr_array_sort(matching_devices, compare_devices_by_name);
+
+    for (i = 0; i < matching_devices->len; i++) {
+        gs_free char *display_text = NULL;
+        NMDevice     *candidate    = matching_devices->pdata[i];
+
+        ifname = nm_device_get_iface(candidate);
+
+        driver = nm_device_get_driver(candidate);
+
+        if (driver && driver[0] != '\0') {
+            display_text = g_strdup_printf("%s (%s)", ifname, driver);
+        } else {
+            display_text = g_strdup(ifname);
+        }
+
+        nmt_newt_listbox_append(NMT_NEWT_LISTBOX(listbox_widget), display_text, candidate);
+    }
+
+    g_signal_connect(listbox_widget, "activated", G_CALLBACK(device_selected), deventry);
+
+    nmt_newt_widget_size_request(listbox_widget, &list_w, &list_h);
+    popup_x = window_x + entry_x + 1;
+    popup_y = window_y + entry_y + 1;
+
+    popup_form = g_object_new(NMT_TYPE_NEWT_FORM,
+                              "x",
+                              popup_x,
+                              "y",
+                              popup_y,
+                              "width",
+                              list_w,
+                              "height",
+                              list_h,
+                              "padding",
+                              0,
+                              NULL);
+
+    nmt_newt_form_set_content(popup_form, listbox_widget);
+    nmt_newt_form_show(popup_form);
+}
+
+static void
 nmt_device_entry_init(NmtDeviceEntry *deventry)
 {
     NmtDeviceEntryPrivate *priv = NMT_DEVICE_ENTRY_GET_PRIVATE(deventry);
@@ -346,11 +474,9 @@ nmt_device_entry_init(NmtDeviceEntry *deventry)
     nmt_newt_entry_set_validator(priv->entry, device_entry_validate, deventry);
     g_signal_connect(priv->entry, "notify::text", G_CALLBACK(entry_text_changed), deventry);
 
-#if 0
-    priv->button = nmt_newt_button_new (_("Select..."));
-    g_signal_connect (priv->button, "clicked",
-                      G_CALLBACK (do_select_dialog), deventry);
-#endif
+    priv->button = nmt_newt_button_new(_("Select..."));
+    nmt_newt_widget_set_visible(priv->button, FALSE);
+    g_signal_connect(priv->button, "clicked", G_CALLBACK(do_select_dialog), deventry);
 }
 
 static void
@@ -361,7 +487,7 @@ nmt_device_entry_constructed(GObject *object)
     nmt_editor_grid_append(NMT_EDITOR_GRID(object),
                            priv->label,
                            NMT_NEWT_WIDGET(priv->entry),
-                           NULL);
+                           priv->button);
 
     G_OBJECT_CLASS(nmt_device_entry_parent_class)->constructed(object);
 }
@@ -446,6 +572,10 @@ nmt_device_entry_set_property(GObject      *object,
         if (nmt_device_entry_set_mac_address(deventry, mac_address))
             update_entry(deventry);
         break;
+    case PROP_SHOW_SELECT_BUTTON:
+        priv->show_select_button = g_value_get_boolean(value);
+        nmt_newt_widget_set_visible(priv->button, priv->show_select_button);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
         break;
@@ -473,6 +603,9 @@ nmt_device_entry_get_property(GObject *object, guint prop_id, GValue *value, GPa
     case PROP_MAC_ADDRESS:
         g_value_set_string(value, priv->mac_address);
         break;
+    case PROP_SHOW_SELECT_BUTTON:
+        g_value_set_boolean(value, priv->show_select_button);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
         break;
@@ -554,4 +687,18 @@ nmt_device_entry_class_init(NmtDeviceEntryClass *deventry_class)
                             "",
                             NULL,
                             G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+    /**
+     * NmtDeviceEntry:show-select-button:
+     *
+     * Display select button to select device from available devices.
+     */
+    g_object_class_install_property(
+        object_class,
+        PROP_SHOW_SELECT_BUTTON,
+        g_param_spec_boolean("show-select-button",
+                             "",
+                             "",
+                             TRUE,
+                             G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
diff --git a/src/nmtui/nmt-device-entry.h b/src/nmtui/nmt-device-entry.h
index 6265ce01..21be28c7 100644
--- a/src/nmtui/nmt-device-entry.h
+++ b/src/nmtui/nmt-device-entry.h
@@ -30,7 +30,10 @@ typedef struct {
 
 GType nmt_device_entry_get_type(void);
 
-NmtNewtWidget *nmt_device_entry_new(const char *label, int width, GType hardware_type);
+NmtNewtWidget *nmt_device_entry_new(const char *label,
+                                    int         width,
+                                    GType       hardware_type,
+                                    gboolean    show_select_button);
 
 typedef gboolean (*NmtDeviceEntryDeviceFilter)(NmtDeviceEntry *deventry,
                                                NMDevice       *device,
diff --git a/src/nmtui/nmt-edit-connection-list.c b/src/nmtui/nmt-edit-connection-list.c
index 1ea44007..45e6eb44 100644
--- a/src/nmtui/nmt-edit-connection-list.c
+++ b/src/nmtui/nmt-edit-connection-list.c
@@ -17,6 +17,7 @@
 #include "nmtui-edit.h"
 #include "nmt-edit-connection-list.h"
 #include "nmt-editor.h"
+#include "nmt-utils.h"
 
 #include "nm-editor-utils.h"
 
@@ -35,9 +36,14 @@ typedef struct {
     NmtNewtListbox   *listbox;
     NmtNewtButtonBox *buttons;
 
+    NmtSearch *search;
+    char      *filter_text;
+    int        match_count;
+
     NmtNewtWidget *add;
     NmtNewtWidget *edit;
     NmtNewtWidget *delete;
+    NmtNewtWidget *share;
     NmtNewtWidget *extra;
 } NmtEditConnectionListPrivate;
 
@@ -58,6 +64,7 @@ enum {
     ADD_CONNECTION,
     EDIT_CONNECTION,
     REMOVE_CONNECTION,
+    SHARE_CONNECTION,
 
     LAST_SIGNAL
 };
@@ -67,14 +74,19 @@ static guint signals[LAST_SIGNAL] = {0};
 static void add_clicked(NmtNewtButton *button, gpointer list);
 static void edit_clicked(NmtNewtButton *button, gpointer list);
 static void delete_clicked(NmtNewtButton *button, gpointer list);
+static void share_clicked(NmtNewtButton *button, gpointer list);
 static void listbox_activated(NmtNewtWidget *listbox, gpointer list);
+static void edit_search_apply(gpointer list, const char *text);
+static int  edit_search_count(gpointer list);
+static void update_share_sensitive(NmtEditConnectionList *list);
 
 static void
 nmt_edit_connection_list_init(NmtEditConnectionList *list)
 {
     NmtEditConnectionListPrivate *priv = NMT_EDIT_CONNECTION_LIST_GET_PRIVATE(list);
-    NmtNewtWidget                *listbox, *buttons;
+    NmtNewtWidget                *listbox, *buttons, *search_row, *search_label, *search;
     NmtNewtGrid                  *grid = NMT_NEWT_GRID(list);
+    NmtNewtGrid                  *search_grid;
 
     listbox       = g_object_new(NMT_TYPE_NEWT_LISTBOX,
                            "flags",
@@ -89,6 +101,32 @@ nmt_edit_connection_list_init(NmtEditConnectionList *list)
                             NMT_NEWT_GRID_FILL_X | NMT_NEWT_GRID_FILL_Y | NMT_NEWT_GRID_EXPAND_X
                                 | NMT_NEWT_GRID_EXPAND_Y);
     g_signal_connect(priv->listbox, "activated", G_CALLBACK(listbox_activated), list);
+    g_signal_connect_swapped(priv->listbox,
+                             "notify::active",
+                             G_CALLBACK(update_share_sensitive),
+                             list);
+
+    /* Search row below the listbox. The row is always present so revealing the
+     * entry does not resize the form; vim-style '/' shows the entry, and once a
+     * filter is applied the label reports it ("Matching '...' (N)"). */
+    search_row  = nmt_newt_grid_new();
+    search_grid = NMT_NEWT_GRID(search_row);
+    nmt_newt_grid_add(grid, search_row, 0, 1);
+    nmt_newt_grid_set_flags(grid, search_row, NMT_NEWT_GRID_FILL_X | NMT_NEWT_GRID_EXPAND_X);
+
+    search_label = nmt_newt_label_new("");
+    nmt_newt_grid_add(search_grid, search_label, 0, 0);
+
+    search = nmt_newt_entry_new(NMT_SEARCH_ENTRY_WIDTH, 0);
+    nmt_newt_grid_add(search_grid, search, 1, 0);
+    nmt_newt_widget_set_padding(search, 1, 0, 0, 0);
+
+    priv->search = nmt_search_new(NMT_NEWT_ENTRY(search),
+                                  NMT_NEWT_LABEL(search_label),
+                                  NMT_NEWT_WIDGET(priv->listbox),
+                                  edit_search_apply,
+                                  edit_search_count,
+                                  list);
 
     buttons       = nmt_newt_button_box_new(NMT_NEWT_BUTTON_BOX_VERTICAL);
     priv->buttons = NMT_NEWT_BUTTON_BOX(buttons);
@@ -106,6 +144,9 @@ nmt_edit_connection_list_init(NmtEditConnectionList *list)
 
     priv->delete = nmt_newt_button_box_add_start(priv->buttons, _("Delete"));
     g_signal_connect(priv->delete, "clicked", G_CALLBACK(delete_clicked), list);
+
+    priv->share = nmt_newt_button_box_add_start(priv->buttons, _("Share QR..."));
+    g_signal_connect(priv->share, "clicked", G_CALLBACK(share_clicked), list);
 }
 
 static int
@@ -157,7 +198,7 @@ nmt_edit_connection_list_rebuild(NmtEditConnectionList *list)
     gboolean                      did_header = FALSE, did_vpn = FALSE, did_any = FALSE;
     NMEditorConnectionTypeData  **types;
     NMConnection                 *conn, *selected_conn;
-    int                           i, row, selected_row;
+    int                           i, row, selected_row, n_matches = 0;
 
     selected_row  = nmt_newt_listbox_get_active(priv->listbox);
     selected_conn = nmt_newt_listbox_get_active_key(priv->listbox);
@@ -185,17 +226,21 @@ nmt_edit_connection_list_rebuild(NmtEditConnectionList *list)
 
     if (!priv->grouped) {
         /* Just add the connections in order */
-        for (iter = priv->connections, row = 0; iter; iter = iter->next, row++) {
+        for (iter = priv->connections, row = 0; iter; iter = iter->next) {
             conn = iter->data;
+            if (!nmt_utils_filter_match(nm_connection_get_id(conn), priv->filter_text))
+                continue;
             nmt_newt_listbox_append(priv->listbox, nm_connection_get_id(conn), conn);
             if (conn == selected_conn)
                 selected_row = row;
+            row++;
+            n_matches++;
         }
         if (selected_row >= row)
             selected_row = row - 1;
         nmt_newt_listbox_set_active(priv->listbox, selected_row);
 
-        did_any = !!priv->connections;
+        did_any = n_matches > 0;
 
         goto done;
     }
@@ -220,6 +265,8 @@ nmt_edit_connection_list_rebuild(NmtEditConnectionList *list)
                 continue;
             if (!nm_connection_is_type(conn, nm_setting_get_name(setting)))
                 continue;
+            if (!nmt_utils_filter_match(nm_connection_get_id(conn), priv->filter_text))
+                continue;
 
             if (!did_header) {
                 nmt_newt_listbox_append(priv->listbox, types[i]->name, NULL);
@@ -240,6 +287,7 @@ nmt_edit_connection_list_rebuild(NmtEditConnectionList *list)
             if (conn == selected_conn)
                 selected_row = row;
             row++;
+            n_matches++;
         }
     }
 
@@ -248,8 +296,12 @@ nmt_edit_connection_list_rebuild(NmtEditConnectionList *list)
     nmt_newt_listbox_set_active(priv->listbox, selected_row);
 
 done:
+    priv->match_count = n_matches;
+    if (priv->search)
+        nmt_search_update_label(priv->search);
     nmt_newt_component_set_sensitive(NMT_NEWT_COMPONENT(priv->edit), did_any);
     nmt_newt_component_set_sensitive(NMT_NEWT_COMPONENT(priv->delete), did_any);
+    update_share_sensitive(list);
 }
 
 static void
@@ -308,6 +360,29 @@ delete_clicked(NmtNewtButton *button, gpointer list)
 }
 
 static void
+share_clicked(NmtNewtButton *button, gpointer list)
+{
+    NmtEditConnectionListPrivate *priv = NMT_EDIT_CONNECTION_LIST_GET_PRIVATE(list);
+    NMConnection                 *connection;
+
+    connection = nmt_newt_listbox_get_active_key(priv->listbox);
+    g_return_if_fail(connection != NULL);
+
+    g_signal_emit(list, signals[SHARE_CONNECTION], 0, connection);
+}
+
+static void
+update_share_sensitive(NmtEditConnectionList *list)
+{
+    NmtEditConnectionListPrivate *priv = NMT_EDIT_CONNECTION_LIST_GET_PRIVATE(list);
+    NMConnection                 *connection;
+
+    connection = nmt_newt_listbox_get_active_key(priv->listbox);
+    nmt_newt_component_set_sensitive(NMT_NEWT_COMPONENT(priv->share),
+                                     connection && nm_connection_get_setting_wireless(connection));
+}
+
+static void
 listbox_activated(NmtNewtWidget *listbox, gpointer list)
 {
     NmtEditConnectionListPrivate *priv = NMT_EDIT_CONNECTION_LIST_GET_PRIVATE(list);
@@ -316,6 +391,31 @@ listbox_activated(NmtNewtWidget *listbox, gpointer list)
 }
 
 static void
+edit_search_apply(gpointer list, const char *text)
+{
+    NmtEditConnectionListPrivate *priv = NMT_EDIT_CONNECTION_LIST_GET_PRIVATE(list);
+
+    if (nm_streq0(text, priv->filter_text))
+        return;
+
+    g_free(priv->filter_text);
+    priv->filter_text = g_strdup(text);
+    nmt_edit_connection_list_rebuild(list);
+}
+
+static int
+edit_search_count(gpointer list)
+{
+    return NMT_EDIT_CONNECTION_LIST_GET_PRIVATE(list)->match_count;
+}
+
+void
+nmt_edit_connection_list_bind_search(NmtEditConnectionList *list, NmtNewtForm *form)
+{
+    nmt_search_bind_form(NMT_EDIT_CONNECTION_LIST_GET_PRIVATE(list)->search, form);
+}
+
+static void
 connection_saved(GObject *conn, GAsyncResult *result, gpointer user_data)
 {
     nm_remote_connection_save_finish(NM_REMOTE_CONNECTION(conn), result, NULL);
@@ -348,6 +448,8 @@ nmt_edit_connection_list_finalize(GObject *object)
 
     free_connections(NMT_EDIT_CONNECTION_LIST(object));
     g_clear_object(&priv->extra);
+    nm_clear_pointer(&priv->search, g_free);
+    nm_clear_g_free(&priv->filter_text);
 
     G_OBJECT_CLASS(nmt_edit_connection_list_parent_class)->finalize(object);
 }
@@ -490,6 +592,25 @@ nmt_edit_connection_list_class_init(NmtEditConnectionListClass *list_class)
                      1,
                      NM_TYPE_CONNECTION);
 
+    /**
+     * NmtEditConnectionList::share-connection:
+     * @list: the #NmtEditConnectionList
+     * @connection: the connection to share
+     *
+     * Emitted when the user clicks the list's "Share QR..." button.
+     */
+    signals[SHARE_CONNECTION] =
+        g_signal_new("share-connection",
+                     G_OBJECT_CLASS_TYPE(object_class),
+                     G_SIGNAL_RUN_FIRST,
+                     G_STRUCT_OFFSET(NmtEditConnectionListClass, share_connection),
+                     NULL,
+                     NULL,
+                     NULL,
+                     G_TYPE_NONE,
+                     1,
+                     NM_TYPE_CONNECTION);
+
     /* properties */
 
     /**
diff --git a/src/nmtui/nmt-edit-connection-list.h b/src/nmtui/nmt-edit-connection-list.h
index 0d23f8b1..1ae91d5f 100644
--- a/src/nmtui/nmt-edit-connection-list.h
+++ b/src/nmtui/nmt-edit-connection-list.h
@@ -32,6 +32,7 @@ typedef struct {
     void (*add_connection)(NmtEditConnectionList *list);
     void (*edit_connection)(NmtEditConnectionList *list, NMConnection *connection);
     void (*remove_connection)(NmtEditConnectionList *list, NMRemoteConnection *connection);
+    void (*share_connection)(NmtEditConnectionList *list, NMConnection *connection);
 } NmtEditConnectionListClass;
 
 GType nmt_edit_connection_list_get_type(void);
@@ -42,4 +43,6 @@ typedef gboolean (*NmtEditConnectionListFilter)(NmtEditConnectionList *list,
 
 void nmt_edit_connection_list_recommit(NmtEditConnectionList *list);
 
+void nmt_edit_connection_list_bind_search(NmtEditConnectionList *list, NmtNewtForm *form);
+
 #endif /* NMT_EDIT_CONNECTION_LIST_H */
diff --git a/src/nmtui/nmt-editor-grid.c b/src/nmtui/nmt-editor-grid.c
index bdcc02e2..21d362c4 100644
--- a/src/nmtui/nmt-editor-grid.c
+++ b/src/nmtui/nmt-editor-grid.c
@@ -244,8 +244,10 @@ nmt_editor_grid_get_components(NmtNewtWidget *widget)
 
         if (rows[i].extra) {
             child_cos = nmt_newt_widget_get_components(rows[i].extra);
-            for (c = 0; child_cos[c]; c++)
-                g_ptr_array_add(cos, child_cos[c]);
+            if (child_cos) {
+                for (c = 0; child_cos[c]; c++)
+                    g_ptr_array_add(cos, child_cos[c]);
+            }
             g_free(child_cos);
         }
     }
diff --git a/src/nmtui/nmt-editor.c b/src/nmtui/nmt-editor.c
index 474d08c2..b9f25ad0 100644
--- a/src/nmtui/nmt-editor.c
+++ b/src/nmtui/nmt-editor.c
@@ -14,6 +14,7 @@
 
 #include "nmt-editor.h"
 
+#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 #include "nm-utils.h"
 
 #include "nmtui.h"
@@ -153,10 +154,16 @@ save_connection_and_exit(NmtNewtButton *button, gpointer user_data)
     NmtEditor        *editor = user_data;
     NmtEditorPrivate *priv   = NMT_EDITOR_GET_PRIVATE(editor);
     NmtSyncOp         op;
-    GError           *error = NULL;
+    GError           *error      = NULL;
+    gs_free char     *gw_warning = NULL;
 
     nm_connection_replace_settings_from_connection(priv->orig_connection, priv->edit_connection);
 
+    gw_warning = nm_connection_get_unreachable_gateways_warning(priv->orig_connection, TRUE);
+    if (gw_warning) {
+        nmt_newt_message_dialog(_("Warning: %s"), gw_warning);
+    }
+
     nmt_sync_op_init(&op);
     if (NM_IS_REMOTE_CONNECTION(priv->orig_connection)) {
         nm_remote_connection_commit_changes_async(NM_REMOTE_CONNECTION(priv->orig_connection),
@@ -194,19 +201,6 @@ save_connection_and_exit(NmtNewtButton *button, gpointer user_data)
     nmt_newt_form_quit(NMT_NEWT_FORM(editor));
 }
 
-static void
-got_secrets(GObject *object, GAsyncResult *result, gpointer op)
-{
-    GVariant *secrets;
-    GError   *error = NULL;
-
-    secrets = nm_remote_connection_get_secrets_finish(NM_REMOTE_CONNECTION(object), result, &error);
-    if (secrets)
-        g_variant_ref(secrets);
-    nmt_sync_op_complete_pointer(op, secrets, error);
-    g_clear_error(&error);
-}
-
 static NMConnection *
 build_edit_connection(NMConnection *orig_connection)
 {
@@ -214,7 +208,6 @@ build_edit_connection(NMConnection *orig_connection)
     GVariant     *settings, *secrets;
     GVariantIter  iter;
     const char   *setting_name;
-    NmtSyncOp     op;
 
     edit_connection = nm_simple_connection_new_clone(orig_connection);
 
@@ -227,14 +220,8 @@ build_edit_connection(NMConnection *orig_connection)
         if (!nm_meta_setting_info_editor_has_secrets(
                 nm_meta_setting_info_editor_find_by_name(setting_name, FALSE)))
             continue;
-        nmt_sync_op_init(&op);
-        nm_remote_connection_get_secrets_async(NM_REMOTE_CONNECTION(orig_connection),
-                                               setting_name,
-                                               NULL,
-                                               got_secrets,
-                                               &op);
         /* FIXME: error handling */
-        secrets = nmt_sync_op_wait_pointer(&op, NULL);
+        secrets = nmt_sync_get_secrets(NM_REMOTE_CONNECTION(orig_connection), setting_name, NULL);
         if (secrets) {
             (void) nm_connection_update_secrets(edit_connection, setting_name, secrets, NULL);
             g_variant_unref(secrets);
@@ -310,6 +297,7 @@ nmt_editor_constructed(GObject *object)
     GType                hardware_type;
     const char          *port_type;
     NmtEditorPage       *page;
+    gboolean             show_select_button;
 
     if (G_OBJECT_CLASS(nmt_editor_parent_class)->constructed)
         G_OBJECT_CLASS(nmt_editor_parent_class)->constructed(object);
@@ -333,10 +321,13 @@ nmt_editor_constructed(GObject *object)
                            G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
     nmt_editor_grid_append(grid, _("Profile name"), widget, NULL);
 
-    if (priv->type_data->virtual)
-        hardware_type = G_TYPE_NONE;
-    else
-        hardware_type = priv->type_data->device_type;
+    if (priv->type_data->virtual) {
+        hardware_type      = G_TYPE_NONE;
+        show_select_button = FALSE;
+    } else {
+        hardware_type      = priv->type_data->device_type;
+        show_select_button = TRUE;
+    }
 
     if (nm_connection_is_type(priv->edit_connection, NM_SETTING_LOOPBACK_SETTING_NAME)) {
         g_object_set(s_con, NM_SETTING_CONNECTION_INTERFACE_NAME, "lo", NULL);
@@ -349,7 +340,7 @@ nmt_editor_constructed(GObject *object)
         else
             deventry_label = _("Device");
 
-        widget = nmt_device_entry_new(deventry_label, 40, hardware_type);
+        widget = nmt_device_entry_new(deventry_label, 40, hardware_type, show_select_button);
         nmt_editor_grid_append(grid, NULL, widget, NULL);
         deventry = NMT_DEVICE_ENTRY(widget);
         g_object_bind_property(s_con,
diff --git a/src/nmtui/nmt-address-list.c b/src/nmtui/nmt-list.c
index ff4bf1a4..3058638a 100644
--- a/src/nmtui/nmt-address-list.c
+++ b/src/nmtui/nmt-list.c
@@ -4,20 +4,19 @@
  */
 
 /**
- * SECTION:nmt-address-list
- * @short_description: An editable list of IP addresses or hostnames
+ * SECTION:nmt-list
+ * @short_description: An editable list of IP addresses, hostnames, or key=value pairs
  *
- * #NmtAddressList is a subclass of #NmtWidgetList that contains
- * entries displaying IP addresses, address/prefix strings, or
- * hostnames. This is designed for binding its #NmtAddressList:strings
- * property to an appropriate #NMSettingIP4Config or
- * #NMSettingIP6Config property via one of the nm-editor-bindings
- * functions.
+ * #NmtList is a subclass of #NmtWidgetList that contains
+ * entries displaying IP addresses, address/prefix strings,
+ * hostnames, or key=value pairs. This is designed for binding its
+ * #NmtList:strings property to an appropriate property via one
+ * of the nm-editor-bindings functions.
  */
 
 #include "libnm-client-aux-extern/nm-default-client.h"
 
-#include "nmt-address-list.h"
+#include "nmt-list.h"
 
 #include <arpa/inet.h>
 #include <netinet/in.h>
@@ -25,15 +24,14 @@
 
 #include "nmt-ip-entry.h"
 
-G_DEFINE_TYPE(NmtAddressList, nmt_address_list, NMT_TYPE_WIDGET_LIST)
+G_DEFINE_TYPE(NmtList, nmt_list, NMT_TYPE_WIDGET_LIST)
 
-#define NMT_ADDRESS_LIST_GET_PRIVATE(o) \
-    (G_TYPE_INSTANCE_GET_PRIVATE((o), NMT_TYPE_ADDRESS_LIST, NmtAddressListPrivate))
+#define NMT_LIST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), NMT_TYPE_LIST, NmtListPrivate))
 
 typedef struct {
-    NmtAddressListType list_type;
-    char             **strings;
-} NmtAddressListPrivate;
+    NmtListType list_type;
+    char      **strings;
+} NmtListPrivate;
 
 enum {
     PROP_0,
@@ -44,32 +42,32 @@ enum {
 };
 
 /**
- * NmtAddressListType:
- * @NMT_ADDRESS_LIST_IP4_WITH_PREFIX: IPv4 address/prefix strings
- * @NMT_ADDRESS_LIST_IP4: IPv4 addresses
- * @NMT_ADDRESS_LIST_IP6_WITH_PREFIX: IPv6 address/prefix strings
- * @NMT_ADDRESS_LIST_IP6: IPv6 addresses
- * @NMT_ADDRESS_LIST_HOSTNAME: hostnames
+ * NmtListType:
+ * @NMT_LIST_IP4_WITH_PREFIX: IPv4 address/prefix strings
+ * @NMT_LIST_IP4: IPv4 addresses
+ * @NMT_LIST_IP6_WITH_PREFIX: IPv6 address/prefix strings
+ * @NMT_LIST_IP6: IPv6 addresses
+ * @NMT_LIST_HOSTNAME: hostnames
  *
- * The type of address in an #NmtAddressList
+ * The type of address in an #NmtList
  */
 
 /**
- * nmt_address_list_new:
+ * nmt_list_new:
  * @list_type: the type of address the list will contain
  *
- * Creates a new #NmtAddressList
+ * Creates a new #NmtList
  *
- * Returns: a new #NmtAddressList
+ * Returns: a new #NmtList
  */
 NmtNewtWidget *
-nmt_address_list_new(NmtAddressListType list_type)
+nmt_list_new(NmtListType list_type)
 {
-    return g_object_new(NMT_TYPE_ADDRESS_LIST, "list-type", list_type, NULL);
+    return g_object_new(NMT_TYPE_LIST, "list-type", list_type, NULL);
 }
 
 static void
-nmt_address_list_init(NmtAddressList *list)
+nmt_list_init(NmtList *list)
 {}
 
 static gboolean
@@ -95,9 +93,9 @@ strings_transform_from_entry(GBinding     *binding,
                              GValue       *target_value,
                              gpointer      user_data)
 {
-    NmtAddressList        *list = NMT_ADDRESS_LIST(g_binding_get_source(binding));
-    NmtAddressListPrivate *priv = NMT_ADDRESS_LIST_GET_PRIVATE(list);
-    int                    n    = GPOINTER_TO_INT(user_data);
+    NmtList        *list = NMT_LIST(g_binding_get_source(binding));
+    NmtListPrivate *priv = NMT_LIST_GET_PRIVATE(list);
+    int             n    = GPOINTER_TO_INT(user_data);
 
     if (n >= g_strv_length(priv->strings))
         return FALSE;
@@ -112,26 +110,41 @@ strings_transform_from_entry(GBinding     *binding,
 static gboolean
 hostname_filter(NmtNewtEntry *entry, const char *text, int ch, int position, gpointer user_data)
 {
-    return g_ascii_isalnum(ch) || ch == '.' || ch == '-';
+    return g_ascii_isalnum(ch) || ch == '.' || ch == '-' || ch == '~';
+}
+
+static gboolean
+key_value_validate(NmtNewtEntry *entry, const char *text, gpointer user_data)
+{
+    const char *val;
+
+    if (!text || !text[0])
+        return TRUE;
+
+    val = strchr(text, '=');
+    return val && val != text && val[1];
 }
 
 static NmtNewtWidget *
-nmt_address_list_create_widget(NmtWidgetList *list, int num)
+nmt_list_create_widget(NmtWidgetList *list, int num)
 {
-    NmtAddressListPrivate *priv = NMT_ADDRESS_LIST_GET_PRIVATE(list);
-    NmtNewtWidget         *entry;
+    NmtListPrivate *priv = NMT_LIST_GET_PRIVATE(list);
+    NmtNewtWidget  *entry;
 
-    if (priv->list_type == NMT_ADDRESS_LIST_IP4_WITH_PREFIX) {
+    if (priv->list_type == NMT_LIST_IP4_WITH_PREFIX) {
         entry = nmt_ip_entry_new(25, AF_INET, TRUE, FALSE);
-    } else if (priv->list_type == NMT_ADDRESS_LIST_IP4) {
+    } else if (priv->list_type == NMT_LIST_IP4) {
         entry = nmt_ip_entry_new(25, AF_INET, FALSE, FALSE);
-    } else if (priv->list_type == NMT_ADDRESS_LIST_IP6_WITH_PREFIX) {
+    } else if (priv->list_type == NMT_LIST_IP6_WITH_PREFIX) {
         entry = nmt_ip_entry_new(25, AF_INET6, TRUE, FALSE);
-    } else if (priv->list_type == NMT_ADDRESS_LIST_IP6) {
+    } else if (priv->list_type == NMT_LIST_IP6) {
         entry = nmt_ip_entry_new(25, AF_INET6, FALSE, FALSE);
-    } else if (priv->list_type == NMT_ADDRESS_LIST_HOSTNAME) {
+    } else if (priv->list_type == NMT_LIST_HOSTNAME) {
         entry = nmt_newt_entry_new(25, NMT_NEWT_ENTRY_NONEMPTY);
         nmt_newt_entry_set_filter(NMT_NEWT_ENTRY(entry), hostname_filter, list);
+    } else if (priv->list_type == NMT_LIST_KEY_VALUE) {
+        entry = nmt_newt_entry_new(40, 0);
+        nmt_newt_entry_set_validator(NMT_NEWT_ENTRY(entry), key_value_validate, NULL);
     } else {
         g_return_val_if_reached(NULL);
     }
@@ -150,10 +163,10 @@ nmt_address_list_create_widget(NmtWidgetList *list, int num)
 }
 
 static void
-nmt_address_list_add_clicked(NmtWidgetList *list)
+nmt_list_add_clicked(NmtWidgetList *list)
 {
-    NmtAddressListPrivate *priv = NMT_ADDRESS_LIST_GET_PRIVATE(list);
-    int                    len;
+    NmtListPrivate *priv = NMT_LIST_GET_PRIVATE(list);
+    int             len;
 
     len                    = priv->strings ? g_strv_length(priv->strings) : 0;
     priv->strings          = g_renew(char *, priv->strings, len + 2);
@@ -165,10 +178,10 @@ nmt_address_list_add_clicked(NmtWidgetList *list)
 }
 
 static void
-nmt_address_list_remove_clicked(NmtWidgetList *list, int num)
+nmt_list_remove_clicked(NmtWidgetList *list, int num)
 {
-    NmtAddressListPrivate *priv = NMT_ADDRESS_LIST_GET_PRIVATE(list);
-    int                    len;
+    NmtListPrivate *priv = NMT_LIST_GET_PRIVATE(list);
+    int             len;
 
     len = g_strv_length(priv->strings);
     g_free(priv->strings[num]);
@@ -179,12 +192,9 @@ nmt_address_list_remove_clicked(NmtWidgetList *list, int num)
 }
 
 static void
-nmt_address_list_set_property(GObject      *object,
-                              guint         prop_id,
-                              const GValue *value,
-                              GParamSpec   *pspec)
+nmt_list_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
 {
-    NmtAddressListPrivate *priv = NMT_ADDRESS_LIST_GET_PRIVATE(object);
+    NmtListPrivate *priv = NMT_LIST_GET_PRIVATE(object);
 
     switch (prop_id) {
     case PROP_LIST_TYPE:
@@ -204,9 +214,9 @@ nmt_address_list_set_property(GObject      *object,
 }
 
 static void
-nmt_address_list_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+nmt_list_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
-    NmtAddressListPrivate *priv = NMT_ADDRESS_LIST_GET_PRIVATE(object);
+    NmtListPrivate *priv = NMT_LIST_GET_PRIVATE(object);
 
     switch (prop_id) {
     case PROP_LIST_TYPE:
@@ -222,23 +232,23 @@ nmt_address_list_get_property(GObject *object, guint prop_id, GValue *value, GPa
 }
 
 static void
-nmt_address_list_class_init(NmtAddressListClass *list_class)
+nmt_list_class_init(NmtListClass *list_class)
 {
     GObjectClass       *object_class      = G_OBJECT_CLASS(list_class);
     NmtWidgetListClass *widget_list_class = NMT_WIDGET_LIST_CLASS(list_class);
 
-    g_type_class_add_private(list_class, sizeof(NmtAddressListPrivate));
+    g_type_class_add_private(list_class, sizeof(NmtListPrivate));
 
     /* virtual methods */
-    object_class->set_property = nmt_address_list_set_property;
-    object_class->get_property = nmt_address_list_get_property;
+    object_class->set_property = nmt_list_set_property;
+    object_class->get_property = nmt_list_get_property;
 
-    widget_list_class->create_widget  = nmt_address_list_create_widget;
-    widget_list_class->add_clicked    = nmt_address_list_add_clicked;
-    widget_list_class->remove_clicked = nmt_address_list_remove_clicked;
+    widget_list_class->create_widget  = nmt_list_create_widget;
+    widget_list_class->add_clicked    = nmt_list_add_clicked;
+    widget_list_class->remove_clicked = nmt_list_remove_clicked;
 
     /**
-     * NmtAddressList:list-type:
+     * NmtList:list-type:
      *
      * The type of address the list holds.
      */
@@ -253,7 +263,7 @@ nmt_address_list_class_init(NmtAddressListClass *list_class)
                           0,
                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
     /**
-     * NmtAddressList:strings:
+     * NmtList:strings:
      *
      * The strings in the list's entries.
      */
diff --git a/src/nmtui/nmt-list.h b/src/nmtui/nmt-list.h
new file mode 100644
index 00000000..65def938
--- /dev/null
+++ b/src/nmtui/nmt-list.h
@@ -0,0 +1,41 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2013 Red Hat, Inc.
+ */
+
+#ifndef NMT_LIST_H
+#define NMT_LIST_H
+
+#include "nmt-widget-list.h"
+
+#define NMT_TYPE_LIST            (nmt_list_get_type())
+#define NMT_LIST(obj)            (_NM_G_TYPE_CHECK_INSTANCE_CAST((obj), NMT_TYPE_LIST, NmtList))
+#define NMT_LIST_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), NMT_TYPE_LIST, NmtListClass))
+#define NMT_IS_LIST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), NMT_TYPE_LIST))
+#define NMT_IS_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NMT_TYPE_LIST))
+#define NMT_LIST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), NMT_TYPE_LIST, NmtListClass))
+
+typedef struct {
+    NmtWidgetList parent;
+
+} NmtList;
+
+typedef struct {
+    NmtWidgetListClass parent;
+
+} NmtListClass;
+
+GType nmt_list_get_type(void);
+
+typedef enum {
+    NMT_LIST_IP4_WITH_PREFIX,
+    NMT_LIST_IP4,
+    NMT_LIST_IP6_WITH_PREFIX,
+    NMT_LIST_IP6,
+    NMT_LIST_HOSTNAME,
+    NMT_LIST_KEY_VALUE
+} NmtListType;
+
+NmtNewtWidget *nmt_list_new(NmtListType list_type);
+
+#endif /* NMT_LIST_H */
diff --git a/src/nmtui/nmt-page-bond.c b/src/nmtui/nmt-page-bond.c
index f74bac27..eeea0b0b 100644
--- a/src/nmtui/nmt-page-bond.c
+++ b/src/nmtui/nmt-page-bond.c
@@ -21,7 +21,7 @@
 
 #include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 #include "nmt-mac-entry.h"
-#include "nmt-address-list.h"
+#include "nmt-list.h"
 #include "nmt-port-list.h"
 
 G_DEFINE_TYPE(NmtPageBond, nmt_page_bond, NMT_TYPE_EDITOR_PAGE_DEVICE)
@@ -41,14 +41,15 @@ typedef struct {
     /* Note: when adding new options to the UI also ensure they are
      * initialized in bond_connection_setup_func()
      */
-    NmtNewtPopup   *mode;
-    NmtNewtEntry   *primary;
-    NmtNewtPopup   *monitoring;
-    NmtNewtEntry   *miimon;
-    NmtNewtEntry   *updelay;
-    NmtNewtEntry   *downdelay;
-    NmtNewtEntry   *arp_interval;
-    NmtAddressList *arp_ip_target;
+    NmtNewtPopup *mode;
+    NmtNewtEntry *primary;
+    NmtNewtPopup *monitoring;
+    NmtNewtEntry *miimon;
+    NmtNewtEntry *updelay;
+    NmtNewtEntry *downdelay;
+    NmtNewtEntry *arp_interval;
+    NmtList      *arp_ip_target;
+    NmtList      *other_options;
 
     NmtPageBondMonitoringMode monitoring_mode;
 
@@ -63,6 +64,45 @@ static void arp_ip_target_widget_changed(GObject *object, GParamSpec *pspec, gpo
 
 /*****************************************************************************/
 
+static gboolean
+_is_other_option(const char *option)
+{
+    return !NM_IN_STRSET(option,
+                         NM_SETTING_BOND_OPTION_MODE,
+                         NM_SETTING_BOND_OPTION_PRIMARY,
+                         NM_SETTING_BOND_OPTION_MIIMON,
+                         NM_SETTING_BOND_OPTION_UPDELAY,
+                         NM_SETTING_BOND_OPTION_DOWNDELAY,
+                         NM_SETTING_BOND_OPTION_ARP_INTERVAL,
+                         NM_SETTING_BOND_OPTION_ARP_IP_TARGET);
+}
+
+static void
+_bond_update_other_options(NMSettingBond *s_bond, NmtList *list)
+{
+    gs_unref_ptrarray GPtrArray *arr      = g_ptr_array_new_with_free_func(g_free);
+    guint                        num_opts = nm_setting_bond_get_num_options(s_bond);
+    guint                        i;
+
+    for (i = 0; i < num_opts; i++) {
+        const char *opt_name;
+        const char *opt_value;
+        gboolean    ret;
+
+        ret = nm_setting_bond_get_option(s_bond, i, &opt_name, &opt_value);
+        nm_assert(ret);
+
+        if (_is_other_option(opt_name)) {
+            g_ptr_array_add(arr, g_strdup_printf("%s=%s", opt_name, opt_value));
+        }
+    }
+
+    g_ptr_array_add(arr, NULL);
+    g_object_set(G_OBJECT(list), "strings", arr->pdata, NULL);
+}
+
+/*****************************************************************************/
+
 NmtEditorPage *
 nmt_page_bond_new(NMConnection *conn, NmtDeviceEntry *deventry)
 {
@@ -155,6 +195,8 @@ bond_options_changed(GObject *object, GParamSpec *pspec, gpointer user_data)
     nmt_newt_widget_set_visible(NMT_NEWT_WIDGET(priv->arp_interval), !visible_mii);
     nmt_newt_widget_set_visible(NMT_NEWT_WIDGET(priv->arp_ip_target), !visible_mii);
 
+    _bond_update_other_options(s_bond, priv->other_options);
+
     priv->updating = FALSE;
 }
 
@@ -308,6 +350,49 @@ arp_ip_target_widget_changed(GObject *object, GParamSpec *pspec, gpointer user_d
     g_strfreev(ips);
 }
 
+static void
+other_options_widget_changed(GObject *object, GParamSpec *pspec, gpointer user_data)
+{
+    NmtPageBond        *bond          = NMT_PAGE_BOND(user_data);
+    NmtPageBondPrivate *priv          = NMT_PAGE_BOND_GET_PRIVATE(bond);
+    gs_strfreev char  **other_options = NULL;
+    const char         *name;
+    gboolean            ret;
+    guint               num;
+    guint               i;
+
+    if (priv->updating)
+        return;
+
+    priv->updating = TRUE;
+
+    g_object_get(G_OBJECT(priv->other_options), "strings", &other_options, NULL);
+
+again:
+    num = nm_setting_bond_get_num_options(priv->s_bond);
+    for (i = 0; i < num; i++) {
+        ret = nm_setting_bond_get_option(priv->s_bond, i, &name, NULL);
+        nm_assert(ret);
+
+        if (_is_other_option(name)) {
+            nm_setting_bond_remove_option(priv->s_bond, name);
+            goto again;
+        }
+    }
+
+    for (i = 0; other_options && other_options[i]; i++) {
+        char *val = strchr(other_options[i], '=');
+
+        if (val && val != other_options[i] && val[1]) {
+            *val = '\0';
+            if (_is_other_option(other_options[i]))
+                nm_setting_bond_add_option(priv->s_bond, other_options[i], val + 1);
+        }
+    }
+
+    priv->updating = FALSE;
+}
+
 static gboolean
 bond_connection_type_filter(GType connection_type, gpointer user_data)
 {
@@ -390,10 +475,15 @@ nmt_page_bond_constructed(GObject *object)
     nmt_editor_grid_append(grid, _("Monitoring frequency"), widget, label);
     priv->arp_interval = NMT_NEWT_ENTRY(widget);
 
-    widget = nmt_address_list_new(NMT_ADDRESS_LIST_IP4);
+    widget = nmt_list_new(NMT_LIST_IP4);
     g_signal_connect(widget, "notify::strings", G_CALLBACK(arp_ip_target_widget_changed), bond);
     nmt_editor_grid_append(grid, _("ARP targets"), widget, NULL);
-    priv->arp_ip_target = NMT_ADDRESS_LIST(widget);
+    priv->arp_ip_target = NMT_LIST(widget);
+
+    widget = nmt_list_new(NMT_LIST_KEY_VALUE);
+    g_signal_connect(widget, "notify::strings", G_CALLBACK(other_options_widget_changed), bond);
+    nmt_editor_grid_append(grid, _("Other options (key=value)"), widget, NULL);
+    priv->other_options = NMT_LIST(widget);
 
     widget = nmt_mac_entry_new(40, ETH_ALEN, NMT_MAC_ENTRY_TYPE_CLONED_ETHERNET);
     g_object_bind_property(s_wired,
diff --git a/src/nmtui/nmt-page-bridge.c b/src/nmtui/nmt-page-bridge.c
index da765b14..97c444be 100644
--- a/src/nmtui/nmt-page-bridge.c
+++ b/src/nmtui/nmt-page-bridge.c
@@ -13,7 +13,7 @@
 #include "nmt-page-bridge.h"
 
 #include "libnm-core-aux-intern/nm-libnm-core-utils.h"
-#include "nmt-address-list.h"
+#include "nmt-list.h"
 #include "nmt-port-list.h"
 
 G_DEFINE_TYPE(NmtPageBridge, nmt_page_bridge, NMT_TYPE_EDITOR_PAGE_DEVICE)
diff --git a/src/nmtui/nmt-page-ip-tunnel.c b/src/nmtui/nmt-page-ip-tunnel.c
index c74037b6..4932c0dc 100644
--- a/src/nmtui/nmt-page-ip-tunnel.c
+++ b/src/nmtui/nmt-page-ip-tunnel.c
@@ -127,7 +127,7 @@ nmt_page_ip_tunnel_constructed(GObject *object)
                                          w2s);
     nmt_editor_grid_append(grid, _("Mode"), widget, NULL);
 
-    widget = parent = nmt_device_entry_new(_("Parent"), 40, G_TYPE_NONE);
+    widget = parent = nmt_device_entry_new(_("Parent"), 40, G_TYPE_NONE, FALSE);
     g_object_bind_property(s_ip_tunnel,
                            NM_SETTING_IP_TUNNEL_PARENT,
                            widget,
diff --git a/src/nmtui/nmt-page-ip4.c b/src/nmtui/nmt-page-ip4.c
index 4d01b356..ebbc7682 100644
--- a/src/nmtui/nmt-page-ip4.c
+++ b/src/nmtui/nmt-page-ip4.c
@@ -16,7 +16,7 @@
 
 #include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 #include "nmt-ip-entry.h"
-#include "nmt-address-list.h"
+#include "nmt-list.h"
 #include "nmt-route-editor.h"
 
 #include "nm-editor-bindings.h"
@@ -112,7 +112,7 @@ nmt_page_ip4_constructed(GObject *object)
     section = nmt_editor_section_new(_("IPv4 CONFIGURATION"), widget, show_by_default);
     grid    = nmt_editor_section_get_body(section);
 
-    widget = nmt_address_list_new(NMT_ADDRESS_LIST_IP4_WITH_PREFIX);
+    widget = nmt_list_new(NMT_LIST_IP4_WITH_PREFIX);
     nm_editor_bind_ip_addresses_with_prefix_to_strv(AF_INET,
                                                     s_ip4,
                                                     NM_SETTING_IP_CONFIG_ADDRESSES,
@@ -131,7 +131,7 @@ nmt_page_ip4_constructed(GObject *object)
                                         G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
     nmt_editor_grid_append(grid, _("Gateway"), widget, NULL);
 
-    widget = nmt_address_list_new(NMT_ADDRESS_LIST_IP4);
+    widget = nmt_list_new(NMT_LIST_IP4);
     nm_editor_bind_ip_addresses_to_strv(AF_INET,
                                         s_ip4,
                                         NM_SETTING_IP_CONFIG_DNS,
@@ -140,7 +140,7 @@ nmt_page_ip4_constructed(GObject *object)
                                         G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
     nmt_editor_grid_append(grid, _("DNS servers"), widget, NULL);
 
-    widget = nmt_address_list_new(NMT_ADDRESS_LIST_HOSTNAME);
+    widget = nmt_list_new(NMT_LIST_HOSTNAME);
     g_object_bind_property(s_ip4,
                            NM_SETTING_IP_CONFIG_DNS_SEARCH,
                            widget,
diff --git a/src/nmtui/nmt-page-ip6.c b/src/nmtui/nmt-page-ip6.c
index bd29a3a7..c0dc88f3 100644
--- a/src/nmtui/nmt-page-ip6.c
+++ b/src/nmtui/nmt-page-ip6.c
@@ -16,7 +16,7 @@
 
 #include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 #include "nmt-ip-entry.h"
-#include "nmt-address-list.h"
+#include "nmt-list.h"
 #include "nmt-route-editor.h"
 
 #include "nm-editor-bindings.h"
@@ -114,7 +114,7 @@ nmt_page_ip6_constructed(GObject *object)
     section = nmt_editor_section_new(_("IPv6 CONFIGURATION"), widget, show_by_default);
     grid    = nmt_editor_section_get_body(section);
 
-    widget = nmt_address_list_new(NMT_ADDRESS_LIST_IP6_WITH_PREFIX);
+    widget = nmt_list_new(NMT_LIST_IP6_WITH_PREFIX);
     nm_editor_bind_ip_addresses_with_prefix_to_strv(AF_INET6,
                                                     s_ip6,
                                                     NM_SETTING_IP_CONFIG_ADDRESSES,
@@ -133,7 +133,7 @@ nmt_page_ip6_constructed(GObject *object)
                                         G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
     nmt_editor_grid_append(grid, _("Gateway"), widget, NULL);
 
-    widget = nmt_address_list_new(NMT_ADDRESS_LIST_IP6);
+    widget = nmt_list_new(NMT_LIST_IP6);
     nm_editor_bind_ip_addresses_to_strv(AF_INET6,
                                         s_ip6,
                                         NM_SETTING_IP_CONFIG_DNS,
@@ -142,7 +142,7 @@ nmt_page_ip6_constructed(GObject *object)
                                         G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
     nmt_editor_grid_append(grid, _("DNS servers"), widget, NULL);
 
-    widget = nmt_address_list_new(NMT_ADDRESS_LIST_HOSTNAME);
+    widget = nmt_list_new(NMT_LIST_HOSTNAME);
     g_object_bind_property(s_ip6,
                            NM_SETTING_IP_CONFIG_DNS_SEARCH,
                            widget,
diff --git a/src/nmtui/nmt-page-macsec.c b/src/nmtui/nmt-page-macsec.c
index 6a017486..cd6a5494 100644
--- a/src/nmtui/nmt-page-macsec.c
+++ b/src/nmtui/nmt-page-macsec.c
@@ -99,7 +99,7 @@ nmt_page_macsec_constructed(GObject *object)
     section = nmt_editor_section_new(_("MACsec"), NULL, TRUE);
     grid    = nmt_editor_section_get_body(section);
 
-    widget = nmt_device_entry_new(_("Parent device"), 40, G_TYPE_NONE);
+    widget = nmt_device_entry_new(_("Parent device"), 40, G_TYPE_NONE, FALSE);
     g_object_bind_property(s_macsec,
                            NM_SETTING_MACSEC_PARENT,
                            widget,
diff --git a/src/nmtui/nmt-page-vlan.c b/src/nmtui/nmt-page-vlan.c
index 238dbafb..64c10ef7 100644
--- a/src/nmtui/nmt-page-vlan.c
+++ b/src/nmtui/nmt-page-vlan.c
@@ -59,7 +59,7 @@ nmt_page_vlan_constructed(GObject *object)
 
     nm_editor_bind_vlan_name(s_vlan, nm_connection_get_setting_connection(conn));
 
-    widget = parent = nmt_device_entry_new(_("Parent"), 40, G_TYPE_NONE);
+    widget = parent = nmt_device_entry_new(_("Parent"), 40, G_TYPE_NONE, FALSE);
     nmt_device_entry_set_device_filter(NMT_DEVICE_ENTRY(widget), vlan_device_filter, vlan);
     g_object_bind_property(s_vlan,
                            NM_SETTING_VLAN_PARENT,
diff --git a/src/nmtui/nmt-page-wifi.c b/src/nmtui/nmt-page-wifi.c
index 9767597b..d2d0024d 100644
--- a/src/nmtui/nmt-page-wifi.c
+++ b/src/nmtui/nmt-page-wifi.c
@@ -54,10 +54,9 @@ static NmtNewtPopupEntry wifi_mode[] = {{NC_("Wi-Fi", "Client"), NM_SETTING_WIRE
                                         {NULL, NULL}};
 
 static NmtNewtPopupEntry wifi_band[] = {{NC_("Wi-Fi", "Automatic"), NULL},
-                                        /* 802.11a Wi-Fi network */
-                                        {N_("A (5 GHz)"), "a"},
-                                        /* 802.11b / 802.11g Wi-Fi network */
-                                        {N_("B/G (2.4 GHz)"), "bg"},
+                                        {N_("5 GHz"), "a"},
+                                        {N_("2.4 GHz"), "bg"},
+                                        {N_("6 GHz"), "6GHz"},
                                         {NULL, NULL}};
 
 static struct {
diff --git a/src/nmtui/nmt-password-dialog.c b/src/nmtui/nmt-password-dialog.c
index 6f1a5f03..1c2e6b00 100644
--- a/src/nmtui/nmt-password-dialog.c
+++ b/src/nmtui/nmt-password-dialog.c
@@ -109,12 +109,13 @@ maybe_save_input_and_exit(NmtNewtWidget *widget, gpointer dialog)
 static void
 nmt_password_dialog_constructed(GObject *object)
 {
-    NmtPasswordDialog        *dialog = NMT_PASSWORD_DIALOG(object);
-    NmtPasswordDialogPrivate *priv   = NMT_PASSWORD_DIALOG_GET_PRIVATE(dialog);
-    NmtNewtWidget            *widget;
-    NmtNewtGrid              *grid, *secret_grid;
-    NmtNewtButtonBox         *bbox;
-    int                       i;
+    NmtPasswordDialog           *dialog = NMT_PASSWORD_DIALOG(object);
+    NmtPasswordDialogPrivate    *priv   = NMT_PASSWORD_DIALOG_GET_PRIVATE(dialog);
+    NmtNewtWidget               *widget;
+    NmtNewtGrid                 *grid, *secret_grid;
+    NmtNewtButtonBox            *bbox;
+    gs_unref_ptrarray GPtrArray *masked_entries = g_ptr_array_new();
+    int                          i;
 
     widget = nmt_newt_grid_new();
     nmt_newt_form_set_content(NMT_NEWT_FORM(dialog), widget);
@@ -133,19 +134,23 @@ nmt_password_dialog_constructed(GObject *object)
     for (i = 0; i < priv->secrets->len; i++) {
         NMSecretAgentSimpleSecret *secret = priv->secrets->pdata[i];
         NmtNewtEntryFlags          flags;
+        gboolean                   masked;
 
         widget = nmt_newt_label_new(secret->pretty_name);
         nmt_newt_grid_add(secret_grid, widget, 0, i);
         nmt_newt_widget_set_padding(widget, 4, 0, 1, 0);
 
-        flags = NMT_NEWT_ENTRY_NONEMPTY;
-        if (secret->is_secret && !secret->force_echo)
+        flags  = NMT_NEWT_ENTRY_NONEMPTY;
+        masked = secret->is_secret && !secret->force_echo;
+        if (masked)
             flags |= NMT_NEWT_ENTRY_PASSWORD;
         widget = nmt_newt_entry_new(30, flags);
         if (secret->value)
             nmt_newt_entry_set_text(NMT_NEWT_ENTRY(widget), secret->value);
         nmt_newt_grid_add(secret_grid, widget, 1, i);
         g_ptr_array_add(priv->entries, widget);
+        if (masked)
+            g_ptr_array_add(masked_entries, widget);
 
         if (i == priv->secrets->len - 1) {
             priv->last_entry = widget;
@@ -153,6 +158,18 @@ nmt_password_dialog_constructed(GObject *object)
         }
     }
 
+    if (masked_entries->len > 0) {
+        widget = nmt_newt_checkbox_new(_("Show password"));
+        nmt_newt_grid_add(secret_grid, widget, 1, priv->secrets->len);
+        for (i = 0; i < masked_entries->len; i++) {
+            g_object_bind_property(widget,
+                                   "active",
+                                   masked_entries->pdata[i],
+                                   "password",
+                                   G_BINDING_INVERT_BOOLEAN | G_BINDING_SYNC_CREATE);
+        }
+    }
+
     widget = nmt_newt_button_box_new(NMT_NEWT_BUTTON_BOX_HORIZONTAL);
     nmt_newt_grid_add(grid, widget, 0, 2);
     bbox = NMT_NEWT_BUTTON_BOX(widget);
diff --git a/src/nmtui/nmt-utils.c b/src/nmtui/nmt-utils.c
index 7a500542..90e3bacb 100644
--- a/src/nmtui/nmt-utils.c
+++ b/src/nmtui/nmt-utils.c
@@ -12,6 +12,8 @@
 
 #include "nmt-utils.h"
 
+#include "libnmt-newt/nmt-newt.h"
+
 /**
  * NmtSyncOp:
  *
@@ -128,3 +130,210 @@ nmt_sync_op_complete_pointer(NmtSyncOp *op, gpointer result, GError *error)
     real->error    = error ? g_error_copy(error) : NULL;
     real->complete = GUINT_TO_POINTER(TRUE);
 }
+
+/**
+ * nmt_utils_filter_match:
+ * @haystack: (nullable): the string to search in
+ * @needle: (nullable): the search term
+ *
+ * Case-insensitive UTF-8 substring test. An empty or %NULL @needle matches
+ * anything; a %NULL @haystack matches only an empty @needle.
+ *
+ * Returns: %TRUE if @haystack contains @needle.
+ */
+gboolean
+nmt_utils_filter_match(const char *haystack, const char *needle)
+{
+    gs_free char *h = NULL;
+    gs_free char *n = NULL;
+
+    if (!needle || !needle[0])
+        return TRUE;
+    if (!haystack)
+        return FALSE;
+
+    h = g_utf8_casefold(haystack, -1);
+    n = g_utf8_casefold(needle, -1);
+    return strstr(h, n) != NULL;
+}
+
+/*
+ * Renders the search state into @label: "Search:" while typing,
+ * "Matching '...' (N)" once a filter is applied with the entry hidden, or
+ * empty when idle.
+ *
+ * When the entry is hidden the text is padded to the width the row occupies
+ * while searching ("Search:" plus the entry), so revealing or hiding the entry
+ * never changes the form's width.
+ */
+static void
+set_search_label(NmtNewtLabel *label, const char *filter_text, int match_count, gboolean searching)
+{
+    gs_free char *body = NULL;
+    int           reserve, body_width;
+
+    if (searching) {
+        nmt_newt_label_set_text(label, _("Search:"));
+        return;
+    }
+
+    reserve = nmt_newt_text_width(_("Search:")) + 1 + NMT_SEARCH_ENTRY_WIDTH;
+
+    if (!nm_str_is_empty(filter_text)) {
+        gs_free char *shown = NULL;
+        int           overhead;
+
+        /* Echo the filter, but elide it so the confirmed label never exceeds
+         * the reserved width; otherwise the form grows when a long search is
+         * confirmed with Enter. */
+        body     = g_strdup_printf(_("Matching '%s' (%d)"), "", match_count);
+        overhead = nmt_newt_text_width(body);
+        nm_clear_g_free(&body);
+
+        shown = nmt_newt_text_truncate(filter_text, reserve - overhead);
+        body  = g_strdup_printf(_("Matching '%s' (%d)"), shown, match_count);
+    } else
+        body = g_strdup("");
+
+    body_width = nmt_newt_text_width(body);
+    if (body_width < reserve) {
+        gs_free char *padded = NULL;
+
+        padded = g_strdup_printf("%s%*s", body, reserve - body_width, "");
+        nmt_newt_label_set_text(label, padded);
+    } else
+        nmt_newt_label_set_text(label, body);
+}
+
+struct _NmtSearch {
+    NmtNewtEntry      *entry;
+    NmtNewtLabel      *label;
+    NmtNewtWidget     *focus;
+    NmtSearchApplyFunc apply;
+    NmtSearchCountFunc count;
+    gpointer           user_data;
+};
+
+void
+nmt_search_update_label(NmtSearch *search)
+{
+    set_search_label(search->label,
+                     nmt_newt_entry_get_text(search->entry),
+                     search->count(search->user_data),
+                     nmt_newt_widget_get_visible(NMT_NEWT_WIDGET(search->entry)));
+}
+
+static void
+search_text_changed(GObject *entry, GParamSpec *pspec, gpointer user_data)
+{
+    NmtSearch *search = user_data;
+
+    search->apply(search->user_data, nmt_newt_entry_get_text(search->entry));
+    nmt_search_update_label(search);
+}
+
+static void
+search_activated(NmtNewtWidget *entry, gpointer user_data)
+{
+    NmtSearch   *search = user_data;
+    NmtNewtForm *form   = nmt_newt_widget_get_form(search->focus);
+
+    /* Enter: hide the entry but keep the filter; the label now reports it. */
+    nmt_newt_widget_set_visible(NMT_NEWT_WIDGET(search->entry), FALSE);
+    nmt_search_update_label(search);
+    if (form)
+        nmt_newt_form_set_focus(form, search->focus);
+}
+
+static gboolean
+search_hotkey(NmtNewtForm *form, int key, gpointer user_data)
+{
+    NmtSearch  *search = user_data;
+    const char *filter = nmt_newt_entry_get_text(search->entry);
+
+    if (key == '/') {
+        nmt_newt_widget_set_visible(NMT_NEWT_WIDGET(search->entry), TRUE);
+        nmt_search_update_label(search);
+        nmt_newt_form_set_focus(form, NMT_NEWT_WIDGET(search->entry));
+        return TRUE;
+    }
+    if (key == NEWT_KEY_ESCAPE
+        && (nmt_newt_widget_get_visible(NMT_NEWT_WIDGET(search->entry))
+            || !nm_str_is_empty(filter))) {
+        /* Esc: clear the filter (via notify::text) and return to the list. */
+        nmt_newt_entry_set_text(search->entry, "");
+        nmt_newt_widget_set_visible(NMT_NEWT_WIDGET(search->entry), FALSE);
+        nmt_search_update_label(search);
+        nmt_newt_form_set_focus(form, search->focus);
+        return TRUE;
+    }
+    return FALSE;
+}
+
+NmtSearch *
+nmt_search_new(NmtNewtEntry      *entry,
+               NmtNewtLabel      *label,
+               NmtNewtWidget     *focus,
+               NmtSearchApplyFunc apply,
+               NmtSearchCountFunc count,
+               gpointer           user_data)
+{
+    NmtSearch *search = g_new0(NmtSearch, 1);
+
+    search->entry     = entry;
+    search->label     = label;
+    search->focus     = focus;
+    search->apply     = apply;
+    search->count     = count;
+    search->user_data = user_data;
+
+    nmt_newt_widget_set_visible(NMT_NEWT_WIDGET(entry), FALSE);
+    g_signal_connect(entry, "notify::text", G_CALLBACK(search_text_changed), search);
+    g_signal_connect(entry, "activated", G_CALLBACK(search_activated), search);
+
+    return search;
+}
+
+void
+nmt_search_bind_form(NmtSearch *search, NmtNewtForm *form)
+{
+    g_signal_connect(form, "hotkey", G_CALLBACK(search_hotkey), search);
+    nmt_newt_form_add_hotkey(form, '/');
+    nmt_newt_form_set_stable_width(form);
+
+    /* Reserve the search row's width up front so the form does not grow when
+     * the entry is first revealed. */
+    nmt_search_update_label(search);
+}
+
+static void
+get_secrets_cb(GObject *object, GAsyncResult *result, gpointer op)
+{
+    GVariant *secrets;
+    GError   *error = NULL;
+
+    secrets = nm_remote_connection_get_secrets_finish(NM_REMOTE_CONNECTION(object), result, &error);
+    nmt_sync_op_complete_pointer(op, secrets, error);
+    g_clear_error(&error);
+}
+
+/**
+ * nmt_sync_get_secrets:
+ * @connection: the #NMRemoteConnection to fetch secrets from
+ * @setting_name: the setting to fetch secrets for
+ * @error: return location for a #GError
+ *
+ * Synchronously requests @setting_name's secrets for @connection, running the
+ * main loop until the request completes.
+ *
+ * Returns: (transfer full): the secrets variant, or %NULL on error.
+ */
+GVariant *
+nmt_sync_get_secrets(NMRemoteConnection *connection, const char *setting_name, GError **error)
+{
+    NmtSyncOp op;
+
+    nmt_sync_op_init(&op);
+    nm_remote_connection_get_secrets_async(connection, setting_name, NULL, get_secrets_cb, &op);
+    return nmt_sync_op_wait_pointer(&op, error);
+}
diff --git a/src/nmtui/nmt-utils.h b/src/nmtui/nmt-utils.h
index 3b780ae7..79058c0d 100644
--- a/src/nmtui/nmt-utils.h
+++ b/src/nmtui/nmt-utils.h
@@ -6,6 +6,8 @@
 #ifndef NMT_UTILS_H
 #define NMT_UTILS_H
 
+#include "libnmt-newt/nmt-newt-types.h"
+
 typedef struct {
     gpointer private[3];
 } NmtSyncOp;
@@ -18,4 +20,37 @@ void     nmt_sync_op_complete_boolean(NmtSyncOp *op, gboolean result, GError *er
 gpointer nmt_sync_op_wait_pointer(NmtSyncOp *op, GError **error);
 void     nmt_sync_op_complete_pointer(NmtSyncOp *op, gpointer result, GError *error);
 
+gboolean nmt_utils_filter_match(const char *haystack, const char *needle);
+
+#define NMT_SEARCH_ENTRY_WIDTH 34
+
+/**
+ * NmtSearch:
+ *
+ * Vim-style '/' search glue shared by the connection lists. The caller builds
+ * the @label and @entry into its own layout and hands them over; NmtSearch
+ * wires '/' to reveal the entry, Enter to confirm, Esc to clear, keeps the
+ * status label in sync, and pins the form width so the list does not jump.
+ *
+ * @apply is invoked with the current text whenever the filter changes; @count
+ * returns the live match count for the label.
+ */
+typedef struct _NmtSearch NmtSearch;
+
+typedef void (*NmtSearchApplyFunc)(gpointer user_data, const char *text);
+typedef int (*NmtSearchCountFunc)(gpointer user_data);
+
+NmtSearch *nmt_search_new(NmtNewtEntry      *entry,
+                          NmtNewtLabel      *label,
+                          NmtNewtWidget     *focus,
+                          NmtSearchApplyFunc apply,
+                          NmtSearchCountFunc count,
+                          gpointer           user_data);
+
+void nmt_search_bind_form(NmtSearch *search, NmtNewtForm *form);
+void nmt_search_update_label(NmtSearch *search);
+
+GVariant *
+nmt_sync_get_secrets(NMRemoteConnection *connection, const char *setting_name, GError **error);
+
 #endif /* NMT_UTILS_H */
diff --git a/src/nmtui/nmt-widget-list.c b/src/nmtui/nmt-widget-list.c
index d150eee0..c827db04 100644
--- a/src/nmtui/nmt-widget-list.c
+++ b/src/nmtui/nmt-widget-list.c
@@ -11,7 +11,7 @@
  * buttons next to each one, and an "Add" button at the button to add
  * new ones.
  *
- * It is the base class for #NmtAddressList, and is used internally by
+ * It is the base class for #NmtList, and is used internally by
  * #NmtRouteTable.
  *
  * FIXME: The way this works is sort of weird.
diff --git a/src/nmtui/nmt-wifi-qr-dialog.c b/src/nmtui/nmt-wifi-qr-dialog.c
new file mode 100644
index 00000000..d8e7711f
--- /dev/null
+++ b/src/nmtui/nmt-wifi-qr-dialog.c
@@ -0,0 +1,165 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2026 Red Hat, Inc.
+ */
+
+/**
+ * SECTION:nmt-wifi-qr-dialog
+ * @short_description: A dialog that shares a Wi-Fi connection as a QR code
+ *
+ * Shows the "WIFI:" provisioning URI of a saved Wi-Fi connection as a
+ * scannable QR code, along with the SSID and password. If the password is a
+ * passphrase that cannot be read, it shows a warning instead of a QR code.
+ */
+
+#include "libnm-client-aux-extern/nm-default-client.h"
+
+#include "nmt-wifi-qr-dialog.h"
+
+#include "libnm-glib-aux/nm-secret-utils.h"
+#include "libnmc-base/nm-client-utils.h"
+#include "nmt-utils.h"
+
+static NMConnection *
+clone_with_secrets(NMConnection *connection)
+{
+    NMConnection              *clone   = nm_simple_connection_new_clone(connection);
+    gs_unref_variant GVariant *secrets = NULL;
+
+    if (!NM_IS_REMOTE_CONNECTION(connection))
+        return clone;
+
+    secrets = nmt_sync_get_secrets(NM_REMOTE_CONNECTION(connection),
+                                   NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
+                                   NULL);
+    if (secrets)
+        nm_connection_update_secrets(clone,
+                                     NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
+                                     secrets,
+                                     NULL);
+
+    return clone;
+}
+
+static gboolean
+qr_fits_screen(const char *qr)
+{
+    gs_strfreev char **lines = NULL;
+    int                screen_w;
+    int                screen_h;
+    int                qr_rows;
+    int                qr_cols;
+
+    newtGetScreenSize(&screen_w, &screen_h);
+
+    lines   = g_strsplit(qr, "\n", -1);
+    qr_rows = g_strv_length(lines);
+    qr_cols = lines[0] ? (int) g_utf8_strlen(lines[0], -1) : 0;
+
+    /* Reserve room for the form border, title, the SSID/password labels and
+     * the button row. */
+    return qr_cols + 4 <= screen_w && qr_rows + 8 <= screen_h;
+}
+
+/**
+ * nmt_wifi_qr_dialog_run:
+ * @connection: a Wi-Fi #NMConnection
+ *
+ * Fetches @connection's secrets and shows a modal dialog with a QR code that
+ * encodes its Wi-Fi credentials, or a warning if the password cannot be read.
+ * Returns when the user closes the dialog.
+ */
+void
+nmt_wifi_qr_dialog_run(NMConnection *connection)
+{
+    gs_unref_object NMConnection *clone = NULL;
+    gs_unref_object NmtNewtForm  *form  = NULL;
+    NMSettingWireless            *s_wireless;
+    NMSettingWirelessSecurity    *s_wsec;
+    NmtNewtGrid                  *grid;
+    NmtNewtWidget                *widget;
+    NmtNewtButtonBox             *bbox;
+    GBytes                       *ssid_bytes;
+    gs_free char                 *ssid     = NULL;
+    nm_auto_free_secret char     *uri      = NULL;
+    nm_auto_free_secret char     *qr       = NULL;
+    const char                   *key_mgmt = NULL;
+    const char                   *psk      = NULL;
+    gboolean                      no_password;
+    int                           row = 0;
+
+    g_return_if_fail(NM_IS_CONNECTION(connection));
+
+    if (!nm_connection_get_setting_wireless(connection))
+        return;
+
+    clone      = clone_with_secrets(connection);
+    s_wireless = nm_connection_get_setting_wireless(clone);
+
+    ssid_bytes = nm_setting_wireless_get_ssid(s_wireless);
+    if (ssid_bytes)
+        ssid =
+            nm_utils_ssid_to_utf8(g_bytes_get_data(ssid_bytes, NULL), g_bytes_get_size(ssid_bytes));
+
+    s_wsec = nm_connection_get_setting_wireless_security(clone);
+    if (s_wsec) {
+        key_mgmt = nm_setting_wireless_security_get_key_mgmt(s_wsec);
+        psk      = nm_setting_wireless_security_get_psk(s_wsec);
+    }
+
+    /* A QR code for a secured network without its password connects to nothing,
+     * so don't render one; show a warning instead. */
+    no_password = nmc_wifi_key_mgmt_uses_psk(key_mgmt) && (!psk || !psk[0]);
+
+    if (!no_password) {
+        uri = nmc_wifi_qr_uri_new(ssid, key_mgmt, psk, nm_setting_wireless_get_hidden(s_wireless));
+        qr  = nmc_wifi_qr_render_string(uri);
+    }
+
+    form = nmt_newt_form_new(_("Share Wi-Fi"));
+
+    widget = nmt_newt_grid_new();
+    nmt_newt_form_set_content(form, widget);
+    grid = NMT_NEWT_GRID(widget);
+
+    if (no_password) {
+        widget = nmt_newt_textbox_new(0, 50);
+        nmt_newt_textbox_set_text(
+            NMT_NEWT_TEXTBOX(widget),
+            _("Warning: cannot read the Wi-Fi password due to insufficient privileges."));
+    } else if (qr && qr_fits_screen(qr)) {
+        widget = nmt_newt_textbox_new(NMT_NEWT_TEXTBOX_SET_BACKGROUND, 0);
+        nmt_newt_textbox_set_text(NMT_NEWT_TEXTBOX(widget), qr);
+    } else {
+        widget = nmt_newt_textbox_new(0, 50);
+        nmt_newt_textbox_set_text(NMT_NEWT_TEXTBOX(widget),
+                                  qr ? _("The terminal is too small to display the QR code.")
+                                     : _("The Wi-Fi credentials could not be encoded."));
+    }
+    nmt_newt_grid_add(grid, widget, 0, row++);
+    nmt_newt_widget_set_padding(widget, 0, 0, 0, 1);
+
+    if (ssid) {
+        gs_free char *label = g_strdup_printf("%s: %s", _("SSID"), ssid);
+
+        widget = nmt_newt_label_new(label);
+        nmt_newt_grid_add(grid, widget, 0, row++);
+    }
+
+    if (psk) {
+        nm_auto_free_secret char *label = g_strdup_printf("%s: %s", _("Password"), psk);
+
+        widget = nmt_newt_label_new(label);
+        nmt_newt_grid_add(grid, widget, 0, row++);
+    }
+
+    widget = nmt_newt_button_box_new(NMT_NEWT_BUTTON_BOX_HORIZONTAL);
+    nmt_newt_grid_add(grid, widget, 0, row++);
+    nmt_newt_widget_set_padding(widget, 0, 1, 0, 0);
+    bbox = NMT_NEWT_BUTTON_BOX(widget);
+
+    widget = nmt_newt_button_box_add_end(bbox, _("Close"));
+    nmt_newt_widget_set_exit_on_activate(widget, TRUE);
+
+    nmt_newt_form_run_sync(form);
+}
diff --git a/src/nmtui/nmt-wifi-qr-dialog.h b/src/nmtui/nmt-wifi-qr-dialog.h
new file mode 100644
index 00000000..310bb7c8
--- /dev/null
+++ b/src/nmtui/nmt-wifi-qr-dialog.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2026 Red Hat, Inc.
+ */
+
+#ifndef NMT_WIFI_QR_DIALOG_H
+#define NMT_WIFI_QR_DIALOG_H
+
+#include "libnmt-newt/nmt-newt.h"
+
+void nmt_wifi_qr_dialog_run(NMConnection *connection);
+
+#endif /* NMT_WIFI_QR_DIALOG_H */
diff --git a/src/nmtui/nmt-wireguard-peer-list.c b/src/nmtui/nmt-wireguard-peer-list.c
index c6db61a6..38987a97 100644
--- a/src/nmtui/nmt-wireguard-peer-list.c
+++ b/src/nmtui/nmt-wireguard-peer-list.c
@@ -170,6 +170,7 @@ nmt_wireguard_peer_list_add_peer(NmtWireguardPeerList *list)
     NmtNewtForm                 *editor;
 
     editor = nmt_wireguard_peer_editor_new(priv->setting, peer);
+    nm_wireguard_peer_unref(peer);
 
     if (!editor)
         return;
diff --git a/src/nmtui/nmtui-connect.c b/src/nmtui/nmtui-connect.c
index 4f90adf3..3fcf527b 100644
--- a/src/nmtui/nmtui-connect.c
+++ b/src/nmtui/nmtui-connect.c
@@ -342,16 +342,268 @@ listbox_active_changed(GObject *object, GParamSpec *pspec, gpointer button)
     }
 }
 
+/* Contains both the UI and batch data for wifi-rescans */
+typedef struct {
+    NmtNewtWidget *activate_button;
+    NmtNewtWidget *listbox;
+    NmtNewtForm   *rescan_form;
+    NmtNewtWidget *rescan_button;
+    int            pending;
+    GCancellable  *cancellable;
+    gboolean       cancelled;
+    gboolean       has_error;
+    gboolean       timeout_occurred;
+} RescanBatch;
+
+typedef struct {
+    NMDeviceWifi *wifi_device;
+    GSource      *timeout_id;
+    gulong        signal_id;
+    RescanBatch  *batch;
+} RescanData;
+
+static GPtrArray *
+active_wifi_devices(void)
+{
+    const GPtrArray *devices;
+    GPtrArray       *active_wifi_devices;
+
+    devices = nm_client_get_devices(nm_client);
+
+    if (!devices)
+        return NULL;
+
+    active_wifi_devices = g_ptr_array_new_with_free_func(g_object_unref);
+
+    for (guint i = 0; i < devices->len; i++) {
+        NMDevice *dev = g_ptr_array_index((GPtrArray *) devices, i);
+
+        if (!NM_IS_DEVICE_WIFI(dev))
+            continue;
+        if (NM_IN_SET(nm_device_get_state(dev),
+                      NM_DEVICE_STATE_UNAVAILABLE,
+                      NM_DEVICE_STATE_UNMANAGED,
+                      NM_DEVICE_STATE_FAILED))
+            continue;
+
+        g_ptr_array_add(active_wifi_devices, g_object_ref(dev));
+    }
+    return active_wifi_devices;
+}
+
+static void
+on_rescan_cancel(NmtNewtForm *form, gpointer user_data)
+{
+    RescanBatch *batch_data = user_data;
+
+    if (!batch_data || batch_data->cancelled)
+        return;
+
+    batch_data->cancelled = TRUE;
+
+    /* Cancel the async operations using nm_clear_g_cancellable */
+    if (batch_data->cancellable)
+        nm_clear_g_cancellable(&batch_data->cancellable);
+
+    g_object_unref(batch_data->rescan_form);
+    batch_data->rescan_form = NULL;
+}
+
+/* creates the wifi-rescan form and manages other ui properties while rescanning */
+static void
+wifi_rescan_form(RescanBatch *batch_data)
+{
+    NmtNewtForm   *rescan_form;
+    NmtNewtWidget *label;
+
+    nmt_newt_component_set_sensitive(NMT_NEWT_COMPONENT(batch_data->listbox), FALSE);
+    nmt_newt_component_set_sensitive(NMT_NEWT_COMPONENT(batch_data->rescan_button), FALSE);
+    nmt_newt_component_set_sensitive(NMT_NEWT_COMPONENT(batch_data->activate_button), FALSE);
+
+    /* open the scanning form*/
+    rescan_form = g_object_new(NMT_TYPE_NEWT_FORM, NULL);
+    label       = nmt_newt_label_new(_("Rescanning Wi-Fi devices..."));
+    nmt_newt_form_set_content(rescan_form, label);
+
+    /* connect the quit signal to rescan cancel */
+    g_signal_connect(rescan_form, "quit", G_CALLBACK(on_rescan_cancel), batch_data);
+
+    nmt_newt_form_show(rescan_form);
+    batch_data->rescan_form = rescan_form;
+}
+
+/* rebuilds the connection list and changes back the
+ * state for various UI components which were
+ * changed during rescanning */
+static void
+on_rescan_complete(gpointer data)
+{
+    NmtConnectConnectionList *list;
+    RescanData               *rescan_data;
+    RescanBatch              *batch_data;
+    NMDeviceWifi             *wifi_device;
+
+    rescan_data = data;
+    batch_data  = rescan_data->batch;
+    wifi_device = rescan_data->wifi_device;
+
+    g_free(rescan_data);
+    rescan_data = NULL;
+
+    if (batch_data->has_error) {
+        nmt_newt_message_dialog(_("Wi-Fi scan failed for device : %s"),
+                                nm_device_get_iface(NM_DEVICE(wifi_device)));
+        batch_data->has_error = FALSE;
+    }
+
+    if (batch_data->timeout_occurred) {
+        nmt_newt_message_dialog(_("Wi-Fi scan timed out for device : %s"),
+                                nm_device_get_iface(NM_DEVICE(wifi_device)));
+        batch_data->timeout_occurred = FALSE;
+    }
+
+    /* If the scans are not complete then simply wait for them to complete
+     * This also ensures that UI is only enabled either after all
+     * scans complete (Either complete or cancel ). Preventing any
+     * overlapping scans caused due to the user pressing rescan multiple times
+     */
+
+    if (--batch_data->pending > 0)
+        return;
+
+    /* If the scan is not cancelled quit normally */
+    if (!batch_data->cancelled) {
+        if (nmt_newt_widget_get_realized(NMT_NEWT_WIDGET(batch_data->rescan_form))) {
+            nmt_newt_form_quit(batch_data->rescan_form);
+            nm_clear_g_object(&batch_data->rescan_form);
+            batch_data->rescan_form = NULL;
+        }
+        list = NMT_CONNECT_CONNECTION_LIST(batch_data->listbox);
+        nmt_newt_listbox_clear(NMT_NEWT_LISTBOX(list));
+
+        g_object_notify(G_OBJECT(nm_client), NM_CLIENT_CONNECTIONS);
+    }
+
+    /* The following cleanup  is required regardless of any cancellation */
+    nmt_newt_component_set_sensitive(NMT_NEWT_COMPONENT(batch_data->listbox), TRUE);
+    nmt_newt_component_set_sensitive(NMT_NEWT_COMPONENT(batch_data->rescan_button), TRUE);
+    nmt_newt_component_set_sensitive(NMT_NEWT_COMPONENT(batch_data->activate_button), TRUE);
+
+    g_clear_object(&batch_data->cancellable);
+}
+
+static gboolean
+scan_timeout_callback(gpointer user_data)
+{
+    RescanData *data = user_data;
+
+    nm_clear_g_source_inst(&data->timeout_id);
+
+    /* Timeout reached - scan took too long */
+    if (data->signal_id) {
+        g_signal_handler_disconnect(data->wifi_device, data->signal_id);
+        data->signal_id = 0;
+    }
+
+    data->batch->timeout_occurred = TRUE;
+
+    on_rescan_complete(data);
+    return G_SOURCE_REMOVE;
+}
+
+static void
+on_last_scan_changed(GObject *object, GParamSpec *pspec, gpointer user_data)
+{
+    RescanData *data = user_data;
+
+    /* Scan completed successfully */
+    nm_clear_g_source_inst(&data->timeout_id);
+    if (data->signal_id) {
+        g_signal_handler_disconnect(data->wifi_device, data->signal_id);
+        data->signal_id = 0;
+    }
+
+    on_rescan_complete(data);
+}
+
+static void
+wifi_rescan_callback(GObject *source_object, GAsyncResult *result, gpointer rescan_data)
+{
+    RescanData *data = rescan_data;
+
+    if (!nm_device_wifi_request_scan_finish(data->wifi_device, result, NULL)) {
+        data->batch->has_error = TRUE;
+        on_rescan_complete(data);
+        return;
+    }
+
+    /* Listen for last-scan property changes */
+    data->signal_id = g_signal_connect(data->wifi_device,
+                                       "notify::last-scan",
+                                       G_CALLBACK(on_last_scan_changed),
+                                       data);
+
+    /* Set a 10-second timeout in case scan doesn't complete */
+    data->timeout_id = nm_g_timeout_add_source(RESCAN_TIMEOUT_MS, scan_timeout_callback, data);
+}
+
+static void
+wifi_rescan(NmtNewtButton *button, gpointer data_batch)
+{
+    gs_unref_ptrarray GPtrArray *devices = active_wifi_devices();
+    RescanData                  *data;
+    RescanBatch                 *batch_data = data_batch;
+
+    if (!devices || devices->len == 0) {
+        nmt_newt_message_dialog(_("No active Wi-Fi devices found"));
+        return;
+    }
+
+    /* create a shared batch for all the devices*/
+    batch_data->pending     = devices->len;
+    batch_data->cancelled   = FALSE;
+    batch_data->cancellable = g_cancellable_new();
+
+    wifi_rescan_form(batch_data);
+
+    for (guint i = 0; i < devices->len; i++) {
+        NMDevice *dev = g_ptr_array_index(devices, i);
+
+        /* per-device data */
+        data              = g_new0(RescanData, 1);
+        data->wifi_device = NM_DEVICE_WIFI(dev);
+        data->batch       = batch_data;
+
+        nm_device_wifi_request_scan_async(NM_DEVICE_WIFI(dev),
+                                          batch_data->cancellable,
+                                          wifi_rescan_callback,
+                                          data);
+    }
+}
+
+static void
+connect_search_apply(gpointer list, const char *text)
+{
+    nmt_connect_connection_list_set_filter_text(NMT_CONNECT_CONNECTION_LIST(list), text);
+}
+
+static int
+connect_search_count(gpointer list)
+{
+    return nmt_connect_connection_list_get_match_count(NMT_CONNECT_CONNECTION_LIST(list));
+}
+
 static NmtNewtForm *
 nmt_connect_connection_list(gboolean is_top)
 {
-    int            screen_width, screen_height;
-    NmtNewtForm   *form;
-    NmtNewtWidget *list, *activate, *quit, *bbox, *grid;
+    NmtNewtForm                 *form;
+    NmtNewtWidget               *list, *activate, *quit, *bbox, *grid, *rescan;
+    NmtNewtWidget               *search_row, *search_label, *search_entry;
+    NmtSearch                   *search;
+    RescanBatch                 *batch_data;
+    gs_unref_ptrarray GPtrArray *all_active_wifi_devices = NULL;
 
-    newtGetScreenSize(&screen_width, &screen_height);
-
-    form = g_object_new(NMT_TYPE_NEWT_FORM, "y", 2, "height", screen_height - 4, NULL);
+    form = g_object_new(NMT_TYPE_NEWT_FORM, "fullscreen-vertical", TRUE, NULL);
 
     grid = nmt_newt_grid_new();
 
@@ -372,9 +624,50 @@ nmt_connect_connection_list(gboolean is_top)
     listbox_active_changed(G_OBJECT(list), NULL, activate);
     g_signal_connect(activate, "clicked", G_CALLBACK(activate_clicked), list);
 
+    all_active_wifi_devices = active_wifi_devices();
+    if (all_active_wifi_devices && all_active_wifi_devices->len > 0) {
+        rescan = nmt_newt_button_box_add_start(NMT_NEWT_BUTTON_BOX(bbox), _("Rescan Wi-Fi"));
+
+        batch_data                  = g_new0(RescanBatch, 1);
+        batch_data->activate_button = activate;
+        batch_data->listbox         = list;
+        batch_data->rescan_button   = rescan;
+
+        /* Bind the lifecycle of batch_data to the rescan button.
+         * The data will be freed automatically when the button is destroyed i.e form quits. */
+        g_object_set_data_full(G_OBJECT(rescan), "rescan-batch-data", batch_data, g_free);
+
+        g_signal_connect(rescan, "clicked", G_CALLBACK(wifi_rescan), batch_data);
+    }
+
     quit = nmt_newt_button_box_add_end(NMT_NEWT_BUTTON_BOX(bbox), is_top ? _("Quit") : _("Back"));
     nmt_newt_widget_set_exit_on_activate(quit, TRUE);
 
+    /* Search row below the list. The row is always present so revealing the
+     * entry does not resize the form; vim-style '/' shows the entry, and once a
+     * filter is applied the label reports it ("Matching '...' (N)"). */
+    search_row = nmt_newt_grid_new();
+    nmt_newt_grid_add(NMT_NEWT_GRID(grid), search_row, 0, 1);
+    nmt_newt_grid_set_flags(NMT_NEWT_GRID(grid),
+                            search_row,
+                            NMT_NEWT_GRID_FILL_X | NMT_NEWT_GRID_EXPAND_X);
+
+    search_label = nmt_newt_label_new("");
+    nmt_newt_grid_add(NMT_NEWT_GRID(search_row), search_label, 0, 0);
+
+    search_entry = nmt_newt_entry_new(NMT_SEARCH_ENTRY_WIDTH, 0);
+    nmt_newt_grid_add(NMT_NEWT_GRID(search_row), search_entry, 1, 0);
+    nmt_newt_widget_set_padding(search_entry, 1, 0, 0, 0);
+
+    search = nmt_search_new(NMT_NEWT_ENTRY(search_entry),
+                            NMT_NEWT_LABEL(search_label),
+                            list,
+                            connect_search_apply,
+                            connect_search_count,
+                            list);
+    nmt_search_bind_form(search, form);
+    g_object_set_data_full(G_OBJECT(form), "search-data", search, g_free);
+
     nmt_newt_form_set_content(form, grid);
     return form;
 }
diff --git a/src/nmtui/nmtui-connect.h b/src/nmtui/nmtui-connect.h
index 811893e8..3e42714b 100644
--- a/src/nmtui/nmtui-connect.h
+++ b/src/nmtui/nmtui-connect.h
@@ -6,6 +6,8 @@
 #ifndef NMTUI_CONNECT_H
 #define NMTUI_CONNECT_H
 
+#define RESCAN_TIMEOUT_MS 10000
+
 NmtNewtForm *nmtui_connect(gboolean is_top, int argc, char **argv);
 
 #endif /* NMTUI_CONNECT_H */
diff --git a/src/nmtui/nmtui-edit.c b/src/nmtui/nmtui-edit.c
index 0ba3bd0d..dcdce568 100644
--- a/src/nmtui/nmtui-edit.c
+++ b/src/nmtui/nmtui-edit.c
@@ -19,6 +19,7 @@
 #include "nmt-edit-connection-list.h"
 #include "nmt-editor.h"
 #include "nmt-utils.h"
+#include "nmt-wifi-qr-dialog.h"
 
 #include "nm-editor-utils.h"
 
@@ -43,6 +44,13 @@ list_remove_connection(NmtEditConnectionList *list, NMRemoteConnection *connecti
     nmt_newt_form_set_focus(form, NMT_NEWT_WIDGET(list));
 }
 
+static void
+list_share_connection(NmtEditConnectionList *list, NMConnection *connection, gpointer form)
+{
+    nmt_wifi_qr_dialog_run(connection);
+    nmt_newt_form_set_focus(form, NMT_NEWT_WIDGET(list));
+}
+
 static gboolean
 edit_connection_list_filter(NmtEditConnectionList *list,
                             NMConnection          *connection,
@@ -85,13 +93,10 @@ edit_connection_list_filter(NmtEditConnectionList *list,
 static NmtNewtForm *
 nmt_edit_main_connection_list(gboolean is_top)
 {
-    int            screen_width, screen_height;
     NmtNewtForm   *form;
     NmtNewtWidget *quit, *list;
 
-    newtGetScreenSize(&screen_width, &screen_height);
-
-    form = g_object_new(NMT_TYPE_NEWT_FORM, "y", 2, "height", screen_height - 4, NULL);
+    form = g_object_new(NMT_TYPE_NEWT_FORM, "fullscreen-vertical", TRUE, NULL);
 
     quit = nmt_newt_button_new(is_top ? _("Quit") : _("Back"));
     nmt_newt_widget_set_exit_on_activate(quit, TRUE);
@@ -106,6 +111,9 @@ nmt_edit_main_connection_list(gboolean is_top)
     g_signal_connect(list, "add-connection", G_CALLBACK(list_add_connection), form);
     g_signal_connect(list, "edit-connection", G_CALLBACK(list_edit_connection), form);
     g_signal_connect(list, "remove-connection", G_CALLBACK(list_remove_connection), form);
+    g_signal_connect(list, "share-connection", G_CALLBACK(list_share_connection), form);
+
+    nmt_edit_connection_list_bind_search(NMT_EDIT_CONNECTION_LIST(list), form);
 
     nmt_newt_form_set_content(form, list);
     return form;
diff --git a/src/nmtui/nmtui.c b/src/nmtui/nmtui.c
index 9927e40a..0838187a 100644
--- a/src/nmtui/nmtui.c
+++ b/src/nmtui/nmtui.c
@@ -75,12 +75,11 @@ main_list_activated(NmtNewtWidget *widget, NmtNewtListbox *listbox)
 static NmtNewtForm *
 nmtui_main(gboolean is_top, int argc, char **argv)
 {
-    NmtNewtForm      *form;
-    NmtNewtWidget    *widget, *ok;
-    NmtNewtGrid      *grid;
-    NmtNewtListbox   *listbox;
-    NmtNewtButtonBox *bbox;
-    int               i;
+    NmtNewtForm    *form;
+    NmtNewtWidget  *widget;
+    NmtNewtGrid    *grid;
+    NmtNewtListbox *listbox;
+    int             i;
 
     form = g_object_new(NMT_TYPE_NEWT_FORM, "title", _("NetworkManager TUI"), NULL);
 
@@ -108,13 +107,6 @@ nmtui_main(gboolean is_top, int argc, char **argv)
     nmt_newt_listbox_append(listbox, "", NULL);
     nmt_newt_listbox_append(listbox, _("Quit"), quit_func);
 
-    widget = nmt_newt_button_box_new(NMT_NEWT_BUTTON_BOX_HORIZONTAL);
-    nmt_newt_grid_add(grid, widget, 0, 2);
-    bbox = NMT_NEWT_BUTTON_BOX(widget);
-
-    ok = nmt_newt_button_box_add_end(bbox, _("OK"));
-    g_signal_connect(ok, "activated", G_CALLBACK(main_list_activated), listbox);
-
     toplevel_form = form;
 
     return form;
diff --git a/src/tests/client/test-client.check-on-disk/test_002.expected b/src/tests/client/test-client.check-on-disk/test_002.expected
index cc35e4fd..654c50c7 100644
--- a/src/tests/client/test-client.check-on-disk/test_002.expected
+++ b/src/tests/client/test-client.check-on-disk/test_002.expected
@@ -136,18 +136,19 @@ Strony podręcznika nmcli(1) i nmcli-examples(7) zawierają pełne informacje
 o użyciu.
 
 <<<
-size: 1423
+size: 1566
 location: src/tests/client/test-client.py:test_002()/7
 cmd: $NMCLI -f AP -mode multiline d show wlan0
 lang: C
 returncode: 0
-stdout: 1271 bytes
+stdout: 1414 bytes
 >>>
 AP[1].IN-USE:                            
 AP[1].BSSID:                            60:B3:25:25:E2:C8
 AP[1].SSID:                             wlan0-ap-3
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             6 GHz
+AP[1].CHAN:                             129
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           55
 AP[1].BARS:                             **  
@@ -156,7 +157,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            90:B1:5F:9E:E0:E3
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           44
 AP[2].BARS:                             **  
@@ -165,25 +167,27 @@ AP[3].IN-USE:
 AP[3].BSSID:                            61:66:D2:E7:44:A2
 AP[3].SSID:                             wlan0-ap-2
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             5 GHz
+AP[3].CHAN:                             44
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           34
 AP[3].BARS:                             **  
 AP[3].SECURITY:                         WPA1 WPA2
 
 <<<
-size: 1460
+size: 1603
 location: src/tests/client/test-client.py:test_002()/8
 cmd: $NMCLI -f AP -mode multiline d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1298 bytes
+stdout: 1441 bytes
 >>>
 AP[1].IN-USE:                            
 AP[1].BSSID:                            60:B3:25:25:E2:C8
 AP[1].SSID:                             wlan0-ap-3
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             6 GHz
+AP[1].CHAN:                             129
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           55
 AP[1].BARS:                             **  
@@ -192,7 +196,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            90:B1:5F:9E:E0:E3
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           44
 AP[2].BARS:                             **  
@@ -201,19 +206,20 @@ AP[3].IN-USE:
 AP[3].BSSID:                            61:66:D2:E7:44:A2
 AP[3].SSID:                             wlan0-ap-2
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             5 GHz
+AP[3].CHAN:                             44
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           34
 AP[3].BARS:                             **  
 AP[3].SECURITY:                         WPA1 WPA2
 
 <<<
-size: 1877
+size: 2020
 location: src/tests/client/test-client.py:test_002()/9
 cmd: $NMCLI -f AP -mode multiline -p d show wlan0
 lang: C
 returncode: 0
-stdout: 1722 bytes
+stdout: 1865 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -222,7 +228,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            60:B3:25:25:E2:C8
 AP[1].SSID:                             wlan0-ap-3
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             6 GHz
+AP[1].CHAN:                             129
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           55
 AP[1].BARS:                             **  
@@ -232,7 +239,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            90:B1:5F:9E:E0:E3
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           44
 AP[2].BARS:                             **  
@@ -242,7 +250,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            61:66:D2:E7:44:A2
 AP[3].SSID:                             wlan0-ap-2
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             5 GHz
+AP[3].CHAN:                             44
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           34
 AP[3].BARS:                             **  
@@ -250,12 +259,12 @@ AP[3].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 
 <<<
-size: 1922
+size: 2065
 location: src/tests/client/test-client.py:test_002()/10
 cmd: $NMCLI -f AP -mode multiline -p d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1756 bytes
+stdout: 1899 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -264,7 +273,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            60:B3:25:25:E2:C8
 AP[1].SSID:                             wlan0-ap-3
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             6 GHz
+AP[1].CHAN:                             129
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           55
 AP[1].BARS:                             **  
@@ -274,7 +284,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            90:B1:5F:9E:E0:E3
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           44
 AP[2].BARS:                             **  
@@ -284,7 +295,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            61:66:D2:E7:44:A2
 AP[3].SSID:                             wlan0-ap-2
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             5 GHz
+AP[3].CHAN:                             44
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           34
 AP[3].BARS:                             **  
@@ -292,18 +304,19 @@ AP[3].SECURITY:                         WPA1 WPA2
 -------------------------------------------------------------------------------
 
 <<<
-size: 670
+size: 726
 location: src/tests/client/test-client.py:test_002()/11
 cmd: $NMCLI -f AP -mode multiline -t d show wlan0
 lang: C
 returncode: 0
-stdout: 515 bytes
+stdout: 571 bytes
 >>>
 AP[1].IN-USE: 
 AP[1].BSSID:60:B3:25:25:E2:C8
 AP[1].SSID:wlan0-ap-3
 AP[1].MODE:Infra
-AP[1].CHAN:1
+AP[1].BAND:6 GHz
+AP[1].CHAN:129
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:55
 AP[1].BARS:**  
@@ -312,7 +325,8 @@ AP[2].IN-USE:
 AP[2].BSSID:90:B1:5F:9E:E0:E3
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:44
 AP[2].BARS:**  
@@ -321,25 +335,27 @@ AP[3].IN-USE:
 AP[3].BSSID:61:66:D2:E7:44:A2
 AP[3].SSID:wlan0-ap-2
 AP[3].MODE:Infra
-AP[3].CHAN:1
+AP[3].BAND:5 GHz
+AP[3].CHAN:44
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:34
 AP[3].BARS:**  
 AP[3].SECURITY:WPA1 WPA2
 
 <<<
-size: 707
+size: 763
 location: src/tests/client/test-client.py:test_002()/12
 cmd: $NMCLI -f AP -mode multiline -t d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 542 bytes
+stdout: 598 bytes
 >>>
 AP[1].IN-USE: 
 AP[1].BSSID:60:B3:25:25:E2:C8
 AP[1].SSID:wlan0-ap-3
 AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
+AP[1].BAND:6 GHz
+AP[1].CHAN:129
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:55
 AP[1].BARS:**  
@@ -348,7 +364,8 @@ AP[2].IN-USE:
 AP[2].BSSID:90:B1:5F:9E:E0:E3
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:44
 AP[2].BARS:**  
@@ -357,131 +374,132 @@ AP[3].IN-USE:
 AP[3].BSSID:61:66:D2:E7:44:A2
 AP[3].SSID:wlan0-ap-2
 AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
+AP[3].BAND:5 GHz
+AP[3].CHAN:44
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:34
 AP[3].BARS:**  
 AP[3].SECURITY:WPA1 WPA2
 
 <<<
-size: 530
+size: 566
 location: src/tests/client/test-client.py:test_002()/13
 cmd: $NMCLI -f AP -mode tabular d show wlan0
 lang: C
 returncode: 0
-stdout: 380 bytes
+stdout: 416 bytes
 >>>
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          60:B3:25:25:E2:C8  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
-AP[2]          90:B1:5F:9E:E0:E3  wlan0-ap-1  Infra  1     54 Mbit/s  44      **    WPA1      
-AP[3]          61:66:D2:E7:44:A2  wlan0-ap-2  Infra  1     54 Mbit/s  34      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          60:B3:25:25:E2:C8  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
+AP[2]          90:B1:5F:9E:E0:E3  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  44      **    WPA1      
+AP[3]          61:66:D2:E7:44:A2  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  34      **    WPA1 WPA2 
 
 <<<
-size: 574
+size: 610
 location: src/tests/client/test-client.py:test_002()/14
 cmd: $NMCLI -f AP -mode tabular d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 414 bytes
+stdout: 450 bytes
 >>>
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          60:B3:25:25:E2:C8  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
-AP[2]          90:B1:5F:9E:E0:E3  wlan0-ap-1  Infrastruktura  1     54 Mb/s  44      **    WPA1      
-AP[3]          61:66:D2:E7:44:A2  wlan0-ap-2  Infrastruktura  1     54 Mb/s  34      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          60:B3:25:25:E2:C8  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
+AP[2]          90:B1:5F:9E:E0:E3  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  44      **    WPA1      
+AP[3]          61:66:D2:E7:44:A2  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  34      **    WPA1 WPA2 
 
 <<<
-size: 708
+size: 753
 location: src/tests/client/test-client.py:test_002()/15
 cmd: $NMCLI -f AP -mode tabular -p d show wlan0
 lang: C
 returncode: 0
-stdout: 555 bytes
+stdout: 600 bytes
 >>>
 ==========================
   Device details (wlan0)
 ==========================
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------------------
-AP[1]          60:B3:25:25:E2:C8  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
-AP[2]          90:B1:5F:9E:E0:E3  wlan0-ap-1  Infra  1     54 Mbit/s  44      **    WPA1      
-AP[3]          61:66:D2:E7:44:A2  wlan0-ap-2  Infra  1     54 Mbit/s  34      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+--------------------------------------------------------------------------------------------------------
+AP[1]          60:B3:25:25:E2:C8  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
+AP[2]          90:B1:5F:9E:E0:E3  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  44      **    WPA1      
+AP[3]          61:66:D2:E7:44:A2  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  34      **    WPA1 WPA2 
 
 <<<
-size: 788
+size: 833
 location: src/tests/client/test-client.py:test_002()/16
 cmd: $NMCLI -f AP -mode tabular -p d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 625 bytes
+stdout: 670 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
 ===================================
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------------
-AP[1]          60:B3:25:25:E2:C8  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
-AP[2]          90:B1:5F:9E:E0:E3  wlan0-ap-1  Infrastruktura  1     54 Mb/s  44      **    WPA1      
-AP[3]          61:66:D2:E7:44:A2  wlan0-ap-2  Infrastruktura  1     54 Mb/s  34      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------
+AP[1]          60:B3:25:25:E2:C8  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
+AP[2]          90:B1:5F:9E:E0:E3  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  44      **    WPA1      
+AP[3]          61:66:D2:E7:44:A2  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  34      **    WPA1 WPA2 
 
 <<<
-size: 377
+size: 400
 location: src/tests/client/test-client.py:test_002()/17
 cmd: $NMCLI -f AP -mode tabular -t d show wlan0
 lang: C
 returncode: 0
-stdout: 224 bytes
+stdout: 247 bytes
 >>>
-AP[1]: :60\:B3\:25\:25\:E2\:C8:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
-AP[2]: :90\:B1\:5F\:9E\:E0\:E3:wlan0-ap-1:Infra:1:54 Mbit/s:44:**  :WPA1
-AP[3]: :61\:66\:D2\:E7\:44\:A2:wlan0-ap-2:Infra:1:54 Mbit/s:34:**  :WPA1 WPA2
+AP[1]: :60\:B3\:25\:25\:E2\:C8:wlan0-ap-3:Infra:6 GHz:129:54 Mbit/s:55:**  :WPA3
+AP[2]: :90\:B1\:5F\:9E\:E0\:E3:wlan0-ap-1:Infra:2.4 GHz:6:54 Mbit/s:44:**  :WPA1
+AP[3]: :61\:66\:D2\:E7\:44\:A2:wlan0-ap-2:Infra:5 GHz:44:54 Mbit/s:34:**  :WPA1 WPA2
 
 <<<
-size: 414
+size: 437
 location: src/tests/client/test-client.py:test_002()/18
 cmd: $NMCLI -f AP -mode tabular -t d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 251 bytes
+stdout: 274 bytes
 >>>
-AP[1]: :60\:B3\:25\:25\:E2\:C8:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
-AP[2]: :90\:B1\:5F\:9E\:E0\:E3:wlan0-ap-1:Infrastruktura:1:54 Mb/s:44:**  :WPA1
-AP[3]: :61\:66\:D2\:E7\:44\:A2:wlan0-ap-2:Infrastruktura:1:54 Mb/s:34:**  :WPA1 WPA2
+AP[1]: :60\:B3\:25\:25\:E2\:C8:wlan0-ap-3:Infrastruktura:6 GHz:129:54 Mb/s:55:**  :WPA3
+AP[2]: :90\:B1\:5F\:9E\:E0\:E3:wlan0-ap-1:Infrastruktura:2.4 GHz:6:54 Mb/s:44:**  :WPA1
+AP[3]: :61\:66\:D2\:E7\:44\:A2:wlan0-ap-2:Infrastruktura:5 GHz:44:54 Mb/s:34:**  :WPA1 WPA2
 
 <<<
-size: 2049
+size: 2109
 location: src/tests/client/test-client.py:test_002()/19
 cmd: $NMCLI -f ALL d wifi
 lang: C
 returncode: 0
-stdout: 1917 bytes
+stdout: 1977 bytes
 >>>
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-3  776C616E302D61702D33  60:B3:25:25:E2:C8  Infra  1     2412 MHz  54 Mbit/s  40 MHz     55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  90:B1:5F:9E:E0:E3  Infra  1     2412 MHz  54 Mbit/s  40 MHz     44      **    WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-2  776C616E302D61702D32  61:66:D2:E7:44:A2  Infra  1     2412 MHz  54 Mbit/s  40 MHz     34      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND     FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-3  776C616E302D61702D33  60:B3:25:25:E2:C8  Infra  129   6 GHz    6595 MHz  54 Mbit/s  40 MHz     55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  90:B1:5F:9E:E0:E3  Infra  6     2.4 GHz  2437 MHz  54 Mbit/s  40 MHz     44      **    WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-2  776C616E302D61702D32  61:66:D2:E7:44:A2  Infra  44    5 GHz    5220 MHz  54 Mbit/s  40 MHz     34      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan1-ap-4  776C616E312D61702D34  EE:52:8B:49:A1:96  Infra  1     2412 MHz  54 Mbit/s  40 MHz     38      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND     FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan1-ap-4  776C616E312D61702D34  EE:52:8B:49:A1:96  Infra  1     2.4 GHz  2412 MHz  54 Mbit/s  40 MHz     38      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
 
-NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
+NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  BAND  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
 <<<
-size: 2125
+size: 2185
 location: src/tests/client/test-client.py:test_002()/20
 cmd: $NMCLI -f ALL d wifi
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1983 bytes
+stdout: 2043 bytes
 >>>
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-3  776C616E302D61702D33  60:B3:25:25:E2:C8  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  90:B1:5F:9E:E0:E3  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     44      **    WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-2  776C616E302D61702D32  61:66:D2:E7:44:A2  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     34      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND     FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-3  776C616E302D61702D33  60:B3:25:25:E2:C8  Infrastruktura  129   6 GHz    6595 MHz  54 Mb/s  40 MHz     55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  90:B1:5F:9E:E0:E3  Infrastruktura  6     2.4 GHz  2437 MHz  54 Mb/s  40 MHz     44      **    WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-2  776C616E302D61702D32  61:66:D2:E7:44:A2  Infrastruktura  44    5 GHz    5220 MHz  54 Mb/s  40 MHz     34      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan1-ap-4  776C616E312D61702D34  EE:52:8B:49:A1:96  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     38      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND     FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan1-ap-4  776C616E312D61702D34  EE:52:8B:49:A1:96  Infrastruktura  1     2.4 GHz  2412 MHz  54 Mb/s  40 MHz     38      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
 
-NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
+NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  BAND  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
 <<<
 size: 245
diff --git a/src/tests/client/test-client.check-on-disk/test_003.expected b/src/tests/client/test-client.check-on-disk/test_003.expected
index 809b5579..69e5bfea 100644
--- a/src/tests/client/test-client.check-on-disk/test_003.expected
+++ b/src/tests/client/test-client.check-on-disk/test_003.expected
@@ -104,36 +104,36 @@ con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --
 ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --     
 
 <<<
-size: 2068
+size: 2061
 location: src/tests/client/test-client.py:test_003()/10
 cmd: $NMCLI -f ALL c s
 lang: C
 returncode: 0
-stdout: 1939 bytes
+stdout: 1932 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE  ACTIVE-PATH  SLAVE  FILENAME                                        
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --     --           --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --     --           --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --     --           --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --     --           --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --     --           --     /etc/NetworkManager/system-connections/con-xx1  
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  no      --      --     --           --     /etc/NetworkManager/system-connections/ethernet 
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE  ACTIVE-PATH  PORT  FILENAME                                        
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --     --           --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --     --           --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --     --           --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --     --           --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --     --           --    /etc/NetworkManager/system-connections/con-xx1  
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  no      --      --     --           --    /etc/NetworkManager/system-connections/ethernet 
 
 <<<
-size: 2078
+size: 2071
 location: src/tests/client/test-client.py:test_003()/11
 cmd: $NMCLI -f ALL c s
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1939 bytes
+stdout: 1932 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE  ACTIVE-PATH  SLAVE  FILENAME                                        
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --     --           --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --     --           --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --     --           --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --     --           --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --     --           --     /etc/NetworkManager/system-connections/con-xx1  
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  nie     --      --     --           --     /etc/NetworkManager/system-connections/ethernet 
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE  ACTIVE-PATH  PORT  FILENAME                                        
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --     --           --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --     --           --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --     --           --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --     --           --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --     --           --    /etc/NetworkManager/system-connections/con-xx1  
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  nie     --      --     --           --    /etc/NetworkManager/system-connections/ethernet 
 
 <<<
 size: 247
@@ -182,12 +182,12 @@ id
 path
 uuid
 <<<
-size: 6675
+size: 6728
 location: src/tests/client/test-client.py:test_003()/14
 cmd: $NMCLI con s con-gsm1
 lang: C
 returncode: 0
-stdout: 6542 bytes
+stdout: 6595 bytes
 >>>
 connection.id:                          con-gsm1
 connection.uuid:                        UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -255,6 +255,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -332,12 +333,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 6718
+size: 6771
 location: src/tests/client/test-client.py:test_003()/15
 cmd: $NMCLI con s con-gsm1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6575 bytes
+stdout: 6628 bytes
 >>>
 connection.id:                          con-gsm1
 connection.uuid:                        UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -405,6 +406,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -482,42 +484,42 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 588
+size: 591
 location: src/tests/client/test-client.py:test_003()/16
 cmd: $NMCLI -g all con s con-gsm1
 lang: C
 returncode: 0
-stdout: 449 bytes
+stdout: 452 bytes
 >>>
 connection:con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL::gsm::no:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
-ipv4:auto::: :0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::: :0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 serial:5:8:even:1:100
 gsm:no:::<hidden>:0:xyz.con-gsm1::<hidden>:0:no::::auto:no:::<hidden>:0:yes:no:no:no:no:no:
 proxy:none:no::
 
 <<<
-size: 598
+size: 601
 location: src/tests/client/test-client.py:test_003()/17
 cmd: $NMCLI -g all con s con-gsm1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 449 bytes
+stdout: 452 bytes
 >>>
 connection:con-gsm1:UUID-con-gsm1-REPLACED-REPLACED-REPL::gsm::no:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
-ipv4:auto::: :0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::: :0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 serial:5:8:even:1:100
 gsm:no:::<hidden>:0:xyz.con-gsm1::<hidden>:0:no::::auto:no:::<hidden>:0:yes:no:no:no:no:no:
 proxy:none:no::
 
 <<<
-size: 6663
+size: 6716
 location: src/tests/client/test-client.py:test_003()/18
 cmd: $NMCLI con s con-gsm2
 lang: C
 returncode: 0
-stdout: 6530 bytes
+stdout: 6583 bytes
 >>>
 connection.id:                          con-gsm2
 connection.uuid:                        UUID-con-gsm2-REPLACED-REPLACED-REPL
@@ -585,6 +587,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -662,12 +665,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 6706
+size: 6759
 location: src/tests/client/test-client.py:test_003()/19
 cmd: $NMCLI con s con-gsm2
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6563 bytes
+stdout: 6616 bytes
 >>>
 connection.id:                          con-gsm2
 connection.uuid:                        UUID-con-gsm2-REPLACED-REPLACED-REPL
@@ -735,6 +738,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -812,42 +816,42 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 576
+size: 579
 location: src/tests/client/test-client.py:test_003()/20
 cmd: $NMCLI -g all con s con-gsm2
 lang: C
 returncode: 0
-stdout: 437 bytes
+stdout: 440 bytes
 >>>
 connection:con-gsm2:UUID-con-gsm2-REPLACED-REPLACED-REPL::gsm::no:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
-ipv4:auto::: :0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::: :0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 serial:5:8:even:1:100
 gsm:no:::<hidden>:0:::<hidden>:0:no::::auto:no:::<hidden>:0:yes:no:no:no:no:no:
 proxy:none:no::
 
 <<<
-size: 586
+size: 589
 location: src/tests/client/test-client.py:test_003()/21
 cmd: $NMCLI -g all con s con-gsm2
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 437 bytes
+stdout: 440 bytes
 >>>
 connection:con-gsm2:UUID-con-gsm2-REPLACED-REPLACED-REPL::gsm::no:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
-ipv4:auto::: :0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::: :0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 serial:5:8:even:1:100
 gsm:no:::<hidden>:0:::<hidden>:0:no::::auto:no:::<hidden>:0:yes:no:no:no:no:no:
 proxy:none:no::
 
 <<<
-size: 6663
+size: 6716
 location: src/tests/client/test-client.py:test_003()/22
 cmd: $NMCLI con s con-gsm3
 lang: C
 returncode: 0
-stdout: 6530 bytes
+stdout: 6583 bytes
 >>>
 connection.id:                          con-gsm3
 connection.uuid:                        UUID-con-gsm3-REPLACED-REPLACED-REPL
@@ -915,6 +919,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -992,12 +997,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 6706
+size: 6759
 location: src/tests/client/test-client.py:test_003()/23
 cmd: $NMCLI con s con-gsm3
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6563 bytes
+stdout: 6616 bytes
 >>>
 connection.id:                          con-gsm3
 connection.uuid:                        UUID-con-gsm3-REPLACED-REPLACED-REPL
@@ -1065,6 +1070,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -1142,30 +1148,30 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 577
+size: 580
 location: src/tests/client/test-client.py:test_003()/24
 cmd: $NMCLI -g all con s con-gsm3
 lang: C
 returncode: 0
-stdout: 438 bytes
+stdout: 441 bytes
 >>>
 connection:con-gsm3:UUID-con-gsm3-REPLACED-REPLACED-REPL::gsm::no:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
-ipv4:auto::: :0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::: :0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 serial:5:8:even:1:100
 gsm:no:::<hidden>:0: ::<hidden>:0:no::::auto:no:::<hidden>:0:yes:no:no:no:no:no:
 proxy:none:no::
 
 <<<
-size: 587
+size: 590
 location: src/tests/client/test-client.py:test_003()/25
 cmd: $NMCLI -g all con s con-gsm3
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 438 bytes
+stdout: 441 bytes
 >>>
 connection:con-gsm3:UUID-con-gsm3-REPLACED-REPLACED-REPL::gsm::no:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
-ipv4:auto::: :0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::: :0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 serial:5:8:even:1:100
 gsm:no:::<hidden>:0: ::<hidden>:0:no::::auto:no:::<hidden>:0:yes:no:no:no:no:no:
@@ -1214,58 +1220,58 @@ con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       --
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --     
 
 <<<
-size: 2369
+size: 2362
 location: src/tests/client/test-client.py:test_003()/29
 cmd: $NMCLI -f ALL con
 lang: C
 returncode: 0
-stdout: 2240 bytes
+stdout: 2233 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE      ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    activated  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --         --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --         --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --         --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --         --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --         --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE      ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    activated  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --         --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --         --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --         --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --         --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --         --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
-size: 2386
+size: 2379
 location: src/tests/client/test-client.py:test_003()/30
 cmd: $NMCLI -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2247 bytes
+stdout: 2240 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE       ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --          --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --          --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --          --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --          --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --          --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE       ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --          --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --          --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --          --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --          --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --          --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
-size: 773
+size: 771
 location: src/tests/client/test-client.py:test_003()/31
 cmd: $NMCLI -f ALL con s -a
 lang: C
 returncode: 0
-stdout: 640 bytes
+stdout: 638 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE      ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    activated  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE      ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    activated  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
 
 <<<
-size: 785
+size: 783
 location: src/tests/client/test-client.py:test_003()/32
 cmd: $NMCLI -f ALL con s -a
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 642 bytes
+stdout: 640 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE       ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE       ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
 
 <<<
 size: 351
@@ -1312,12 +1318,12 @@ UUID                                  NAME
 UUID-ethernet-REPLACED-REPLACED-REPL  ethernet 
 
 <<<
-size: 5972
+size: 6025
 location: src/tests/client/test-client.py:test_003()/37
 cmd: $NMCLI -f ALL con s ethernet
 lang: C
 returncode: 0
-stdout: 5832 bytes
+stdout: 5885 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1400,6 +1406,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -1446,12 +1453,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 6007
+size: 6060
 location: src/tests/client/test-client.py:test_003()/38
 cmd: $NMCLI -f ALL con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5857 bytes
+stdout: 5910 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1534,6 +1541,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -1600,12 +1608,12 @@ stdout: 51 bytes
 GENERAL.STATE:                          aktywowano
 
 <<<
-size: 6674
+size: 6770
 location: src/tests/client/test-client.py:test_003()/41
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
-stdout: 6541 bytes
+stdout: 6637 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1688,6 +1696,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -1744,15 +1753,16 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 6713
+size: 6809
 location: src/tests/client/test-client.py:test_003()/42
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6570 bytes
+stdout: 6666 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -1835,6 +1845,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -1891,6 +1902,7 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
@@ -1944,12 +1956,12 @@ stderr: 54 bytes
 Błąd: nieprawidłowy dodatkowy parametr „eth0”.
 
 <<<
-size: 3792
+size: 3966
 location: src/tests/client/test-client.py:test_003()/47
 cmd: $NMCLI -f ALL dev show eth0
 lang: C
 returncode: 0
-stdout: 3653 bytes
+stdout: 3827 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -1996,6 +2008,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:                         2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:                         2001:a::8191:ed6b:8ce:b60/103
@@ -2006,6 +2019,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
@@ -2016,12 +2031,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 3830
+size: 4004
 location: src/tests/client/test-client.py:test_003()/48
 cmd: $NMCLI -f ALL dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3681 bytes
+stdout: 3855 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -2068,6 +2083,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:                         2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:                         2001:a::8191:ed6b:8ce:b60/103
@@ -2078,6 +2094,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
@@ -2088,12 +2106,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2420
+size: 2524
 location: src/tests/client/test-client.py:test_003()/49
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: C
 returncode: 0
-stdout: 2278 bytes
+stdout: 2382 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -2140,6 +2158,7 @@ IP4.DNS[1]:192.168.213.113
 IP4.DOMAIN[1]:sear4.foo4.bar
 IP4.WINS[1]:192.168.156.115
 IP4.WINS[2]:192.168.8.33
+IP4.CLAT-ADDRESS:192.0.0.1
 IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
@@ -2150,6 +2169,8 @@ IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:sear6.fo.x.y
 IP6.DOMAIN[2]:sear6.foo4.bar
+IP6.CLAT-ADDRESS:2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:64:ff9b::/96
 DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
@@ -2160,12 +2181,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2430
+size: 2534
 location: src/tests/client/test-client.py:test_003()/50
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2278 bytes
+stdout: 2382 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -2212,6 +2233,7 @@ IP4.DNS[1]:192.168.213.113
 IP4.DOMAIN[1]:sear4.foo4.bar
 IP4.WINS[1]:192.168.156.115
 IP4.WINS[2]:192.168.8.33
+IP4.CLAT-ADDRESS:192.0.0.1
 IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
@@ -2222,6 +2244,8 @@ IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:sear6.fo.x.y
 IP6.DOMAIN[2]:sear6.foo4.bar
+IP6.CLAT-ADDRESS:2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:64:ff9b::/96
 DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
@@ -2276,62 +2300,62 @@ con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       --
 con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --     
 
 <<<
-size: 2689
+size: 2681
 location: src/tests/client/test-client.py:test_003()/54
 cmd: $NMCLI -f ALL con
 lang: C
 returncode: 0
-stdout: 2560 bytes
+stdout: 2552 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE      ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    activated  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated  /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --         --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --         --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --         --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --         --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --         --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE      ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    activated  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated  /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --         --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --         --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --         --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --         --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --         --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
-size: 2707
+size: 2699
 location: src/tests/client/test-client.py:test_003()/55
 cmd: $NMCLI -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2568 bytes
+stdout: 2560 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE       ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --          --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --          --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --          --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --          --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --          --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE       ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --          --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --          --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --          --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --          --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --          --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
-size: 1093
+size: 1090
 location: src/tests/client/test-client.py:test_003()/56
 cmd: $NMCLI -f ALL con s -a
 lang: C
 returncode: 0
-stdout: 960 bytes
+stdout: 957 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE      ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    activated  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated  /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE      ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    activated  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated  /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
 
 <<<
-size: 1106
+size: 1103
 location: src/tests/client/test-client.py:test_003()/57
 cmd: $NMCLI -f ALL con s -a
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 963 bytes
+stdout: 960 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE       ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE       ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
 
 <<<
 size: 449
@@ -2380,12 +2404,12 @@ UUID                                  NAME
 UUID-ethernet-REPLACED-REPLACED-REPL  ethernet 
 
 <<<
-size: 5972
+size: 6025
 location: src/tests/client/test-client.py:test_003()/62
 cmd: $NMCLI -f ALL con s ethernet
 lang: C
 returncode: 0
-stdout: 5832 bytes
+stdout: 5885 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2468,6 +2492,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -2514,12 +2539,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 6007
+size: 6060
 location: src/tests/client/test-client.py:test_003()/63
 cmd: $NMCLI -f ALL con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5857 bytes
+stdout: 5910 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2602,6 +2627,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -2672,12 +2698,12 @@ GENERAL.STATE:                          aktywowano
 GENERAL.STATE:                          aktywowano
 
 <<<
-size: 7384
+size: 7523
 location: src/tests/client/test-client.py:test_003()/66
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
-stdout: 7251 bytes
+stdout: 7390 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2760,6 +2786,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -2816,6 +2843,7 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 GENERAL.NAME:                           ethernet
@@ -2830,15 +2858,16 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 7427
+size: 7566
 location: src/tests/client/test-client.py:test_003()/67
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7284 bytes
+stdout: 7423 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -2921,6 +2950,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -2977,6 +3007,7 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 GENERAL.NAME:                           ethernet
@@ -2991,6 +3022,7 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
@@ -3044,12 +3076,12 @@ stderr: 54 bytes
 Błąd: nieprawidłowy dodatkowy parametr „eth0”.
 
 <<<
-size: 3792
+size: 3966
 location: src/tests/client/test-client.py:test_003()/72
 cmd: $NMCLI -f ALL dev show eth0
 lang: C
 returncode: 0
-stdout: 3653 bytes
+stdout: 3827 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -3096,6 +3128,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:                         2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:                         2001:a::8191:ed6b:8ce:b60/103
@@ -3106,6 +3139,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
@@ -3116,12 +3151,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 3830
+size: 4004
 location: src/tests/client/test-client.py:test_003()/73
 cmd: $NMCLI -f ALL dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3681 bytes
+stdout: 3855 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -3168,6 +3203,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:                         2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:                         2001:a::8191:ed6b:8ce:b60/103
@@ -3178,6 +3214,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
@@ -3188,12 +3226,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2420
+size: 2524
 location: src/tests/client/test-client.py:test_003()/74
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: C
 returncode: 0
-stdout: 2278 bytes
+stdout: 2382 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -3240,6 +3278,7 @@ IP4.DNS[1]:192.168.213.113
 IP4.DOMAIN[1]:sear4.foo4.bar
 IP4.WINS[1]:192.168.156.115
 IP4.WINS[2]:192.168.8.33
+IP4.CLAT-ADDRESS:192.0.0.1
 IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
@@ -3250,6 +3289,8 @@ IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:sear6.fo.x.y
 IP6.DOMAIN[2]:sear6.foo4.bar
+IP6.CLAT-ADDRESS:2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:64:ff9b::/96
 DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
@@ -3260,12 +3301,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2430
+size: 2534
 location: src/tests/client/test-client.py:test_003()/75
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2278 bytes
+stdout: 2382 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -3312,6 +3353,7 @@ IP4.DNS[1]:192.168.213.113
 IP4.DOMAIN[1]:sear4.foo4.bar
 IP4.WINS[1]:192.168.156.115
 IP4.WINS[2]:192.168.8.33
+IP4.CLAT-ADDRESS:192.0.0.1
 IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
@@ -3322,6 +3364,8 @@ IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:sear6.fo.x.y
 IP6.DOMAIN[2]:sear6.foo4.bar
+IP6.CLAT-ADDRESS:2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:64:ff9b::/96
 DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
@@ -3436,38 +3480,38 @@ Strony podręcznika nmcli(1) i nmcli-examples(7) zawierają pełne informacje
 o użyciu.
 
 <<<
-size: 2713
+size: 2705
 location: src/tests/client/test-client.py:test_003()/80
 cmd: $NMCLI -f ALL con
 lang: C
 returncode: 0
-stdout: 2584 bytes
+stdout: 2576 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
-size: 2739
+size: 2731
 location: src/tests/client/test-client.py:test_003()/81
 cmd: $NMCLI -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2600 bytes
+stdout: 2592 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 470
@@ -3502,12 +3546,12 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 7387
+size: 7526
 location: src/tests/client/test-client.py:test_003()/84
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
-stdout: 7254 bytes
+stdout: 7393 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -3590,6 +3634,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -3646,6 +3691,7 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 GENERAL.NAME:                           ethernet
@@ -3660,15 +3706,16 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 7431
+size: 7570
 location: src/tests/client/test-client.py:test_003()/85
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7288 bytes
+stdout: 7427 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -3751,6 +3798,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -3807,6 +3855,7 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 GENERAL.NAME:                           ethernet
@@ -3821,15 +3870,16 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 6717
+size: 6813
 location: src/tests/client/test-client.py:test_003()/86
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 6544 bytes
+stdout: 6640 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -3912,6 +3962,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -3968,15 +4019,16 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 6757
+size: 6853
 location: src/tests/client/test-client.py:test_003()/87
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6574 bytes
+stdout: 6670 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -4059,6 +4111,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -4115,15 +4168,16 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3792
+size: 3966
 location: src/tests/client/test-client.py:test_003()/88
 cmd: $NMCLI -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3653 bytes
+stdout: 3827 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -4170,6 +4224,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:                         2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:                         2001:a::8191:ed6b:8ce:b60/103
@@ -4180,6 +4235,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
@@ -4190,12 +4247,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 3830
+size: 4004
 location: src/tests/client/test-client.py:test_003()/89
 cmd: $NMCLI -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3681 bytes
+stdout: 3855 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -4242,6 +4299,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:                         2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:                         2001:a::8191:ed6b:8ce:b60/103
@@ -4252,6 +4310,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
@@ -4262,38 +4322,38 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2995
+size: 2987
 location: src/tests/client/test-client.py:test_003()/90
 cmd: $NMCLI --color yes -f ALL con
 lang: C
 returncode: 0
-stdout: 2854 bytes
+stdout: 2846 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
-size: 3021
+size: 3013
 location: src/tests/client/test-client.py:test_003()/91
 cmd: $NMCLI --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2870 bytes
+stdout: 2862 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 500
@@ -4328,12 +4388,12 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 7399
+size: 7538
 location: src/tests/client/test-client.py:test_003()/94
 cmd: $NMCLI --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 7254 bytes
+stdout: 7393 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -4416,6 +4476,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -4472,6 +4533,7 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 GENERAL.NAME:                           ethernet
@@ -4486,15 +4548,16 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 7443
+size: 7582
 location: src/tests/client/test-client.py:test_003()/95
 cmd: $NMCLI --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7288 bytes
+stdout: 7427 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -4577,6 +4640,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -4633,6 +4697,7 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 GENERAL.NAME:                           ethernet
@@ -4647,15 +4712,16 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 6729
+size: 6825
 location: src/tests/client/test-client.py:test_003()/96
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 6544 bytes
+stdout: 6640 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -4738,6 +4804,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -4794,15 +4861,16 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 6769
+size: 6865
 location: src/tests/client/test-client.py:test_003()/97
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6574 bytes
+stdout: 6670 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -4885,6 +4953,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -4941,15 +5010,16 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3804
+size: 3978
 location: src/tests/client/test-client.py:test_003()/98
 cmd: $NMCLI --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3653 bytes
+stdout: 3827 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -4996,6 +5066,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:                         2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:                         2001:a::8191:ed6b:8ce:b60/103
@@ -5006,6 +5077,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
@@ -5016,12 +5089,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 3842
+size: 4016
 location: src/tests/client/test-client.py:test_003()/99
 cmd: $NMCLI --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3681 bytes
+stdout: 3855 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -5068,6 +5141,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:                         2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:                         2001:a::8191:ed6b:8ce:b60/103
@@ -5078,6 +5152,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
@@ -5088,46 +5164,46 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 3200
+size: 3191
 location: src/tests/client/test-client.py:test_003()/100
 cmd: $NMCLI --pretty -f ALL con
 lang: C
 returncode: 0
-stdout: 3061 bytes
+stdout: 3052 bytes
 >>>
 ======================================
   NetworkManager connection profiles
 ======================================
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
-
-<<<
-size: 3248
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         PORT  FILENAME                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
+
+<<<
+size: 3239
 location: src/tests/client/test-client.py:test_003()/101
 cmd: $NMCLI --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3099 bytes
+stdout: 3090 bytes
 >>>
 ==========================================
   Profile połączeń usługi NetworkManager
 ==========================================
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         PORT  FILENAME                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 682
@@ -5170,12 +5246,12 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 8640
+size: 8779
 location: src/tests/client/test-client.py:test_003()/104
 cmd: $NMCLI --pretty con s ethernet
 lang: C
 returncode: 0
-stdout: 8497 bytes
+stdout: 8636 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -5263,6 +5339,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -5325,6 +5402,7 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
@@ -5343,16 +5421,17 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 8705
+size: 8844
 location: src/tests/client/test-client.py:test_003()/105
 cmd: $NMCLI --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 8552 bytes
+stdout: 8691 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -5440,6 +5519,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -5502,6 +5582,7 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
@@ -5520,16 +5601,17 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 7658
+size: 7754
 location: src/tests/client/test-client.py:test_003()/106
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 7475 bytes
+stdout: 7571 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -5617,6 +5699,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -5679,16 +5762,17 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 7711
+size: 7807
 location: src/tests/client/test-client.py:test_003()/107
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7518 bytes
+stdout: 7614 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -5776,6 +5860,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -5838,16 +5923,17 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4733
+size: 4907
 location: src/tests/client/test-client.py:test_003()/108
 cmd: $NMCLI --pretty -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4584 bytes
+stdout: 4758 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -5901,6 +5987,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
@@ -5913,6 +6000,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 -------------------------------------------------------------------------------
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
@@ -5926,12 +6015,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 -------------------------------------------------------------------------------
 
 <<<
-size: 4777
+size: 4951
 location: src/tests/client/test-client.py:test_003()/109
 cmd: $NMCLI --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4618 bytes
+stdout: 4792 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -5985,6 +6074,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
@@ -5997,6 +6087,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 -------------------------------------------------------------------------------
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
@@ -6010,46 +6102,46 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 -------------------------------------------------------------------------------
 
 <<<
-size: 3482
+size: 3473
 location: src/tests/client/test-client.py:test_003()/110
 cmd: $NMCLI --pretty --color yes -f ALL con
 lang: C
 returncode: 0
-stdout: 3331 bytes
+stdout: 3322 bytes
 >>>
 ======================================
   NetworkManager connection profiles
 ======================================
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
-
-<<<
-size: 3530
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         PORT  FILENAME                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
+
+<<<
+size: 3521
 location: src/tests/client/test-client.py:test_003()/111
 cmd: $NMCLI --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3369 bytes
+stdout: 3360 bytes
 >>>
 ==========================================
   Profile połączeń usługi NetworkManager
 ==========================================
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         PORT  FILENAME                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 712
@@ -6092,12 +6184,12 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 8652
+size: 8791
 location: src/tests/client/test-client.py:test_003()/114
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 8497 bytes
+stdout: 8636 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -6185,6 +6277,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -6247,6 +6340,7 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
@@ -6265,16 +6359,17 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 8717
+size: 8856
 location: src/tests/client/test-client.py:test_003()/115
 cmd: $NMCLI --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 8552 bytes
+stdout: 8691 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -6362,6 +6457,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -6424,6 +6520,7 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
@@ -6442,16 +6539,17 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 7670
+size: 7766
 location: src/tests/client/test-client.py:test_003()/116
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 7475 bytes
+stdout: 7571 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -6539,6 +6637,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -6601,16 +6700,17 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 7723
+size: 7819
 location: src/tests/client/test-client.py:test_003()/117
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7518 bytes
+stdout: 7614 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -6698,6 +6798,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -6760,16 +6861,17 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4745
+size: 4919
 location: src/tests/client/test-client.py:test_003()/118
 cmd: $NMCLI --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4584 bytes
+stdout: 4758 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -6823,6 +6925,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
@@ -6835,6 +6938,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 -------------------------------------------------------------------------------
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
@@ -6848,12 +6953,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 -------------------------------------------------------------------------------
 
 <<<
-size: 4789
+size: 4963
 location: src/tests/client/test-client.py:test_003()/119
 cmd: $NMCLI --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4618 bytes
+stdout: 4792 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -6907,6 +7012,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
@@ -6919,6 +7025,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 -------------------------------------------------------------------------------
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
@@ -6994,12 +7102,12 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 3959
+size: 4022
 location: src/tests/client/test-client.py:test_003()/124
 cmd: $NMCLI --terse con s ethernet
 lang: C
 returncode: 0
-stdout: 3817 bytes
+stdout: 3880 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -7082,6 +7190,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -7138,6 +7247,7 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 GENERAL.NAME:ethernet
@@ -7152,15 +7262,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3969
+size: 4032
 location: src/tests/client/test-client.py:test_003()/125
 cmd: $NMCLI --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3817 bytes
+stdout: 3880 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -7243,6 +7354,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -7299,6 +7411,7 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 GENERAL.NAME:ethernet
@@ -7313,15 +7426,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3609
+size: 3647
 location: src/tests/client/test-client.py:test_003()/126
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 3427 bytes
+stdout: 3465 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -7404,6 +7518,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -7460,15 +7575,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3619
+size: 3657
 location: src/tests/client/test-client.py:test_003()/127
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3427 bytes
+stdout: 3465 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -7551,6 +7667,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -7607,15 +7724,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2426
+size: 2530
 location: src/tests/client/test-client.py:test_003()/128
 cmd: $NMCLI --terse -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2278 bytes
+stdout: 2382 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -7662,6 +7780,7 @@ IP4.DNS[1]:192.168.213.113
 IP4.DOMAIN[1]:sear4.foo4.bar
 IP4.WINS[1]:192.168.156.115
 IP4.WINS[2]:192.168.8.33
+IP4.CLAT-ADDRESS:192.0.0.1
 IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
@@ -7672,6 +7791,8 @@ IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:sear6.fo.x.y
 IP6.DOMAIN[2]:sear6.foo4.bar
+IP6.CLAT-ADDRESS:2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:64:ff9b::/96
 DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
@@ -7682,12 +7803,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2436
+size: 2540
 location: src/tests/client/test-client.py:test_003()/129
 cmd: $NMCLI --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2278 bytes
+stdout: 2382 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -7734,6 +7855,7 @@ IP4.DNS[1]:192.168.213.113
 IP4.DOMAIN[1]:sear4.foo4.bar
 IP4.WINS[1]:192.168.156.115
 IP4.WINS[2]:192.168.8.33
+IP4.CLAT-ADDRESS:192.0.0.1
 IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
@@ -7744,6 +7866,8 @@ IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:sear6.fo.x.y
 IP6.DOMAIN[2]:sear6.foo4.bar
+IP6.CLAT-ADDRESS:2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:64:ff9b::/96
 DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
@@ -7816,12 +7940,12 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 3971
+size: 4034
 location: src/tests/client/test-client.py:test_003()/134
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 3817 bytes
+stdout: 3880 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -7904,6 +8028,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -7960,6 +8085,7 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 GENERAL.NAME:ethernet
@@ -7974,15 +8100,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3981
+size: 4044
 location: src/tests/client/test-client.py:test_003()/135
 cmd: $NMCLI --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3817 bytes
+stdout: 3880 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8065,6 +8192,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -8121,6 +8249,7 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 GENERAL.NAME:ethernet
@@ -8135,15 +8264,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3621
+size: 3659
 location: src/tests/client/test-client.py:test_003()/136
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 3427 bytes
+stdout: 3465 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8226,6 +8356,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -8282,15 +8413,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3631
+size: 3669
 location: src/tests/client/test-client.py:test_003()/137
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3427 bytes
+stdout: 3465 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -8373,6 +8505,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -8429,15 +8562,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2438
+size: 2542
 location: src/tests/client/test-client.py:test_003()/138
 cmd: $NMCLI --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2278 bytes
+stdout: 2382 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -8484,6 +8618,7 @@ IP4.DNS[1]:192.168.213.113
 IP4.DOMAIN[1]:sear4.foo4.bar
 IP4.WINS[1]:192.168.156.115
 IP4.WINS[2]:192.168.8.33
+IP4.CLAT-ADDRESS:192.0.0.1
 IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
@@ -8494,6 +8629,8 @@ IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:sear6.fo.x.y
 IP6.DOMAIN[2]:sear6.foo4.bar
+IP6.CLAT-ADDRESS:2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:64:ff9b::/96
 DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
@@ -8504,12 +8641,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2448
+size: 2552
 location: src/tests/client/test-client.py:test_003()/139
 cmd: $NMCLI --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2278 bytes
+stdout: 2382 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -8556,6 +8693,7 @@ IP4.DNS[1]:192.168.213.113
 IP4.DOMAIN[1]:sear4.foo4.bar
 IP4.WINS[1]:192.168.156.115
 IP4.WINS[2]:192.168.8.33
+IP4.CLAT-ADDRESS:192.0.0.1
 IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
@@ -8566,6 +8704,8 @@ IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:sear6.fo.x.y
 IP6.DOMAIN[2]:sear6.foo4.bar
+IP6.CLAT-ADDRESS:2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:64:ff9b::/96
 DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
@@ -8576,38 +8716,38 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2729
+size: 2721
 location: src/tests/client/test-client.py:test_003()/140
 cmd: $NMCLI --mode tabular -f ALL con
 lang: C
 returncode: 0
-stdout: 2584 bytes
+stdout: 2576 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
-size: 2755
+size: 2747
 location: src/tests/client/test-client.py:test_003()/141
 cmd: $NMCLI --mode tabular -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2600 bytes
+stdout: 2592 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 486
@@ -8642,12 +8782,12 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 5083
+size: 5179
 location: src/tests/client/test-client.py:test_003()/144
 cmd: $NMCLI --mode tabular con s ethernet
 lang: C
 returncode: 0
-stdout: 4934 bytes
+stdout: 5030 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  permissions  zone  controller  master  slave-type  port-type  autoconnect-slaves  autoconnect-ports  down-on-poweroff  secondaries  gateway-ping-timeout  ip-ping-timeout  ip-ping-addresses  ip-ping-addresses-require-all  metered  lldp     mdns          llmnr         dns-over-tls  dnssec        mptcp-flags    wait-device-timeout  wait-activation-delay 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   unknown  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
@@ -8655,8 +8795,8 @@ connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-eth
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-denylist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password  accept-all-mac-addresses 
 802-3-ethernet  --    0      --      no              --           --                  --                         --                    auto  --                --            --            default      --                    -1 (default)             
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu   dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               no             yes       -1 (default)      -1 (default)  0 (default)          0 (default)              default        0 (default)  auto  --            --         --         0 (default)   yes                            -1 (default)        --             0x0 (none)           -1 (default)       --    
@@ -8664,21 +8804,21 @@ ipv6  auto    --   --          --           0             --         --       --
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
 
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     eth1      activated  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     eth1      activated  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 5133
+size: 5229
 location: src/tests/client/test-client.py:test_003()/145
 cmd: $NMCLI --mode tabular con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4974 bytes
+stdout: 5070 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  permissions  zone  controller  master  slave-type  port-type  autoconnect-slaves  autoconnect-ports  down-on-poweroff  secondaries  gateway-ping-timeout  ip-ping-timeout  ip-ping-addresses  ip-ping-addresses-require-all  metered   lldp     mdns          llmnr         dns-over-tls  dnssec        mptcp-flags    wait-device-timeout  wait-activation-delay 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   nieznane  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
@@ -8686,8 +8826,8 @@ connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-eth
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-denylist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password  accept-all-mac-addresses 
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                    automatyczne  --                --            --            default      --                    -1 (default)             
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu           dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              nie            tak       -1 (default)      -1 (default)  0 (default)          0 (default)              default        0 (default)  automatyczne  --            --         --         0 (default)   tak                            -1 (default)        --             0x0 (none)           -1 (default)       --    
@@ -8695,21 +8835,21 @@ ipv6  auto    --   --          --           0             --         --       --
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
 
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     eth1      aktywowano  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     eth1      aktywowano  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 4621
+size: 4683
 location: src/tests/client/test-client.py:test_003()/146
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4432 bytes
+stdout: 4494 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  permissions  zone  controller  master  slave-type  port-type  autoconnect-slaves  autoconnect-ports  down-on-poweroff  secondaries  gateway-ping-timeout  ip-ping-timeout  ip-ping-addresses  ip-ping-addresses-require-all  metered  lldp     mdns          llmnr         dns-over-tls  dnssec        mptcp-flags    wait-device-timeout  wait-activation-delay 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   unknown  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
@@ -8717,8 +8857,8 @@ connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-eth
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-denylist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password  accept-all-mac-addresses 
 802-3-ethernet  --    0      --      no              --           --                  --                         --                    auto  --                --            --            default      --                    -1 (default)             
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu   dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               no             yes       -1 (default)      -1 (default)  0 (default)          0 (default)              default        0 (default)  auto  --            --         --         0 (default)   yes                            -1 (default)        --             0x0 (none)           -1 (default)       --    
@@ -8726,17 +8866,17 @@ ipv6  auto    --   --          --           0             --         --       --
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
 
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 4669
+size: 4731
 location: src/tests/client/test-client.py:test_003()/147
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4470 bytes
+stdout: 4532 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  permissions  zone  controller  master  slave-type  port-type  autoconnect-slaves  autoconnect-ports  down-on-poweroff  secondaries  gateway-ping-timeout  ip-ping-timeout  ip-ping-addresses  ip-ping-addresses-require-all  metered   lldp     mdns          llmnr         dns-over-tls  dnssec        mptcp-flags    wait-device-timeout  wait-activation-delay 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   nieznane  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
@@ -8744,8 +8884,8 @@ connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-eth
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-denylist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password  accept-all-mac-addresses 
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                    automatyczne  --                --            --            default      --                    -1 (default)             
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu           dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              nie            tak       -1 (default)      -1 (default)  0 (default)          0 (default)              default        0 (default)  automatyczne  --            --         --         0 (default)   tak                            -1 (default)        --             0x0 (none)           -1 (default)       --    
@@ -8753,17 +8893,17 @@ ipv6  auto    --   --          --           0             --         --       --
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
 
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 3207
+size: 3327
 location: src/tests/client/test-client.py:test_003()/148
 cmd: $NMCLI --mode tabular -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3052 bytes
+stdout: 3172 bytes
 >>>
 NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
 GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    100 (connected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --    eth0      no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
@@ -8777,14 +8917,14 @@ INTERFACE-FLAGS  yes  yes       no       no
 NAME              CARRIER  S390-SUBCHANNELS 
 WIRED-PROPERTIES  on       --               
 
-GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                           
-IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33 
+GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                            CLAT-ADDRESS 
+IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33  192.0.0.1    
 
 GROUP  OPTION 
 DHCP4  --     
 
-GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES 
-IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --       
+GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES  CLAT-ADDRESS                    CLAT-PREF64  
+IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --        2002:aaaa::2c0d:1e71:ef87:fac7  64:ff9b::/96 
 
 GROUP  OPTION                                                                                    
 DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 
@@ -8793,12 +8933,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet 
 
 <<<
-size: 3237
+size: 3357
 location: src/tests/client/test-client.py:test_003()/149
 cmd: $NMCLI --mode tabular -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3072 bytes
+stdout: 3192 bytes
 >>>
 NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
 GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    100 (połączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --    eth0      nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
@@ -8812,14 +8952,14 @@ INTERFACE-FLAGS  tak  tak       nie      nie
 NAME              CARRIER   S390-SUBCHANNELS 
 WIRED-PROPERTIES  włączone  --               
 
-GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                           
-IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33 
+GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                            CLAT-ADDRESS 
+IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33  192.0.0.1    
 
 GROUP  OPTION 
 DHCP4  --     
 
-GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES 
-IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --       
+GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES  CLAT-ADDRESS                    CLAT-PREF64  
+IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --        2002:aaaa::2c0d:1e71:ef87:fac7  64:ff9b::/96 
 
 GROUP  OPTION                                                                                    
 DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 
@@ -8828,38 +8968,38 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet 
 
 <<<
-size: 3011
+size: 3003
 location: src/tests/client/test-client.py:test_003()/150
 cmd: $NMCLI --mode tabular --color yes -f ALL con
 lang: C
 returncode: 0
-stdout: 2854 bytes
+stdout: 2846 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
-size: 3037
+size: 3029
 location: src/tests/client/test-client.py:test_003()/151
 cmd: $NMCLI --mode tabular --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2870 bytes
+stdout: 2862 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 516
@@ -8894,12 +9034,12 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 5095
+size: 5191
 location: src/tests/client/test-client.py:test_003()/154
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 4934 bytes
+stdout: 5030 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  permissions  zone  controller  master  slave-type  port-type  autoconnect-slaves  autoconnect-ports  down-on-poweroff  secondaries  gateway-ping-timeout  ip-ping-timeout  ip-ping-addresses  ip-ping-addresses-require-all  metered  lldp     mdns          llmnr         dns-over-tls  dnssec        mptcp-flags    wait-device-timeout  wait-activation-delay 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   unknown  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
@@ -8907,8 +9047,8 @@ connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-eth
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-denylist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password  accept-all-mac-addresses 
 802-3-ethernet  --    0      --      no              --           --                  --                         --                    auto  --                --            --            default      --                    -1 (default)             
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu   dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               no             yes       -1 (default)      -1 (default)  0 (default)          0 (default)              default        0 (default)  auto  --            --         --         0 (default)   yes                            -1 (default)        --             0x0 (none)           -1 (default)       --    
@@ -8916,21 +9056,21 @@ ipv6  auto    --   --          --           0             --         --       --
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
 
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     eth1      activated  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     eth1      activated  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 5145
+size: 5241
 location: src/tests/client/test-client.py:test_003()/155
 cmd: $NMCLI --mode tabular --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4974 bytes
+stdout: 5070 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  permissions  zone  controller  master  slave-type  port-type  autoconnect-slaves  autoconnect-ports  down-on-poweroff  secondaries  gateway-ping-timeout  ip-ping-timeout  ip-ping-addresses  ip-ping-addresses-require-all  metered   lldp     mdns          llmnr         dns-over-tls  dnssec        mptcp-flags    wait-device-timeout  wait-activation-delay 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   nieznane  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
@@ -8938,8 +9078,8 @@ connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-eth
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-denylist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password  accept-all-mac-addresses 
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                    automatyczne  --                --            --            default      --                    -1 (default)             
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu           dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              nie            tak       -1 (default)      -1 (default)  0 (default)          0 (default)              default        0 (default)  automatyczne  --            --         --         0 (default)   tak                            -1 (default)        --             0x0 (none)           -1 (default)       --    
@@ -8947,21 +9087,21 @@ ipv6  auto    --   --          --           0             --         --       --
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
 
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     eth1      aktywowano  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     eth1      aktywowano  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 4633
+size: 4695
 location: src/tests/client/test-client.py:test_003()/156
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 4432 bytes
+stdout: 4494 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  permissions  zone  controller  master  slave-type  port-type  autoconnect-slaves  autoconnect-ports  down-on-poweroff  secondaries  gateway-ping-timeout  ip-ping-timeout  ip-ping-addresses  ip-ping-addresses-require-all  metered  lldp     mdns          llmnr         dns-over-tls  dnssec        mptcp-flags    wait-device-timeout  wait-activation-delay 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              yes          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   unknown  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
@@ -8969,8 +9109,8 @@ connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-eth
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-denylist  mtu   s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password  accept-all-mac-addresses 
 802-3-ethernet  --    0      --      no              --           --                  --                         --                    auto  --                --            --            default      --                    -1 (default)             
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu   dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               no             yes       -1 (default)      -1 (default)  0 (default)          0 (default)              default        0 (default)  auto  --            --         --         0 (default)   yes                            -1 (default)        --             0x0 (none)           -1 (default)       --    
@@ -8978,17 +9118,17 @@ ipv6  auto    --   --          --           0             --         --       --
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
 
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 4681
+size: 4743
 location: src/tests/client/test-client.py:test_003()/157
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4470 bytes
+stdout: 4532 bytes
 >>>
 name        id        uuid                                  stable-id  type            interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  permissions  zone  controller  master  slave-type  port-type  autoconnect-slaves  autoconnect-ports  down-on-poweroff  secondaries  gateway-ping-timeout  ip-ping-timeout  ip-ping-addresses  ip-ping-addresses-require-all  metered   lldp     mdns          llmnr         dns-over-tls  dnssec        mptcp-flags    wait-device-timeout  wait-activation-delay 
 connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-ethernet  --              tak          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   nieznane  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
@@ -8996,8 +9136,8 @@ connection  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  --         802-3-eth
 name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-address  generate-mac-address-mask  mac-address-denylist  mtu           s390-subchannels  s390-nettype  s390-options  wake-on-lan  wake-on-lan-password  accept-all-mac-addresses 
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                    automatyczne  --                --            --            default      --                    -1 (default)             
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu           dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              nie            tak       -1 (default)      -1 (default)  0 (default)          0 (default)              default        0 (default)  automatyczne  --            --         --         0 (default)   tak                            -1 (default)        --             0x0 (none)           -1 (default)       --    
@@ -9005,17 +9145,17 @@ ipv6  auto    --   --          --           0             --         --       --
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
 
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 3219
+size: 3339
 location: src/tests/client/test-client.py:test_003()/158
 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3052 bytes
+stdout: 3172 bytes
 >>>
 NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
 GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    100 (connected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --    eth0      no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
@@ -9029,14 +9169,14 @@ INTERFACE-FLAGS  yes  yes       no       no
 NAME              CARRIER  S390-SUBCHANNELS 
 WIRED-PROPERTIES  on       --               
 
-GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                           
-IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33 
+GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                            CLAT-ADDRESS 
+IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33  192.0.0.1    
 
 GROUP  OPTION 
 DHCP4  --     
 
-GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES 
-IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --       
+GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES  CLAT-ADDRESS                    CLAT-PREF64  
+IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --        2002:aaaa::2c0d:1e71:ef87:fac7  64:ff9b::/96 
 
 GROUP  OPTION                                                                                    
 DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 
@@ -9045,12 +9185,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet 
 
 <<<
-size: 3249
+size: 3369
 location: src/tests/client/test-client.py:test_003()/159
 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3072 bytes
+stdout: 3192 bytes
 >>>
 NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
 GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    100 (połączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --    eth0      nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
@@ -9064,14 +9204,14 @@ INTERFACE-FLAGS  tak  tak       nie      nie
 NAME              CARRIER   S390-SUBCHANNELS 
 WIRED-PROPERTIES  włączone  --               
 
-GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                           
-IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33 
+GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                            CLAT-ADDRESS 
+IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33  192.0.0.1    
 
 GROUP  OPTION 
 DHCP4  --     
 
-GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES 
-IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --       
+GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES  CLAT-ADDRESS                    CLAT-PREF64  
+IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --        2002:aaaa::2c0d:1e71:ef87:fac7  64:ff9b::/96 
 
 GROUP  OPTION                                                                                    
 DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 
@@ -9080,46 +9220,46 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet 
 
 <<<
-size: 3215
+size: 3206
 location: src/tests/client/test-client.py:test_003()/160
 cmd: $NMCLI --mode tabular --pretty -f ALL con
 lang: C
 returncode: 0
-stdout: 3061 bytes
+stdout: 3052 bytes
 >>>
 ======================================
   NetworkManager connection profiles
 ======================================
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
-
-<<<
-size: 3263
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         PORT  FILENAME                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
+
+<<<
+size: 3254
 location: src/tests/client/test-client.py:test_003()/161
 cmd: $NMCLI --mode tabular --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3099 bytes
+stdout: 3090 bytes
 >>>
 ==========================================
   Profile połączeń usługi NetworkManager
 ==========================================
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         PORT  FILENAME                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 697
@@ -9162,12 +9302,12 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 8096
+size: 8240
 location: src/tests/client/test-client.py:test_003()/164
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: C
 returncode: 0
-stdout: 7938 bytes
+stdout: 8082 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
@@ -9180,9 +9320,9 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 802-3-ethernet  --    0      --      no              --           --                  --                         --                    auto  --                --            --            default      --                    -1 (default)             
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu   dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -9195,26 +9335,26 @@ proxy  none    no            --       --
 ====================================================================
   Active connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
 ====================================================================
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     eth1      activated  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     eth1      activated  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 ====================================================================
   Active connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
 ====================================================================
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 8226
+size: 8370
 location: src/tests/client/test-client.py:test_003()/165
 cmd: $NMCLI --mode tabular --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 8058 bytes
+stdout: 8202 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
@@ -9227,9 +9367,9 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                    automatyczne  --                --            --            default      --                    -1 (default)             
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu           dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -9242,26 +9382,26 @@ proxy  none    nie           --       --
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
 ===========================================================================
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     eth1      aktywowano  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     eth1      aktywowano  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
 ===========================================================================
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 7178
+size: 7271
 location: src/tests/client/test-client.py:test_003()/166
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 6980 bytes
+stdout: 7073 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
@@ -9274,9 +9414,9 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 802-3-ethernet  --    0      --      no              --           --                  --                         --                    auto  --                --            --            default      --                    -1 (default)             
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu   dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -9289,18 +9429,18 @@ proxy  none    no            --       --
 ====================================================================
   Active connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
 ====================================================================
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 7280
+size: 7373
 location: src/tests/client/test-client.py:test_003()/167
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7072 bytes
+stdout: 7165 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
@@ -9313,9 +9453,9 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                    automatyczne  --                --            --            default      --                    -1 (default)             
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu           dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -9328,18 +9468,18 @@ proxy  none    nie           --       --
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
 ===========================================================================
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 4823
+size: 5003
 location: src/tests/client/test-client.py:test_003()/168
 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4659 bytes
+stdout: 4839 bytes
 >>>
 =========================
   Device details (eth0)
@@ -9360,17 +9500,17 @@ NAME              CARRIER  S390-SUBCHANNELS
 ---------------------------------------------
 WIRED-PROPERTIES  on       --               
 
-GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                           
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33 
+GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                            CLAT-ADDRESS 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33  192.0.0.1    
 
 GROUP  OPTION 
 ---------------
 DHCP4  --     
 
-GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --       
+GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES  CLAT-ADDRESS                    CLAT-PREF64  
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --        2002:aaaa::2c0d:1e71:ef87:fac7  64:ff9b::/96 
 
 GROUP  OPTION                                                                                    
 --------------------------------------------------------------------------------------------------
@@ -9381,12 +9521,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet 
 
 <<<
-size: 4889
+size: 5069
 location: src/tests/client/test-client.py:test_003()/169
 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4715 bytes
+stdout: 4895 bytes
 >>>
 ==================================
   Informacje o urządzeniu (eth0)
@@ -9407,17 +9547,17 @@ NAME              CARRIER   S390-SUBCHANNELS
 ----------------------------------------------
 WIRED-PROPERTIES  włączone  --               
 
-GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                           
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33 
+GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                            CLAT-ADDRESS 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33  192.0.0.1    
 
 GROUP  OPTION 
 ---------------
 DHCP4  --     
 
-GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --       
+GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES  CLAT-ADDRESS                    CLAT-PREF64  
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --        2002:aaaa::2c0d:1e71:ef87:fac7  64:ff9b::/96 
 
 GROUP  OPTION                                                                                    
 --------------------------------------------------------------------------------------------------
@@ -9428,46 +9568,46 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet 
 
 <<<
-size: 3497
+size: 3488
 location: src/tests/client/test-client.py:test_003()/170
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con
 lang: C
 returncode: 0
-stdout: 3331 bytes
+stdout: 3322 bytes
 >>>
 ======================================
   NetworkManager connection profiles
 ======================================
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
-
-<<<
-size: 3545
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         PORT  FILENAME                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
+
+<<<
+size: 3536
 location: src/tests/client/test-client.py:test_003()/171
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3369 bytes
+stdout: 3360 bytes
 >>>
 ==========================================
   Profile połączeń usługi NetworkManager
 ==========================================
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         PORT  FILENAME                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 727
@@ -9510,12 +9650,12 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
 
 <<<
-size: 8108
+size: 8252
 location: src/tests/client/test-client.py:test_003()/174
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 7938 bytes
+stdout: 8082 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
@@ -9528,9 +9668,9 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 802-3-ethernet  --    0      --      no              --           --                  --                         --                    auto  --                --            --            default      --                    -1 (default)             
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu   dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -9543,26 +9683,26 @@ proxy  none    no            --       --
 ====================================================================
   Active connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
 ====================================================================
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     eth1      activated  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     eth1      activated  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 ====================================================================
   Active connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
 ====================================================================
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 8238
+size: 8382
 location: src/tests/client/test-client.py:test_003()/175
 cmd: $NMCLI --mode tabular --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 8058 bytes
+stdout: 8202 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
@@ -9575,9 +9715,9 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                    automatyczne  --                --            --            default      --                    -1 (default)             
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu           dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -9590,26 +9730,26 @@ proxy  none    nie           --       --
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
 ===========================================================================
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     eth1      aktywowano  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth1     eth1      aktywowano  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
 ===========================================================================
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 7190
+size: 7283
 location: src/tests/client/test-client.py:test_003()/176
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 6980 bytes
+stdout: 7073 bytes
 >>>
 =========================================
   Connection profile details (ethernet)
@@ -9622,9 +9762,9 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 802-3-ethernet  --    0      --      no              --           --                  --                         --                    auto  --                --            --            default      --                    -1 (default)             
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu   dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -9637,18 +9777,18 @@ proxy  none    no            --       --
 ====================================================================
   Active connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
 ====================================================================
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 7292
+size: 7385
 location: src/tests/client/test-client.py:test_003()/177
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7072 bytes
+stdout: 7165 bytes
 >>>
 ===========================================
   Szczegóły profilu połączenia (ethernet)
@@ -9661,9 +9801,9 @@ name            port  speed  duplex  auto-negotiate  mac-address  cloned-mac-add
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 802-3-ethernet  --    0      --      nie             --           --                  --                         --                    automatyczne  --                --            --            default      --                    -1 (default)             
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu           dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -9676,18 +9816,18 @@ proxy  none    nie           --       --
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
 ===========================================================================
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 4835
+size: 5015
 location: src/tests/client/test-client.py:test_003()/178
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4659 bytes
+stdout: 4839 bytes
 >>>
 =========================
   Device details (eth0)
@@ -9708,17 +9848,17 @@ NAME              CARRIER  S390-SUBCHANNELS
 ---------------------------------------------
 WIRED-PROPERTIES  on       --               
 
-GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                           
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33 
+GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                            CLAT-ADDRESS 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33  192.0.0.1    
 
 GROUP  OPTION 
 ---------------
 DHCP4  --     
 
-GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --       
+GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES  CLAT-ADDRESS                    CLAT-PREF64  
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --        2002:aaaa::2c0d:1e71:ef87:fac7  64:ff9b::/96 
 
 GROUP  OPTION                                                                                    
 --------------------------------------------------------------------------------------------------
@@ -9729,12 +9869,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet 
 
 <<<
-size: 4901
+size: 5081
 location: src/tests/client/test-client.py:test_003()/179
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4715 bytes
+stdout: 4895 bytes
 >>>
 ==================================
   Informacje o urządzeniu (eth0)
@@ -9755,17 +9895,17 @@ NAME              CARRIER   S390-SUBCHANNELS
 ----------------------------------------------
 WIRED-PROPERTIES  włączone  --               
 
-GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                           
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33 
+GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                            CLAT-ADDRESS 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33  192.0.0.1    
 
 GROUP  OPTION 
 ---------------
 DHCP4  --     
 
-GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --       
+GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES  CLAT-ADDRESS                    CLAT-PREF64  
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --        2002:aaaa::2c0d:1e71:ef87:fac7  64:ff9b::/96 
 
 GROUP  OPTION                                                                                    
 --------------------------------------------------------------------------------------------------
@@ -9838,102 +9978,102 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 934
+size: 939
 location: src/tests/client/test-client.py:test_003()/184
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: C
 returncode: 0
-stdout: 778 bytes
+stdout: 783 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
 802-3-ethernet::0::no:::::auto::::default::-1
-ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 proxy:none:no::
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/6::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/6:::
 
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6:::
 
 <<<
-size: 944
+size: 949
 location: src/tests/client/test-client.py:test_003()/185
 cmd: $NMCLI --mode tabular --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 778 bytes
+stdout: 783 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
 802-3-ethernet::0::no:::::auto::::default::-1
-ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 proxy:none:no::
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/6::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/6:::
 
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6:::
 
 <<<
-size: 782
+size: 786
 location: src/tests/client/test-client.py:test_003()/186
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 586 bytes
+stdout: 590 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
 802-3-ethernet::0::no:::::auto::::default::-1
-ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 proxy:none:no::
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6:::
 
 <<<
-size: 792
+size: 796
 location: src/tests/client/test-client.py:test_003()/187
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 586 bytes
+stdout: 590 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
 802-3-ethernet::0::no:::::auto::::default::-1
-ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 proxy:none:no::
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6:::
 
 <<<
-size: 1451
+size: 1514
 location: src/tests/client/test-client.py:test_003()/188
 cmd: $NMCLI --mode tabular --terse -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 1288 bytes
+stdout: 1351 bytes
 >>>
 GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::eth0:no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIRED-PROPERTIES:on:
-IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar::192.168.156.115 | 192.168.8.33
+IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar::192.168.156.115 | 192.168.8.33:192.0.0.1
 DHCP4:
-IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar:
+IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar::2002\:aaaa\:\:2c0d\:1e71\:ef87\:fac7:64\:ff9b\:\:/96
 DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 1461
+size: 1524
 location: src/tests/client/test-client.py:test_003()/189
 cmd: $NMCLI --mode tabular --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1288 bytes
+stdout: 1351 bytes
 >>>
 GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::eth0:no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIRED-PROPERTIES:on:
-IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar::192.168.156.115 | 192.168.8.33
+IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar::192.168.156.115 | 192.168.8.33:192.0.0.1
 DHCP4:
-IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar:
+IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar::2002\:aaaa\:\:2c0d\:1e71\:ef87\:fac7:64\:ff9b\:\:/96
 DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
@@ -10000,102 +10140,102 @@ UUID-con-gsm3-REPLACED-REPLACED-REPL:gsm
 UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
 
 <<<
-size: 946
+size: 951
 location: src/tests/client/test-client.py:test_003()/194
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 778 bytes
+stdout: 783 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
 802-3-ethernet::0::no:::::auto::::default::-1
-ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 proxy:none:no::
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/6::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/6:::
 
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6:::
 
 <<<
-size: 956
+size: 961
 location: src/tests/client/test-client.py:test_003()/195
 cmd: $NMCLI --mode tabular --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 778 bytes
+stdout: 783 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
 802-3-ethernet::0::no:::::auto::::default::-1
-ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 proxy:none:no::
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/6::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth1:eth1:activated:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/6:::
 
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6:::
 
 <<<
-size: 794
+size: 798
 location: src/tests/client/test-client.py:test_003()/196
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 586 bytes
+stdout: 590 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
 802-3-ethernet::0::no:::::auto::::default::-1
-ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 proxy:none:no::
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6:::
 
 <<<
-size: 804
+size: 808
 location: src/tests/client/test-client.py:test_003()/197
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 586 bytes
+stdout: 590 bytes
 >>>
 connection:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL::802-3-ethernet::yes:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
 802-3-ethernet::0::no:::::auto::::default::-1
-ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 proxy:none:no::
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6:::
 
 <<<
-size: 1463
+size: 1526
 location: src/tests/client/test-client.py:test_003()/198
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 1288 bytes
+stdout: 1351 bytes
 >>>
 GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::eth0:no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIRED-PROPERTIES:on:
-IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar::192.168.156.115 | 192.168.8.33
+IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar::192.168.156.115 | 192.168.8.33:192.0.0.1
 DHCP4:
-IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar:
+IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar::2002\:aaaa\:\:2c0d\:1e71\:ef87\:fac7:64\:ff9b\:\:/96
 DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 1473
+size: 1536
 location: src/tests/client/test-client.py:test_003()/199
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1288 bytes
+stdout: 1351 bytes
 >>>
 GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::eth0:no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIRED-PROPERTIES:on:
-IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar::192.168.156.115 | 192.168.8.33
+IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar::192.168.156.115 | 192.168.8.33:192.0.0.1
 DHCP4:
-IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar:
+IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar::2002\:aaaa\:\:2c0d\:1e71\:ef87\:fac7:64\:ff9b\:\:/96
 DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
@@ -10120,7 +10260,7 @@ ACTIVE:                                 yes
 DEVICE:                                 eth0
 STATE:                                  deactivating
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   ethernet
 UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
@@ -10135,7 +10275,7 @@ ACTIVE:                                 yes
 DEVICE:                                 eth1
 STATE:                                  activated
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   con-1
 UUID:                                   5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -10150,7 +10290,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-1
 NAME:                                   con-gsm1
 UUID:                                   UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -10165,7 +10305,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm1
 NAME:                                   con-gsm2
 UUID:                                   UUID-con-gsm2-REPLACED-REPLACED-REPL
@@ -10180,7 +10320,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm2
 NAME:                                   con-gsm3
 UUID:                                   UUID-con-gsm3-REPLACED-REPLACED-REPL
@@ -10195,7 +10335,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm3
 NAME:                                   con-xx1
 UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -10210,7 +10350,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-xx1
 
 <<<
@@ -10234,7 +10374,7 @@ ACTIVE:                                 tak
 DEVICE:                                 eth0
 STATE:                                  dezaktywowanie
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   ethernet
 UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
@@ -10249,7 +10389,7 @@ ACTIVE:                                 tak
 DEVICE:                                 eth1
 STATE:                                  aktywowano
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   con-1
 UUID:                                   5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -10264,7 +10404,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-1
 NAME:                                   con-gsm1
 UUID:                                   UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -10279,7 +10419,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm1
 NAME:                                   con-gsm2
 UUID:                                   UUID-con-gsm2-REPLACED-REPLACED-REPL
@@ -10294,7 +10434,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm2
 NAME:                                   con-gsm3
 UUID:                                   UUID-con-gsm3-REPLACED-REPLACED-REPL
@@ -10309,7 +10449,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm3
 NAME:                                   con-xx1
 UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -10324,7 +10464,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-xx1
 
 <<<
@@ -10370,12 +10510,12 @@ UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:                                   ethernet
 
 <<<
-size: 7405
+size: 7544
 location: src/tests/client/test-client.py:test_003()/204
 cmd: $NMCLI --mode multiline con s ethernet
 lang: C
 returncode: 0
-stdout: 7254 bytes
+stdout: 7393 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -10458,6 +10598,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -10514,6 +10655,7 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 GENERAL.NAME:                           ethernet
@@ -10528,15 +10670,16 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 7449
+size: 7588
 location: src/tests/client/test-client.py:test_003()/205
 cmd: $NMCLI --mode multiline con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7288 bytes
+stdout: 7427 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -10619,6 +10762,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -10675,6 +10819,7 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 GENERAL.NAME:                           ethernet
@@ -10689,15 +10834,16 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 6735
+size: 6831
 location: src/tests/client/test-client.py:test_003()/206
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 6544 bytes
+stdout: 6640 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -10780,6 +10926,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -10836,15 +10983,16 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 6775
+size: 6871
 location: src/tests/client/test-client.py:test_003()/207
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6574 bytes
+stdout: 6670 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -10927,6 +11075,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -10983,15 +11132,16 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3810
+size: 3984
 location: src/tests/client/test-client.py:test_003()/208
 cmd: $NMCLI --mode multiline -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3653 bytes
+stdout: 3827 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -11038,6 +11188,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:                         2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:                         2001:a::8191:ed6b:8ce:b60/103
@@ -11048,6 +11199,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
@@ -11058,12 +11211,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 3848
+size: 4022
 location: src/tests/client/test-client.py:test_003()/209
 cmd: $NMCLI --mode multiline -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3681 bytes
+stdout: 3855 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -11110,6 +11263,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:                         2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:                         2001:a::8191:ed6b:8ce:b60/103
@@ -11120,6 +11274,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
@@ -11150,7 +11306,7 @@ ACTIVE:                                 yes
 DEVICE:                                 eth0
 STATE:                                  deactivating
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   ethernet
 UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11165,7 +11321,7 @@ ACTIVE:                                 yes
 DEVICE:                                 eth1
 STATE:                                  activated
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   con-1
 UUID:                                   5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -11180,7 +11336,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-1
 NAME:                                   con-gsm1
 UUID:                                   UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -11195,7 +11351,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm1
 NAME:                                   con-gsm2
 UUID:                                   UUID-con-gsm2-REPLACED-REPLACED-REPL
@@ -11210,7 +11366,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm2
 NAME:                                   con-gsm3
 UUID:                                   UUID-con-gsm3-REPLACED-REPLACED-REPL
@@ -11225,7 +11381,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm3
 NAME:                                   con-xx1
 UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -11240,7 +11396,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-xx1
 
 <<<
@@ -11264,7 +11420,7 @@ ACTIVE:                                 tak
 DEVICE:                                 eth0
 STATE:                                  dezaktywowanie
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   ethernet
 UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11279,7 +11435,7 @@ ACTIVE:                                 tak
 DEVICE:                                 eth1
 STATE:                                  aktywowano
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   con-1
 UUID:                                   5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -11294,7 +11450,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-1
 NAME:                                   con-gsm1
 UUID:                                   UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -11309,7 +11465,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm1
 NAME:                                   con-gsm2
 UUID:                                   UUID-con-gsm2-REPLACED-REPLACED-REPL
@@ -11324,7 +11480,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm2
 NAME:                                   con-gsm3
 UUID:                                   UUID-con-gsm3-REPLACED-REPLACED-REPL
@@ -11339,7 +11495,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm3
 NAME:                                   con-xx1
 UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -11354,7 +11510,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-xx1
 
 <<<
@@ -11400,12 +11556,12 @@ UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:                                   ethernet
 
 <<<
-size: 7417
+size: 7556
 location: src/tests/client/test-client.py:test_003()/214
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 7254 bytes
+stdout: 7393 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11488,6 +11644,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -11544,6 +11701,7 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 GENERAL.NAME:                           ethernet
@@ -11558,15 +11716,16 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 7461
+size: 7600
 location: src/tests/client/test-client.py:test_003()/215
 cmd: $NMCLI --mode multiline --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7288 bytes
+stdout: 7427 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11649,6 +11808,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -11705,6 +11865,7 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 GENERAL.NAME:                           ethernet
@@ -11719,15 +11880,16 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 6747
+size: 6843
 location: src/tests/client/test-client.py:test_003()/216
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 6544 bytes
+stdout: 6640 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11810,6 +11972,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -11866,15 +12029,16 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 6787
+size: 6883
 location: src/tests/client/test-client.py:test_003()/217
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6574 bytes
+stdout: 6670 bytes
 >>>
 connection.id:                          ethernet
 connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
@@ -11957,6 +12121,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -12013,15 +12178,16 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3822
+size: 3996
 location: src/tests/client/test-client.py:test_003()/218
 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3653 bytes
+stdout: 3827 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -12068,6 +12234,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:                         2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:                         2001:a::8191:ed6b:8ce:b60/103
@@ -12078,6 +12245,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
@@ -12088,12 +12257,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 3860
+size: 4034
 location: src/tests/client/test-client.py:test_003()/219
 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3681 bytes
+stdout: 3855 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -12140,6 +12309,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:                         2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:                         2001:a::8191:ed6b:8ce:b60/103
@@ -12150,6 +12320,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
@@ -12183,7 +12355,7 @@ ACTIVE:                                 yes
 DEVICE:                                 eth0
 STATE:                                  deactivating
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
 NAME:                                   ethernet
@@ -12199,7 +12371,7 @@ ACTIVE:                                 yes
 DEVICE:                                 eth1
 STATE:                                  activated
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
 NAME:                                   con-1
@@ -12215,7 +12387,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-1
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm1
@@ -12231,7 +12403,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm1
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm2
@@ -12247,7 +12419,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm2
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm3
@@ -12263,7 +12435,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm3
 -------------------------------------------------------------------------------
 NAME:                                   con-xx1
@@ -12279,7 +12451,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-xx1
 -------------------------------------------------------------------------------
 
@@ -12307,7 +12479,7 @@ ACTIVE:                                 tak
 DEVICE:                                 eth0
 STATE:                                  dezaktywowanie
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
 NAME:                                   ethernet
@@ -12323,7 +12495,7 @@ ACTIVE:                                 tak
 DEVICE:                                 eth1
 STATE:                                  aktywowano
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
 NAME:                                   con-1
@@ -12339,7 +12511,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-1
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm1
@@ -12355,7 +12527,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm1
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm2
@@ -12371,7 +12543,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm2
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm3
@@ -12387,7 +12559,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm3
 -------------------------------------------------------------------------------
 NAME:                                   con-xx1
@@ -12403,7 +12575,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-xx1
 -------------------------------------------------------------------------------
 
@@ -12468,12 +12640,12 @@ TYPE:                                   ethernet
 -------------------------------------------------------------------------------
 
 <<<
-size: 8657
+size: 8796
 location: src/tests/client/test-client.py:test_003()/224
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: C
 returncode: 0
-stdout: 8497 bytes
+stdout: 8636 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -12561,6 +12733,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -12623,6 +12796,7 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
@@ -12641,16 +12815,17 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 8722
+size: 8861
 location: src/tests/client/test-client.py:test_003()/225
 cmd: $NMCLI --mode multiline --pretty con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 8552 bytes
+stdout: 8691 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -12738,6 +12913,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -12800,6 +12976,7 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
@@ -12818,16 +12995,17 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 7675
+size: 7771
 location: src/tests/client/test-client.py:test_003()/226
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 7475 bytes
+stdout: 7571 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -12915,6 +13093,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -12977,16 +13156,17 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 7728
+size: 7824
 location: src/tests/client/test-client.py:test_003()/227
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7518 bytes
+stdout: 7614 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -13074,6 +13254,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -13136,16 +13317,17 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4750
+size: 4924
 location: src/tests/client/test-client.py:test_003()/228
 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4584 bytes
+stdout: 4758 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -13199,6 +13381,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
@@ -13211,6 +13394,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 -------------------------------------------------------------------------------
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
@@ -13224,12 +13409,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 -------------------------------------------------------------------------------
 
 <<<
-size: 4794
+size: 4968
 location: src/tests/client/test-client.py:test_003()/229
 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4618 bytes
+stdout: 4792 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -13283,6 +13468,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
@@ -13295,6 +13481,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 -------------------------------------------------------------------------------
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
@@ -13331,7 +13519,7 @@ ACTIVE:                                 yes
 DEVICE:                                 eth0
 STATE:                                  deactivating
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
 NAME:                                   ethernet
@@ -13347,7 +13535,7 @@ ACTIVE:                                 yes
 DEVICE:                                 eth1
 STATE:                                  activated
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
 NAME:                                   con-1
@@ -13363,7 +13551,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-1
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm1
@@ -13379,7 +13567,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm1
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm2
@@ -13395,7 +13583,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm2
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm3
@@ -13411,7 +13599,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm3
 -------------------------------------------------------------------------------
 NAME:                                   con-xx1
@@ -13427,7 +13615,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-xx1
 -------------------------------------------------------------------------------
 
@@ -13455,7 +13643,7 @@ ACTIVE:                                 tak
 DEVICE:                                 eth0
 STATE:                                  dezaktywowanie
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
 NAME:                                   ethernet
@@ -13471,7 +13659,7 @@ ACTIVE:                                 tak
 DEVICE:                                 eth1
 STATE:                                  aktywowano
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
 NAME:                                   con-1
@@ -13487,7 +13675,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-1
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm1
@@ -13503,7 +13691,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm1
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm2
@@ -13519,7 +13707,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm2
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm3
@@ -13535,7 +13723,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm3
 -------------------------------------------------------------------------------
 NAME:                                   con-xx1
@@ -13551,7 +13739,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-xx1
 -------------------------------------------------------------------------------
 
@@ -13616,12 +13804,12 @@ TYPE:                                   ethernet
 -------------------------------------------------------------------------------
 
 <<<
-size: 8669
+size: 8808
 location: src/tests/client/test-client.py:test_003()/234
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 8497 bytes
+stdout: 8636 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -13709,6 +13897,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -13771,6 +13960,7 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
@@ -13789,16 +13979,17 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 8734
+size: 8873
 location: src/tests/client/test-client.py:test_003()/235
 cmd: $NMCLI --mode multiline --pretty --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 8552 bytes
+stdout: 8691 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -13886,6 +14077,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -13948,6 +14140,7 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
@@ -13966,16 +14159,17 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 7687
+size: 7783
 location: src/tests/client/test-client.py:test_003()/236
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 7475 bytes
+stdout: 7571 bytes
 >>>
 ===============================================================================
                      Connection profile details (ethernet)
@@ -14063,6 +14257,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -14125,16 +14320,17 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 7740
+size: 7836
 location: src/tests/client/test-client.py:test_003()/237
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7518 bytes
+stdout: 7614 bytes
 >>>
 ===============================================================================
                     Szczegóły profilu połączenia (ethernet)
@@ -14222,6 +14418,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -14284,16 +14481,17 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4762
+size: 4936
 location: src/tests/client/test-client.py:test_003()/238
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4584 bytes
+stdout: 4758 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -14347,6 +14545,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
@@ -14359,6 +14558,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 -------------------------------------------------------------------------------
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
@@ -14372,12 +14573,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 -------------------------------------------------------------------------------
 
 <<<
-size: 4806
+size: 4980
 location: src/tests/client/test-client.py:test_003()/239
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4618 bytes
+stdout: 4792 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -14431,6 +14632,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
@@ -14443,6 +14645,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 -------------------------------------------------------------------------------
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
@@ -14456,12 +14660,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | e
 -------------------------------------------------------------------------------
 
 <<<
-size: 2524
+size: 2517
 location: src/tests/client/test-client.py:test_003()/240
 cmd: $NMCLI --mode multiline --terse -f ALL con
 lang: C
 returncode: 0
-stdout: 2369 bytes
+stdout: 2362 bytes
 >>>
 NAME:ethernet
 UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -14476,7 +14680,7 @@ ACTIVE:yes
 DEVICE:eth0
 STATE:deactivating
 ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:ethernet
 UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -14491,7 +14695,7 @@ ACTIVE:yes
 DEVICE:eth1
 STATE:activated
 ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:con-1
 UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -14506,7 +14710,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-1
 NAME:con-gsm1
 UUID:UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -14521,7 +14725,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm1
 NAME:con-gsm2
 UUID:UUID-con-gsm2-REPLACED-REPLACED-REPL
@@ -14536,7 +14740,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm2
 NAME:con-gsm3
 UUID:UUID-con-gsm3-REPLACED-REPLACED-REPL
@@ -14551,7 +14755,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm3
 NAME:con-xx1
 UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -14566,16 +14770,16 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
-size: 2534
+size: 2527
 location: src/tests/client/test-client.py:test_003()/241
 cmd: $NMCLI --mode multiline --terse -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2369 bytes
+stdout: 2362 bytes
 >>>
 NAME:ethernet
 UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -14590,7 +14794,7 @@ ACTIVE:yes
 DEVICE:eth0
 STATE:deactivating
 ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:ethernet
 UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -14605,7 +14809,7 @@ ACTIVE:yes
 DEVICE:eth1
 STATE:activated
 ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:con-1
 UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -14620,7 +14824,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-1
 NAME:con-gsm1
 UUID:UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -14635,7 +14839,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm1
 NAME:con-gsm2
 UUID:UUID-con-gsm2-REPLACED-REPLACED-REPL
@@ -14650,7 +14854,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm2
 NAME:con-gsm3
 UUID:UUID-con-gsm3-REPLACED-REPLACED-REPL
@@ -14665,7 +14869,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm3
 NAME:con-xx1
 UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -14680,7 +14884,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
@@ -14726,12 +14930,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:802-3-ethernet
 
 <<<
-size: 3976
+size: 4039
 location: src/tests/client/test-client.py:test_003()/244
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: C
 returncode: 0
-stdout: 3817 bytes
+stdout: 3880 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -14814,6 +15018,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -14870,6 +15075,7 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 GENERAL.NAME:ethernet
@@ -14884,15 +15090,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3986
+size: 4049
 location: src/tests/client/test-client.py:test_003()/245
 cmd: $NMCLI --mode multiline --terse con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3817 bytes
+stdout: 3880 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -14975,6 +15182,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -15031,6 +15239,7 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 GENERAL.NAME:ethernet
@@ -15045,15 +15254,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3626
+size: 3664
 location: src/tests/client/test-client.py:test_003()/246
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 3427 bytes
+stdout: 3465 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -15136,6 +15346,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -15192,15 +15403,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3636
+size: 3674
 location: src/tests/client/test-client.py:test_003()/247
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3427 bytes
+stdout: 3465 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -15283,6 +15495,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -15339,15 +15552,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2443
+size: 2547
 location: src/tests/client/test-client.py:test_003()/248
 cmd: $NMCLI --mode multiline --terse -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2278 bytes
+stdout: 2382 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -15394,6 +15608,7 @@ IP4.DNS[1]:192.168.213.113
 IP4.DOMAIN[1]:sear4.foo4.bar
 IP4.WINS[1]:192.168.156.115
 IP4.WINS[2]:192.168.8.33
+IP4.CLAT-ADDRESS:192.0.0.1
 IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
@@ -15404,6 +15619,8 @@ IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:sear6.fo.x.y
 IP6.DOMAIN[2]:sear6.foo4.bar
+IP6.CLAT-ADDRESS:2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:64:ff9b::/96
 DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
@@ -15414,12 +15631,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2453
+size: 2557
 location: src/tests/client/test-client.py:test_003()/249
 cmd: $NMCLI --mode multiline --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2278 bytes
+stdout: 2382 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -15466,6 +15683,7 @@ IP4.DNS[1]:192.168.213.113
 IP4.DOMAIN[1]:sear4.foo4.bar
 IP4.WINS[1]:192.168.156.115
 IP4.WINS[2]:192.168.8.33
+IP4.CLAT-ADDRESS:192.0.0.1
 IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
@@ -15476,6 +15694,8 @@ IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:sear6.fo.x.y
 IP6.DOMAIN[2]:sear6.foo4.bar
+IP6.CLAT-ADDRESS:2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:64:ff9b::/96
 DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
@@ -15486,12 +15706,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2806
+size: 2799
 location: src/tests/client/test-client.py:test_003()/250
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con
 lang: C
 returncode: 0
-stdout: 2639 bytes
+stdout: 2632 bytes
 >>>
 NAME:ethernet
 UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -15506,7 +15726,7 @@ ACTIVE:yes
 DEVICE:eth0
 STATE:deactivating
 ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:ethernet
 UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -15521,7 +15741,7 @@ ACTIVE:yes
 DEVICE:eth1
 STATE:activated
 ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:con-1
 UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -15536,7 +15756,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-1
 NAME:con-gsm1
 UUID:UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -15551,7 +15771,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm1
 NAME:con-gsm2
 UUID:UUID-con-gsm2-REPLACED-REPLACED-REPL
@@ -15566,7 +15786,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm2
 NAME:con-gsm3
 UUID:UUID-con-gsm3-REPLACED-REPLACED-REPL
@@ -15581,7 +15801,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm3
 NAME:con-xx1
 UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -15596,16 +15816,16 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
-size: 2816
+size: 2809
 location: src/tests/client/test-client.py:test_003()/251
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2639 bytes
+stdout: 2632 bytes
 >>>
 NAME:ethernet
 UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -15620,7 +15840,7 @@ ACTIVE:yes
 DEVICE:eth0
 STATE:deactivating
 ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:ethernet
 UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -15635,7 +15855,7 @@ ACTIVE:yes
 DEVICE:eth1
 STATE:activated
 ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:con-1
 UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -15650,7 +15870,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-1
 NAME:con-gsm1
 UUID:UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -15665,7 +15885,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm1
 NAME:con-gsm2
 UUID:UUID-con-gsm2-REPLACED-REPLACED-REPL
@@ -15680,7 +15900,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm2
 NAME:con-gsm3
 UUID:UUID-con-gsm3-REPLACED-REPLACED-REPL
@@ -15695,7 +15915,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm3
 NAME:con-xx1
 UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -15710,7 +15930,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
@@ -15756,12 +15976,12 @@ UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
 TYPE:802-3-ethernet
 
 <<<
-size: 3988
+size: 4051
 location: src/tests/client/test-client.py:test_003()/254
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: C
 returncode: 0
-stdout: 3817 bytes
+stdout: 3880 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -15844,6 +16064,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -15900,6 +16121,7 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 GENERAL.NAME:ethernet
@@ -15914,15 +16136,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3998
+size: 4061
 location: src/tests/client/test-client.py:test_003()/255
 cmd: $NMCLI --mode multiline --terse --color yes con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3817 bytes
+stdout: 3880 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -16005,6 +16228,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -16061,6 +16285,7 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 GENERAL.NAME:ethernet
@@ -16075,15 +16300,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3638
+size: 3676
 location: src/tests/client/test-client.py:test_003()/256
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 3427 bytes
+stdout: 3465 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -16166,6 +16392,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -16222,15 +16449,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 3648
+size: 3686
 location: src/tests/client/test-client.py:test_003()/257
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3427 bytes
+stdout: 3465 bytes
 >>>
 connection.id:ethernet
 connection.uuid:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -16313,6 +16541,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -16369,15 +16598,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2455
+size: 2559
 location: src/tests/client/test-client.py:test_003()/258
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2278 bytes
+stdout: 2382 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -16424,6 +16654,7 @@ IP4.DNS[1]:192.168.213.113
 IP4.DOMAIN[1]:sear4.foo4.bar
 IP4.WINS[1]:192.168.156.115
 IP4.WINS[2]:192.168.8.33
+IP4.CLAT-ADDRESS:192.0.0.1
 IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
@@ -16434,6 +16665,8 @@ IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:sear6.fo.x.y
 IP6.DOMAIN[2]:sear6.foo4.bar
+IP6.CLAT-ADDRESS:2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:64:ff9b::/96
 DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
@@ -16444,12 +16677,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2465
+size: 2569
 location: src/tests/client/test-client.py:test_003()/259
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2278 bytes
+stdout: 2382 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -16496,6 +16729,7 @@ IP4.DNS[1]:192.168.213.113
 IP4.DOMAIN[1]:sear4.foo4.bar
 IP4.WINS[1]:192.168.156.115
 IP4.WINS[2]:192.168.8.33
+IP4.CLAT-ADDRESS:192.0.0.1
 IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
@@ -16506,6 +16740,8 @@ IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:sear6.fo.x.y
 IP6.DOMAIN[2]:sear6.foo4.bar
+IP6.CLAT-ADDRESS:2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:64:ff9b::/96
 DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
@@ -16516,38 +16752,38 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
-size: 2714
+size: 2706
 location: src/tests/client/test-client.py:test_003()/260
 cmd: $NMCLI -f ALL con
 lang: C
 returncode: 0
-stdout: 2584 bytes
+stdout: 2576 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
-size: 2740
+size: 2732
 location: src/tests/client/test-client.py:test_003()/261
 cmd: $NMCLI -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2600 bytes
+stdout: 2592 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 423
@@ -16600,12 +16836,12 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 885
+size: 928
 location: src/tests/client/test-client.py:test_003()/266
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 712 bytes
+stdout: 755 bytes
 >>>
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
@@ -16619,15 +16855,16 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 900
+size: 943
 location: src/tests/client/test-client.py:test_003()/267
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 717 bytes
+stdout: 760 bytes
 >>>
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
@@ -16641,15 +16878,16 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3813
+size: 3987
 location: src/tests/client/test-client.py:test_003()/268
 cmd: $NMCLI -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3673 bytes
+stdout: 3847 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -16696,6 +16934,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:                         2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:                         2001:a::8191:ed6b:8ce:b60/103
@@ -16706,6 +16945,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
@@ -16716,12 +16957,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/6
 
 <<<
-size: 3853
+size: 4027
 location: src/tests/client/test-client.py:test_003()/269
 cmd: $NMCLI -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3703 bytes
+stdout: 3877 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -16768,6 +17009,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:                         2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:                         2001:a::8191:ed6b:8ce:b60/103
@@ -16778,6 +17020,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
@@ -16788,38 +17032,38 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <niewidoczne> | /org/freedesktop/NetworkManager/Settings/Connection/6
 
 <<<
-size: 2996
+size: 2988
 location: src/tests/client/test-client.py:test_003()/270
 cmd: $NMCLI --color yes -f ALL con
 lang: C
 returncode: 0
-stdout: 2854 bytes
+stdout: 2846 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
-size: 3022
+size: 3014
 location: src/tests/client/test-client.py:test_003()/271
 cmd: $NMCLI --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2870 bytes
+stdout: 2862 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 435
@@ -16872,12 +17116,12 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 897
+size: 940
 location: src/tests/client/test-client.py:test_003()/276
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 712 bytes
+stdout: 755 bytes
 >>>
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
@@ -16891,15 +17135,16 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 912
+size: 955
 location: src/tests/client/test-client.py:test_003()/277
 cmd: $NMCLI --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 717 bytes
+stdout: 760 bytes
 >>>
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
@@ -16913,15 +17158,16 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3825
+size: 3999
 location: src/tests/client/test-client.py:test_003()/278
 cmd: $NMCLI --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3673 bytes
+stdout: 3847 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -16968,6 +17214,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:                         2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:                         2001:a::8191:ed6b:8ce:b60/103
@@ -16978,6 +17225,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
@@ -16988,12 +17237,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/6
 
 <<<
-size: 3865
+size: 4039
 location: src/tests/client/test-client.py:test_003()/279
 cmd: $NMCLI --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3703 bytes
+stdout: 3877 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -17040,6 +17289,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:                         2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:                         2001:a::8191:ed6b:8ce:b60/103
@@ -17050,6 +17300,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
@@ -17060,46 +17312,46 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <niewidoczne> | /org/freedesktop/NetworkManager/Settings/Connection/6
 
 <<<
-size: 3200
+size: 3191
 location: src/tests/client/test-client.py:test_003()/280
 cmd: $NMCLI --pretty -f ALL con
 lang: C
 returncode: 0
-stdout: 3061 bytes
+stdout: 3052 bytes
 >>>
 ======================================
   NetworkManager connection profiles
 ======================================
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
-
-<<<
-size: 3248
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         PORT  FILENAME                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
+
+<<<
+size: 3239
 location: src/tests/client/test-client.py:test_003()/281
 cmd: $NMCLI --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3099 bytes
+stdout: 3090 bytes
 >>>
 ==========================================
   Profile połączeń usługi NetworkManager
 ==========================================
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         PORT  FILENAME                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 634
@@ -17160,12 +17412,12 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 1420
+size: 1463
 location: src/tests/client/test-client.py:test_003()/286
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 1237 bytes
+stdout: 1280 bytes
 >>>
 ===============================================================================
                           Connection profile details
@@ -17185,16 +17437,17 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 1448
+size: 1491
 location: src/tests/client/test-client.py:test_003()/287
 cmd: $NMCLI --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1255 bytes
+stdout: 1298 bytes
 >>>
 ===============================================================================
                          Szczegóły profilu połączenia
@@ -17214,16 +17467,17 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4753
+size: 4927
 location: src/tests/client/test-client.py:test_003()/288
 cmd: $NMCLI --pretty -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4604 bytes
+stdout: 4778 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -17277,6 +17531,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
@@ -17289,6 +17544,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 -------------------------------------------------------------------------------
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
@@ -17302,12 +17559,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkMa
 -------------------------------------------------------------------------------
 
 <<<
-size: 4799
+size: 4973
 location: src/tests/client/test-client.py:test_003()/289
 cmd: $NMCLI --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4640 bytes
+stdout: 4814 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -17361,6 +17618,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
@@ -17373,6 +17631,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 -------------------------------------------------------------------------------
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
@@ -17386,46 +17646,46 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <niewidoczne> | /org/freedesktop/Network
 -------------------------------------------------------------------------------
 
 <<<
-size: 3482
+size: 3473
 location: src/tests/client/test-client.py:test_003()/290
 cmd: $NMCLI --pretty --color yes -f ALL con
 lang: C
 returncode: 0
-stdout: 3331 bytes
+stdout: 3322 bytes
 >>>
 ======================================
   NetworkManager connection profiles
 ======================================
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
-
-<<<
-size: 3530
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         PORT  FILENAME                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
+
+<<<
+size: 3521
 location: src/tests/client/test-client.py:test_003()/291
 cmd: $NMCLI --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3369 bytes
+stdout: 3360 bytes
 >>>
 ==========================================
   Profile połączeń usługi NetworkManager
 ==========================================
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         PORT  FILENAME                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 646
@@ -17486,12 +17746,12 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 1432
+size: 1475
 location: src/tests/client/test-client.py:test_003()/296
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 1237 bytes
+stdout: 1280 bytes
 >>>
 ===============================================================================
                           Connection profile details
@@ -17511,16 +17771,17 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 1460
+size: 1503
 location: src/tests/client/test-client.py:test_003()/297
 cmd: $NMCLI --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1255 bytes
+stdout: 1298 bytes
 >>>
 ===============================================================================
                          Szczegóły profilu połączenia
@@ -17540,16 +17801,17 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4765
+size: 4939
 location: src/tests/client/test-client.py:test_003()/298
 cmd: $NMCLI --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4604 bytes
+stdout: 4778 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -17603,6 +17865,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
@@ -17615,6 +17878,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 -------------------------------------------------------------------------------
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
@@ -17628,12 +17893,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkMa
 -------------------------------------------------------------------------------
 
 <<<
-size: 4811
+size: 4985
 location: src/tests/client/test-client.py:test_003()/299
 cmd: $NMCLI --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4640 bytes
+stdout: 4814 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -17687,6 +17952,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
@@ -17699,6 +17965,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 -------------------------------------------------------------------------------
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
@@ -17792,12 +18060,12 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 573
+size: 598
 location: src/tests/client/test-client.py:test_003()/306
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 392 bytes
+stdout: 417 bytes
 >>>
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -17811,15 +18079,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 583
+size: 608
 location: src/tests/client/test-client.py:test_003()/307
 cmd: $NMCLI --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 392 bytes
+stdout: 417 bytes
 >>>
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -17833,15 +18102,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2446
+size: 2550
 location: src/tests/client/test-client.py:test_003()/308
 cmd: $NMCLI --terse -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2298 bytes
+stdout: 2402 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -17888,6 +18158,7 @@ IP4.DNS[1]:192.168.213.113
 IP4.DOMAIN[1]:sear4.foo4.bar
 IP4.WINS[1]:192.168.156.115
 IP4.WINS[2]:192.168.8.33
+IP4.CLAT-ADDRESS:192.0.0.1
 IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
@@ -17898,6 +18169,8 @@ IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:sear6.fo.x.y
 IP6.DOMAIN[2]:sear6.foo4.bar
+IP6.CLAT-ADDRESS:2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:64:ff9b::/96
 DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
@@ -17908,12 +18181,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:<invisible> | /org/freedesktop/NetworkManager/Settings/Connection/6
 
 <<<
-size: 2456
+size: 2560
 location: src/tests/client/test-client.py:test_003()/309
 cmd: $NMCLI --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2298 bytes
+stdout: 2402 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -17960,6 +18233,7 @@ IP4.DNS[1]:192.168.213.113
 IP4.DOMAIN[1]:sear4.foo4.bar
 IP4.WINS[1]:192.168.156.115
 IP4.WINS[2]:192.168.8.33
+IP4.CLAT-ADDRESS:192.0.0.1
 IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
@@ -17970,6 +18244,8 @@ IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:sear6.fo.x.y
 IP6.DOMAIN[2]:sear6.foo4.bar
+IP6.CLAT-ADDRESS:2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:64:ff9b::/96
 DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
@@ -18060,12 +18336,12 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 585
+size: 610
 location: src/tests/client/test-client.py:test_003()/316
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 392 bytes
+stdout: 417 bytes
 >>>
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -18079,15 +18355,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 595
+size: 620
 location: src/tests/client/test-client.py:test_003()/317
 cmd: $NMCLI --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 392 bytes
+stdout: 417 bytes
 >>>
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -18101,15 +18378,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2458
+size: 2562
 location: src/tests/client/test-client.py:test_003()/318
 cmd: $NMCLI --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2298 bytes
+stdout: 2402 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -18156,6 +18434,7 @@ IP4.DNS[1]:192.168.213.113
 IP4.DOMAIN[1]:sear4.foo4.bar
 IP4.WINS[1]:192.168.156.115
 IP4.WINS[2]:192.168.8.33
+IP4.CLAT-ADDRESS:192.0.0.1
 IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
@@ -18166,6 +18445,8 @@ IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:sear6.fo.x.y
 IP6.DOMAIN[2]:sear6.foo4.bar
+IP6.CLAT-ADDRESS:2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:64:ff9b::/96
 DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
@@ -18176,12 +18457,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:<invisible> | /org/freedesktop/NetworkManager/Settings/Connection/6
 
 <<<
-size: 2468
+size: 2572
 location: src/tests/client/test-client.py:test_003()/319
 cmd: $NMCLI --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2298 bytes
+stdout: 2402 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -18228,6 +18509,7 @@ IP4.DNS[1]:192.168.213.113
 IP4.DOMAIN[1]:sear4.foo4.bar
 IP4.WINS[1]:192.168.156.115
 IP4.WINS[2]:192.168.8.33
+IP4.CLAT-ADDRESS:192.0.0.1
 IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
@@ -18238,6 +18520,8 @@ IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:sear6.fo.x.y
 IP6.DOMAIN[2]:sear6.foo4.bar
+IP6.CLAT-ADDRESS:2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:64:ff9b::/96
 DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
@@ -18248,38 +18532,38 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:<invisible> | /org/freedesktop/NetworkManager/Settings/Connection/6
 
 <<<
-size: 2729
+size: 2721
 location: src/tests/client/test-client.py:test_003()/320
 cmd: $NMCLI --mode tabular -f ALL con
 lang: C
 returncode: 0
-stdout: 2584 bytes
+stdout: 2576 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
-size: 2755
+size: 2747
 location: src/tests/client/test-client.py:test_003()/321
 cmd: $NMCLI --mode tabular -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2600 bytes
+stdout: 2592 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 438
@@ -18332,36 +18616,36 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 695
+size: 729
 location: src/tests/client/test-client.py:test_003()/326
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 507 bytes
+stdout: 541 bytes
 >>>
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 709
+size: 743
 location: src/tests/client/test-client.py:test_003()/327
 cmd: $NMCLI --mode tabular c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 511 bytes
+stdout: 545 bytes
 >>>
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 3247
+size: 3367
 location: src/tests/client/test-client.py:test_003()/328
 cmd: $NMCLI --mode tabular -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3092 bytes
+stdout: 3212 bytes
 >>>
 NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
 GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    100 (connected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --    eth0      no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
@@ -18375,14 +18659,14 @@ INTERFACE-FLAGS  yes  yes       no       no
 NAME              CARRIER  S390-SUBCHANNELS 
 WIRED-PROPERTIES  on       --               
 
-GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                           
-IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33 
+GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                            CLAT-ADDRESS 
+IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33  192.0.0.1    
 
 GROUP  OPTION 
 DHCP4  --     
 
-GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES 
-IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --       
+GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES  CLAT-ADDRESS                    CLAT-PREF64  
+IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --        2002:aaaa::2c0d:1e71:ef87:fac7  64:ff9b::/96 
 
 GROUP  OPTION                                                                                    
 DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 
@@ -18391,12 +18675,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/6 
 
 <<<
-size: 3281
+size: 3401
 location: src/tests/client/test-client.py:test_003()/329
 cmd: $NMCLI --mode tabular -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3116 bytes
+stdout: 3236 bytes
 >>>
 NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
 GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    100 (połączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --    eth0      nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
@@ -18410,14 +18694,14 @@ INTERFACE-FLAGS  tak  tak       nie      nie
 NAME              CARRIER   S390-SUBCHANNELS 
 WIRED-PROPERTIES  włączone  --               
 
-GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                           
-IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33 
+GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                            CLAT-ADDRESS 
+IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33  192.0.0.1    
 
 GROUP  OPTION 
 DHCP4  --     
 
-GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES 
-IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --       
+GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES  CLAT-ADDRESS                    CLAT-PREF64  
+IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --        2002:aaaa::2c0d:1e71:ef87:fac7  64:ff9b::/96 
 
 GROUP  OPTION                                                                                    
 DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 
@@ -18426,38 +18710,38 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <niewidoczne> | /org/freedesktop/NetworkManager/Settings/Connection/6 
 
 <<<
-size: 3011
+size: 3003
 location: src/tests/client/test-client.py:test_003()/330
 cmd: $NMCLI --mode tabular --color yes -f ALL con
 lang: C
 returncode: 0
-stdout: 2854 bytes
+stdout: 2846 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
-size: 3037
+size: 3029
 location: src/tests/client/test-client.py:test_003()/331
 cmd: $NMCLI --mode tabular --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2870 bytes
+stdout: 2862 bytes
 >>>
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         PORT  FILENAME                                        
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 450
@@ -18510,36 +18794,36 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 707
+size: 741
 location: src/tests/client/test-client.py:test_003()/336
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 507 bytes
+stdout: 541 bytes
 >>>
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 721
+size: 755
 location: src/tests/client/test-client.py:test_003()/337
 cmd: $NMCLI --mode tabular --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 511 bytes
+stdout: 545 bytes
 >>>
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 3259
+size: 3379
 location: src/tests/client/test-client.py:test_003()/338
 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3092 bytes
+stdout: 3212 bytes
 >>>
 NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
 GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    100 (connected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/eth0  --    eth0      no           yes         yes          no                no                 --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  unknown 
@@ -18553,14 +18837,14 @@ INTERFACE-FLAGS  yes  yes       no       no
 NAME              CARRIER  S390-SUBCHANNELS 
 WIRED-PROPERTIES  on       --               
 
-GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                           
-IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33 
+GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                            CLAT-ADDRESS 
+IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33  192.0.0.1    
 
 GROUP  OPTION 
 DHCP4  --     
 
-GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES 
-IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --       
+GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES  CLAT-ADDRESS                    CLAT-PREF64  
+IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --        2002:aaaa::2c0d:1e71:ef87:fac7  64:ff9b::/96 
 
 GROUP  OPTION                                                                                    
 DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 
@@ -18569,12 +18853,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/6 
 
 <<<
-size: 3293
+size: 3413
 location: src/tests/client/test-client.py:test_003()/339
 cmd: $NMCLI --mode tabular --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3116 bytes
+stdout: 3236 bytes
 >>>
 NAME     DEVICE  TYPE      NM-TYPE           DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                        PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
 GENERAL  eth0    ethernet  NMDeviceEthernet  /org/freedesktop/NetworkManager/Devices/1  --      --       virtual  --              --                C0:61:AE:26:4D:D7  0    100 (połączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/eth0  --    eth0      nie          tak         tak          nie               nie                --            ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1  nieznane 
@@ -18588,14 +18872,14 @@ INTERFACE-FLAGS  tak  tak       nie      nie
 NAME              CARRIER   S390-SUBCHANNELS 
 WIRED-PROPERTIES  włączone  --               
 
-GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                           
-IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33 
+GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                            CLAT-ADDRESS 
+IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33  192.0.0.1    
 
 GROUP  OPTION 
 DHCP4  --     
 
-GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES 
-IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --       
+GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES  CLAT-ADDRESS                    CLAT-PREF64  
+IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --        2002:aaaa::2c0d:1e71:ef87:fac7  64:ff9b::/96 
 
 GROUP  OPTION                                                                                    
 DHCP6  dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8 
@@ -18604,46 +18888,46 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <niewidoczne> | /org/freedesktop/NetworkManager/Settings/Connection/6 
 
 <<<
-size: 3215
+size: 3206
 location: src/tests/client/test-client.py:test_003()/340
 cmd: $NMCLI --mode tabular --pretty -f ALL con
 lang: C
 returncode: 0
-stdout: 3061 bytes
+stdout: 3052 bytes
 >>>
 ======================================
   NetworkManager connection profiles
 ======================================
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
-
-<<<
-size: 3263
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         PORT  FILENAME                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
+
+<<<
+size: 3254
 location: src/tests/client/test-client.py:test_003()/341
 cmd: $NMCLI --mode tabular --pretty -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3099 bytes
+stdout: 3090 bytes
 >>>
 ==========================================
   Profile połączeń usługi NetworkManager
 ==========================================
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         PORT  FILENAME                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 649
@@ -18704,12 +18988,12 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 1255
+size: 1306
 location: src/tests/client/test-client.py:test_003()/346
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 1057 bytes
+stdout: 1108 bytes
 >>>
 ==============================
   Connection profile details
@@ -18717,18 +19001,18 @@ stdout: 1057 bytes
 ====================================================================
   Active connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
 ====================================================================
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 1306
+size: 1357
 location: src/tests/client/test-client.py:test_003()/347
 cmd: $NMCLI --mode tabular --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1098 bytes
+stdout: 1149 bytes
 >>>
 ================================
   Szczegóły profilu połączenia
@@ -18736,18 +19020,18 @@ stdout: 1098 bytes
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
 ===========================================================================
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 4883
+size: 5063
 location: src/tests/client/test-client.py:test_003()/348
 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4719 bytes
+stdout: 4899 bytes
 >>>
 =========================
   Device details (eth0)
@@ -18768,17 +19052,17 @@ NAME              CARRIER  S390-SUBCHANNELS
 ---------------------------------------------
 WIRED-PROPERTIES  on       --               
 
-GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                           
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33 
+GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                            CLAT-ADDRESS 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33  192.0.0.1    
 
 GROUP  OPTION 
 ---------------
 DHCP4  --     
 
-GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --       
+GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES  CLAT-ADDRESS                    CLAT-PREF64  
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --        2002:aaaa::2c0d:1e71:ef87:fac7  64:ff9b::/96 
 
 GROUP  OPTION                                                                                    
 --------------------------------------------------------------------------------------------------
@@ -18789,12 +19073,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/6 
 
 <<<
-size: 4955
+size: 5135
 location: src/tests/client/test-client.py:test_003()/349
 cmd: $NMCLI --mode tabular --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4781 bytes
+stdout: 4961 bytes
 >>>
 ==================================
   Informacje o urządzeniu (eth0)
@@ -18815,17 +19099,17 @@ NAME              CARRIER   S390-SUBCHANNELS
 ----------------------------------------------
 WIRED-PROPERTIES  włączone  --               
 
-GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                           
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33 
+GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                            CLAT-ADDRESS 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33  192.0.0.1    
 
 GROUP  OPTION 
 ---------------
 DHCP4  --     
 
-GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --       
+GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES  CLAT-ADDRESS                    CLAT-PREF64  
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --        2002:aaaa::2c0d:1e71:ef87:fac7  64:ff9b::/96 
 
 GROUP  OPTION                                                                                    
 --------------------------------------------------------------------------------------------------
@@ -18836,46 +19120,46 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <niewidoczne> | /org/freedesktop/NetworkManager/Settings/Connection/6 
 
 <<<
-size: 3497
+size: 3488
 location: src/tests/client/test-client.py:test_003()/350
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con
 lang: C
 returncode: 0
-stdout: 3331 bytes
+stdout: 3322 bytes
 >>>
 ======================================
   NetworkManager connection profiles
 ======================================
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE  FILENAME                                        
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
-
-<<<
-size: 3545
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         PORT  FILENAME                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  yes     eth1    activated     /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          never           no           0                     no        /org/freedesktop/NetworkManager/Settings/Connection/5  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
+
+<<<
+size: 3536
 location: src/tests/client/test-client.py:test_003()/351
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3369 bytes
+stdout: 3360 bytes
 >>>
 ==========================================
   Profile połączeń usługi NetworkManager
 ==========================================
-NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE  FILENAME                                        
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/ethernet 
-ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/ethernet 
-con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-1    
-con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm1 
-con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm2 
-con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-gsm3 
-con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --     /etc/NetworkManager/system-connections/con-xx1  
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         PORT  FILENAME                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/ethernet 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --         --              --           --                    --        /org/freedesktop/NetworkManager/Settings/Connection/6  tak     eth1    aktywowano      /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/ethernet 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-1    
+con-gsm1  UUID-con-gsm1-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm1 
+con-gsm2  UUID-con-gsm2-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm2 
+con-gsm3  UUID-con-gsm3-REPLACED-REPLACED-REPL  gsm       0          nigdy           nie          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/5  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-gsm3 
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --    /etc/NetworkManager/system-connections/con-xx1  
 
 <<<
 size: 661
@@ -18936,12 +19220,12 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 1267
+size: 1318
 location: src/tests/client/test-client.py:test_003()/356
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 1057 bytes
+stdout: 1108 bytes
 >>>
 ==============================
   Connection profile details
@@ -18949,18 +19233,18 @@ stdout: 1057 bytes
 ====================================================================
   Active connection details (UUID-ethernet-REPLACED-REPLACED-REPL)
 ====================================================================
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE         DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      deactivating  no       no        --           no   /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 1318
+size: 1369
 location: src/tests/client/test-client.py:test_003()/357
 cmd: $NMCLI --mode tabular --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1098 bytes
+stdout: 1149 bytes
 >>>
 ================================
   Szczegóły profilu połączenia
@@ -18968,18 +19252,18 @@ stdout: 1098 bytes
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-ethernet-REPLACED-REPLACED-REPL)
 ===========================================================================
-GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --          
+GROUP    NAME      UUID                                  DEVICES  IP-IFACE  STATE           DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  eth0     eth0      dezaktywowanie  nie      nie       --           nie  /org/freedesktop/NetworkManager/ActiveConnection/1  /org/freedesktop/NetworkManager/Settings/Connection/6  --    --               --          
 
 
 <<<
-size: 4895
+size: 5075
 location: src/tests/client/test-client.py:test_003()/358
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4719 bytes
+stdout: 4899 bytes
 >>>
 =========================
   Device details (eth0)
@@ -19000,17 +19284,17 @@ NAME              CARRIER  S390-SUBCHANNELS
 ---------------------------------------------
 WIRED-PROPERTIES  on       --               
 
-GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                           
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33 
+GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                            CLAT-ADDRESS 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33  192.0.0.1    
 
 GROUP  OPTION 
 ---------------
 DHCP4  --     
 
-GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --       
+GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES  CLAT-ADDRESS                    CLAT-PREF64  
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --        2002:aaaa::2c0d:1e71:ef87:fac7  64:ff9b::/96 
 
 GROUP  OPTION                                                                                    
 --------------------------------------------------------------------------------------------------
@@ -19021,12 +19305,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                                   AVAILA
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}  5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/6 
 
 <<<
-size: 4967
+size: 5147
 location: src/tests/client/test-client.py:test_003()/359
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4781 bytes
+stdout: 4961 bytes
 >>>
 ==================================
   Informacje o urządzeniu (eth0)
@@ -19047,17 +19331,17 @@ NAME              CARRIER   S390-SUBCHANNELS
 ----------------------------------------------
 WIRED-PROPERTIES  włączone  --               
 
-GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                           
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33 
+GROUP  ADDRESS           GATEWAY  ROUTE                                                                                                         DNS              DOMAIN          SEARCHES  WINS                            CLAT-ADDRESS 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP4    192.168.6.238/29  --       dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64  192.168.213.113  sear4.foo4.bar  --        192.168.156.115 | 192.168.8.33  192.0.0.1    
 
 GROUP  OPTION 
 ---------------
 DHCP4  --     
 
-GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --       
+GROUP  ADDRESS                                                                                          GATEWAY                      ROUTE                                                            DNS                                                                                     DOMAIN                         SEARCHES  CLAT-ADDRESS                    CLAT-PREF64  
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+IP6    2001:a::29c0:62b9:2e01:30a/69 | 2001:a::6433:6420:34f9:3801/115 | 2001:a::8191:ed6b:8ce:b60/103  2001:a::2b50:64d1:9a91:23b4  dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794  2001:a::1323:9a78:2b82:d16b | 2001:a::4e1:24e6:b8c1:91bb | 2001:a::bd96:3bed:fbd6:19c5  sear6.fo.x.y | sear6.foo4.bar  --        2002:aaaa::2c0d:1e71:ef87:fac7  64:ff9b::/96 
 
 GROUP  OPTION                                                                                    
 --------------------------------------------------------------------------------------------------
@@ -19148,58 +19432,58 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 390
+size: 391
 location: src/tests/client/test-client.py:test_003()/366
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 194 bytes
+stdout: 195 bytes
 >>>
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6:::
 
 <<<
-size: 400
+size: 401
 location: src/tests/client/test-client.py:test_003()/367
 cmd: $NMCLI --mode tabular --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 194 bytes
+stdout: 195 bytes
 >>>
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6:::
 
 <<<
-size: 1471
+size: 1534
 location: src/tests/client/test-client.py:test_003()/368
 cmd: $NMCLI --mode tabular --terse -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 1308 bytes
+stdout: 1371 bytes
 >>>
 GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::eth0:no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIRED-PROPERTIES:on:
-IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar::192.168.156.115 | 192.168.8.33
+IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar::192.168.156.115 | 192.168.8.33:192.0.0.1
 DHCP4:
-IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar:
+IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar::2002\:aaaa\:\:2c0d\:1e71\:ef87\:fac7:64\:ff9b\:\:/96
 DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/6
 
 <<<
-size: 1481
+size: 1544
 location: src/tests/client/test-client.py:test_003()/369
 cmd: $NMCLI --mode tabular --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1308 bytes
+stdout: 1371 bytes
 >>>
 GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::eth0:no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIRED-PROPERTIES:on:
-IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar::192.168.156.115 | 192.168.8.33
+IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar::192.168.156.115 | 192.168.8.33:192.0.0.1
 DHCP4:
-IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar:
+IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar::2002\:aaaa\:\:2c0d\:1e71\:ef87\:fac7:64\:ff9b\:\:/96
 DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/6
 
@@ -19284,58 +19568,58 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 402
+size: 403
 location: src/tests/client/test-client.py:test_003()/376
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 194 bytes
+stdout: 195 bytes
 >>>
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6:::
 
 <<<
-size: 412
+size: 413
 location: src/tests/client/test-client.py:test_003()/377
 cmd: $NMCLI --mode tabular --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 194 bytes
+stdout: 195 bytes
 >>>
-GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6::
+GENERAL:ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:eth0:eth0:deactivating:no:no::no:/org/freedesktop/NetworkManager/ActiveConnection/1:/org/freedesktop/NetworkManager/Settings/Connection/6:::
 
 <<<
-size: 1483
+size: 1546
 location: src/tests/client/test-client.py:test_003()/378
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 1308 bytes
+stdout: 1371 bytes
 >>>
 GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::eth0:no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIRED-PROPERTIES:on:
-IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar::192.168.156.115 | 192.168.8.33
+IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar::192.168.156.115 | 192.168.8.33:192.0.0.1
 DHCP4:
-IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar:
+IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar::2002\:aaaa\:\:2c0d\:1e71\:ef87\:fac7:64\:ff9b\:\:/96
 DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/6
 
 <<<
-size: 1493
+size: 1556
 location: src/tests/client/test-client.py:test_003()/379
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1308 bytes
+stdout: 1371 bytes
 >>>
 GENERAL:eth0:ethernet:NMDeviceEthernet:/org/freedesktop/NetworkManager/Devices/1:::virtual:::C0\:61\:AE\:26\:4D\:D7:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/eth0::eth0:no:yes:yes:no:no::ethernet:UUID-ethernet-REPLACED-REPLACED-REPL:/org/freedesktop/NetworkManager/ActiveConnection/1:unknown
 CAPABILITIES:no:100 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIRED-PROPERTIES:on:
-IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar::192.168.156.115 | 192.168.8.33
+IP4:192.168.6.238/29::dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 | dst = 192.168.155.50/19, nh = 192.168.127.64:192.168.213.113:sear4.foo4.bar::192.168.156.115 | 192.168.8.33:192.0.0.1
 DHCP4:
-IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar:
+IP6:2001\:a\:\:29c0\:62b9\:2e01\:30a/69 | 2001\:a\:\:6433\:6420\:34f9\:3801/115 | 2001\:a\:\:8191\:ed6b\:8ce\:b60/103:2001\:a\:\:2b50\:64d1\:9a91\:23b4:dst = 2001\:a\:\:5ecb\:f5ee\:fb96\:856c/100, nh = \:\:, mt = 4249082794:2001\:a\:\:1323\:9a78\:2b82\:d16b | 2001\:a\:\:4e1\:24e6\:b8c1\:91bb | 2001\:a\:\:bd96\:3bed\:fbd6\:19c5:sear6.fo.x.y | sear6.foo4.bar::2002\:aaaa\:\:2c0d\:1e71\:ef87\:fac7:64\:ff9b\:\:/96
 DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-5 = val-5 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-8 = val-8
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{1,2,6}:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 | UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 | <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/6
 
@@ -19360,7 +19644,7 @@ ACTIVE:                                 yes
 DEVICE:                                 eth0
 STATE:                                  deactivating
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   ethernet
 UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
@@ -19375,7 +19659,7 @@ ACTIVE:                                 yes
 DEVICE:                                 eth1
 STATE:                                  activated
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   con-1
 UUID:                                   5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -19390,7 +19674,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-1
 NAME:                                   con-gsm1
 UUID:                                   UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -19405,7 +19689,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm1
 NAME:                                   con-gsm2
 UUID:                                   UUID-con-gsm2-REPLACED-REPLACED-REPL
@@ -19420,7 +19704,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm2
 NAME:                                   con-gsm3
 UUID:                                   UUID-con-gsm3-REPLACED-REPLACED-REPL
@@ -19435,7 +19719,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm3
 NAME:                                   con-xx1
 UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -19450,7 +19734,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-xx1
 
 <<<
@@ -19474,7 +19758,7 @@ ACTIVE:                                 tak
 DEVICE:                                 eth0
 STATE:                                  dezaktywowanie
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   ethernet
 UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
@@ -19489,7 +19773,7 @@ ACTIVE:                                 tak
 DEVICE:                                 eth1
 STATE:                                  aktywowano
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   con-1
 UUID:                                   5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -19504,7 +19788,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-1
 NAME:                                   con-gsm1
 UUID:                                   UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -19519,7 +19803,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm1
 NAME:                                   con-gsm2
 UUID:                                   UUID-con-gsm2-REPLACED-REPLACED-REPL
@@ -19534,7 +19818,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm2
 NAME:                                   con-gsm3
 UUID:                                   UUID-con-gsm3-REPLACED-REPLACED-REPL
@@ -19549,7 +19833,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm3
 NAME:                                   con-xx1
 UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -19564,7 +19848,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-xx1
 
 <<<
@@ -19626,12 +19910,12 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 902
+size: 945
 location: src/tests/client/test-client.py:test_003()/386
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 712 bytes
+stdout: 755 bytes
 >>>
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
@@ -19645,15 +19929,16 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 917
+size: 960
 location: src/tests/client/test-client.py:test_003()/387
 cmd: $NMCLI --mode multiline c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 717 bytes
+stdout: 760 bytes
 >>>
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
@@ -19667,15 +19952,16 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3830
+size: 4004
 location: src/tests/client/test-client.py:test_003()/388
 cmd: $NMCLI --mode multiline -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3673 bytes
+stdout: 3847 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -19722,6 +20008,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:                         2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:                         2001:a::8191:ed6b:8ce:b60/103
@@ -19732,6 +20019,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
@@ -19742,12 +20031,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/6
 
 <<<
-size: 3870
+size: 4044
 location: src/tests/client/test-client.py:test_003()/389
 cmd: $NMCLI --mode multiline -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3703 bytes
+stdout: 3877 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -19794,6 +20083,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:                         2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:                         2001:a::8191:ed6b:8ce:b60/103
@@ -19804,6 +20094,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
@@ -19834,7 +20126,7 @@ ACTIVE:                                 yes
 DEVICE:                                 eth0
 STATE:                                  deactivating
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   ethernet
 UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
@@ -19849,7 +20141,7 @@ ACTIVE:                                 yes
 DEVICE:                                 eth1
 STATE:                                  activated
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   con-1
 UUID:                                   5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -19864,7 +20156,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-1
 NAME:                                   con-gsm1
 UUID:                                   UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -19879,7 +20171,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm1
 NAME:                                   con-gsm2
 UUID:                                   UUID-con-gsm2-REPLACED-REPLACED-REPL
@@ -19894,7 +20186,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm2
 NAME:                                   con-gsm3
 UUID:                                   UUID-con-gsm3-REPLACED-REPLACED-REPL
@@ -19909,7 +20201,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm3
 NAME:                                   con-xx1
 UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -19924,7 +20216,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-xx1
 
 <<<
@@ -19948,7 +20240,7 @@ ACTIVE:                                 tak
 DEVICE:                                 eth0
 STATE:                                  dezaktywowanie
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   ethernet
 UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
@@ -19963,7 +20255,7 @@ ACTIVE:                                 tak
 DEVICE:                                 eth1
 STATE:                                  aktywowano
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 NAME:                                   con-1
 UUID:                                   5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -19978,7 +20270,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-1
 NAME:                                   con-gsm1
 UUID:                                   UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -19993,7 +20285,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm1
 NAME:                                   con-gsm2
 UUID:                                   UUID-con-gsm2-REPLACED-REPLACED-REPL
@@ -20008,7 +20300,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm2
 NAME:                                   con-gsm3
 UUID:                                   UUID-con-gsm3-REPLACED-REPLACED-REPL
@@ -20023,7 +20315,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm3
 NAME:                                   con-xx1
 UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -20038,7 +20330,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-xx1
 
 <<<
@@ -20100,12 +20392,12 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 914
+size: 957
 location: src/tests/client/test-client.py:test_003()/396
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 712 bytes
+stdout: 755 bytes
 >>>
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
@@ -20119,15 +20411,16 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 929
+size: 972
 location: src/tests/client/test-client.py:test_003()/397
 cmd: $NMCLI --mode multiline --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 717 bytes
+stdout: 760 bytes
 >>>
 GENERAL.NAME:                           ethernet
 GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
@@ -20141,15 +20434,16 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 3842
+size: 4016
 location: src/tests/client/test-client.py:test_003()/398
 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 3673 bytes
+stdout: 3847 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -20196,6 +20490,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:                         2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:                         2001:a::8191:ed6b:8ce:b60/103
@@ -20206,6 +20501,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
@@ -20216,12 +20513,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkManager/Settings/Connection/6
 
 <<<
-size: 3882
+size: 4056
 location: src/tests/client/test-client.py:test_003()/399
 cmd: $NMCLI --mode multiline --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3703 bytes
+stdout: 3877 bytes
 >>>
 GENERAL.DEVICE:                         eth0
 GENERAL.TYPE:                           ethernet
@@ -20268,6 +20565,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:                         2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:                         2001:a::8191:ed6b:8ce:b60/103
@@ -20278,6 +20576,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
@@ -20311,7 +20611,7 @@ ACTIVE:                                 yes
 DEVICE:                                 eth0
 STATE:                                  deactivating
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
 NAME:                                   ethernet
@@ -20327,7 +20627,7 @@ ACTIVE:                                 yes
 DEVICE:                                 eth1
 STATE:                                  activated
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
 NAME:                                   con-1
@@ -20343,7 +20643,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-1
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm1
@@ -20359,7 +20659,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm1
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm2
@@ -20375,7 +20675,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm2
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm3
@@ -20391,7 +20691,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm3
 -------------------------------------------------------------------------------
 NAME:                                   con-xx1
@@ -20407,7 +20707,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-xx1
 -------------------------------------------------------------------------------
 
@@ -20435,7 +20735,7 @@ ACTIVE:                                 tak
 DEVICE:                                 eth0
 STATE:                                  dezaktywowanie
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
 NAME:                                   ethernet
@@ -20451,7 +20751,7 @@ ACTIVE:                                 tak
 DEVICE:                                 eth1
 STATE:                                  aktywowano
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
 NAME:                                   con-1
@@ -20467,7 +20767,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-1
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm1
@@ -20483,7 +20783,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm1
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm2
@@ -20499,7 +20799,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm2
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm3
@@ -20515,7 +20815,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm3
 -------------------------------------------------------------------------------
 NAME:                                   con-xx1
@@ -20531,7 +20831,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-xx1
 -------------------------------------------------------------------------------
 
@@ -20610,12 +20910,12 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 1437
+size: 1480
 location: src/tests/client/test-client.py:test_003()/406
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 1237 bytes
+stdout: 1280 bytes
 >>>
 ===============================================================================
                           Connection profile details
@@ -20635,16 +20935,17 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 1465
+size: 1508
 location: src/tests/client/test-client.py:test_003()/407
 cmd: $NMCLI --mode multiline --pretty c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1255 bytes
+stdout: 1298 bytes
 >>>
 ===============================================================================
                          Szczegóły profilu połączenia
@@ -20664,16 +20965,17 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4770
+size: 4944
 location: src/tests/client/test-client.py:test_003()/408
 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4604 bytes
+stdout: 4778 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -20727,6 +21029,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
@@ -20739,6 +21042,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 -------------------------------------------------------------------------------
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
@@ -20752,12 +21057,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkMa
 -------------------------------------------------------------------------------
 
 <<<
-size: 4816
+size: 4990
 location: src/tests/client/test-client.py:test_003()/409
 cmd: $NMCLI --mode multiline --pretty -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4640 bytes
+stdout: 4814 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -20811,6 +21116,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
@@ -20823,6 +21129,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 -------------------------------------------------------------------------------
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
@@ -20859,7 +21167,7 @@ ACTIVE:                                 yes
 DEVICE:                                 eth0
 STATE:                                  deactivating
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
 NAME:                                   ethernet
@@ -20875,7 +21183,7 @@ ACTIVE:                                 yes
 DEVICE:                                 eth1
 STATE:                                  activated
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
 NAME:                                   con-1
@@ -20891,7 +21199,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-1
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm1
@@ -20907,7 +21215,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm1
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm2
@@ -20923,7 +21231,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm2
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm3
@@ -20939,7 +21247,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm3
 -------------------------------------------------------------------------------
 NAME:                                   con-xx1
@@ -20955,7 +21263,7 @@ ACTIVE:                                 no
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-xx1
 -------------------------------------------------------------------------------
 
@@ -20983,7 +21291,7 @@ ACTIVE:                                 tak
 DEVICE:                                 eth0
 STATE:                                  dezaktywowanie
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
 NAME:                                   ethernet
@@ -20999,7 +21307,7 @@ ACTIVE:                                 tak
 DEVICE:                                 eth1
 STATE:                                  aktywowano
 ACTIVE-PATH:                            /org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/ethernet
 -------------------------------------------------------------------------------
 NAME:                                   con-1
@@ -21015,7 +21323,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-1
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm1
@@ -21031,7 +21339,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm1
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm2
@@ -21047,7 +21355,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm2
 -------------------------------------------------------------------------------
 NAME:                                   con-gsm3
@@ -21063,7 +21371,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-gsm3
 -------------------------------------------------------------------------------
 NAME:                                   con-xx1
@@ -21079,7 +21387,7 @@ ACTIVE:                                 nie
 DEVICE:                                 --
 STATE:                                  --
 ACTIVE-PATH:                            --
-SLAVE:                                  --
+PORT:                                   --
 FILENAME:                               /etc/NetworkManager/system-connections/con-xx1
 -------------------------------------------------------------------------------
 
@@ -21158,12 +21466,12 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 1449
+size: 1492
 location: src/tests/client/test-client.py:test_003()/416
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 1237 bytes
+stdout: 1280 bytes
 >>>
 ===============================================================================
                           Connection profile details
@@ -21183,16 +21491,17 @@ GENERAL.VPN:                            no
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 1477
+size: 1520
 location: src/tests/client/test-client.py:test_003()/417
 cmd: $NMCLI --mode multiline --pretty --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1255 bytes
+stdout: 1298 bytes
 >>>
 ===============================================================================
                          Szczegóły profilu połączenia
@@ -21212,16 +21521,17 @@ GENERAL.VPN:                            nie
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 4782
+size: 4956
 location: src/tests/client/test-client.py:test_003()/418
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 4604 bytes
+stdout: 4778 bytes
 >>>
 ===============================================================================
                              Device details (eth0)
@@ -21275,6 +21585,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
@@ -21287,6 +21598,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 -------------------------------------------------------------------------------
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
@@ -21300,12 +21613,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <invisible> | /org/freedesktop/NetworkMa
 -------------------------------------------------------------------------------
 
 <<<
-size: 4828
+size: 5002
 location: src/tests/client/test-client.py:test_003()/419
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4640 bytes
+stdout: 4814 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (eth0)
@@ -21359,6 +21672,7 @@ IP4.DNS[1]:                             192.168.213.113
 IP4.DOMAIN[1]:                          sear4.foo4.bar
 IP4.WINS[1]:                            192.168.156.115
 IP4.WINS[2]:                            192.168.8.33
+IP4.CLAT-ADDRESS:                       192.0.0.1
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 IP6.ADDRESS[1]:                         2001:a::29c0:62b9:2e01:30a/69
@@ -21371,6 +21685,8 @@ IP6.DNS[2]:                             2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:                             2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 IP6.DOMAIN[2]:                          sear6.foo4.bar
+IP6.CLAT-ADDRESS:                       2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:                        64:ff9b::/96
 -------------------------------------------------------------------------------
 DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
@@ -21384,12 +21700,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   <niewidoczne> | /org/freedesktop/Network
 -------------------------------------------------------------------------------
 
 <<<
-size: 2500
+size: 2493
 location: src/tests/client/test-client.py:test_003()/420
 cmd: $NMCLI --mode multiline --terse -f ALL con
 lang: C
 returncode: 0
-stdout: 2345 bytes
+stdout: 2338 bytes
 >>>
 NAME:ethernet
 UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -21404,7 +21720,7 @@ ACTIVE:yes
 DEVICE:eth0
 STATE:deactivating
 ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:ethernet
 UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -21419,7 +21735,7 @@ ACTIVE:yes
 DEVICE:eth1
 STATE:activated
 ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:con-1
 UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -21434,7 +21750,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-1
 NAME:con-gsm1
 UUID:UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -21449,7 +21765,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm1
 NAME:con-gsm2
 UUID:UUID-con-gsm2-REPLACED-REPLACED-REPL
@@ -21464,7 +21780,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm2
 NAME:con-gsm3
 UUID:UUID-con-gsm3-REPLACED-REPLACED-REPL
@@ -21479,7 +21795,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm3
 NAME:con-xx1
 UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -21494,16 +21810,16 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
-size: 2510
+size: 2503
 location: src/tests/client/test-client.py:test_003()/421
 cmd: $NMCLI --mode multiline --terse -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2345 bytes
+stdout: 2338 bytes
 >>>
 NAME:ethernet
 UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -21518,7 +21834,7 @@ ACTIVE:yes
 DEVICE:eth0
 STATE:deactivating
 ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:ethernet
 UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -21533,7 +21849,7 @@ ACTIVE:yes
 DEVICE:eth1
 STATE:activated
 ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:con-1
 UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -21548,7 +21864,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-1
 NAME:con-gsm1
 UUID:UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -21563,7 +21879,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm1
 NAME:con-gsm2
 UUID:UUID-con-gsm2-REPLACED-REPLACED-REPL
@@ -21578,7 +21894,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm2
 NAME:con-gsm3
 UUID:UUID-con-gsm3-REPLACED-REPLACED-REPL
@@ -21593,7 +21909,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm3
 NAME:con-xx1
 UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -21608,7 +21924,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
@@ -21670,12 +21986,12 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 590
+size: 615
 location: src/tests/client/test-client.py:test_003()/426
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 392 bytes
+stdout: 417 bytes
 >>>
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -21689,15 +22005,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 600
+size: 625
 location: src/tests/client/test-client.py:test_003()/427
 cmd: $NMCLI --mode multiline --terse c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 392 bytes
+stdout: 417 bytes
 >>>
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -21711,15 +22028,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2463
+size: 2567
 location: src/tests/client/test-client.py:test_003()/428
 cmd: $NMCLI --mode multiline --terse -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2298 bytes
+stdout: 2402 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -21766,6 +22084,7 @@ IP4.DNS[1]:192.168.213.113
 IP4.DOMAIN[1]:sear4.foo4.bar
 IP4.WINS[1]:192.168.156.115
 IP4.WINS[2]:192.168.8.33
+IP4.CLAT-ADDRESS:192.0.0.1
 IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
@@ -21776,6 +22095,8 @@ IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:sear6.fo.x.y
 IP6.DOMAIN[2]:sear6.foo4.bar
+IP6.CLAT-ADDRESS:2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:64:ff9b::/96
 DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
@@ -21786,12 +22107,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:<invisible> | /org/freedesktop/NetworkManager/Settings/Connection/6
 
 <<<
-size: 2473
+size: 2577
 location: src/tests/client/test-client.py:test_003()/429
 cmd: $NMCLI --mode multiline --terse -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2298 bytes
+stdout: 2402 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -21838,6 +22159,7 @@ IP4.DNS[1]:192.168.213.113
 IP4.DOMAIN[1]:sear4.foo4.bar
 IP4.WINS[1]:192.168.156.115
 IP4.WINS[2]:192.168.8.33
+IP4.CLAT-ADDRESS:192.0.0.1
 IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
@@ -21848,6 +22170,8 @@ IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:sear6.fo.x.y
 IP6.DOMAIN[2]:sear6.foo4.bar
+IP6.CLAT-ADDRESS:2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:64:ff9b::/96
 DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
@@ -21858,12 +22182,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:<invisible> | /org/freedesktop/NetworkManager/Settings/Connection/6
 
 <<<
-size: 2782
+size: 2775
 location: src/tests/client/test-client.py:test_003()/430
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con
 lang: C
 returncode: 0
-stdout: 2615 bytes
+stdout: 2608 bytes
 >>>
 NAME:ethernet
 UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -21878,7 +22202,7 @@ ACTIVE:yes
 DEVICE:eth0
 STATE:deactivating
 ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:ethernet
 UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -21893,7 +22217,7 @@ ACTIVE:yes
 DEVICE:eth1
 STATE:activated
 ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:con-1
 UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -21908,7 +22232,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-1
 NAME:con-gsm1
 UUID:UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -21923,7 +22247,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm1
 NAME:con-gsm2
 UUID:UUID-con-gsm2-REPLACED-REPLACED-REPL
@@ -21938,7 +22262,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm2
 NAME:con-gsm3
 UUID:UUID-con-gsm3-REPLACED-REPLACED-REPL
@@ -21953,7 +22277,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm3
 NAME:con-xx1
 UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -21968,16 +22292,16 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
-size: 2792
+size: 2785
 location: src/tests/client/test-client.py:test_003()/431
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2615 bytes
+stdout: 2608 bytes
 >>>
 NAME:ethernet
 UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -21992,7 +22316,7 @@ ACTIVE:yes
 DEVICE:eth0
 STATE:deactivating
 ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:ethernet
 UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -22007,7 +22331,7 @@ ACTIVE:yes
 DEVICE:eth1
 STATE:activated
 ACTIVE-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/ethernet
 NAME:con-1
 UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
@@ -22022,7 +22346,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-1
 NAME:con-gsm1
 UUID:UUID-con-gsm1-REPLACED-REPLACED-REPL
@@ -22037,7 +22361,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm1
 NAME:con-gsm2
 UUID:UUID-con-gsm2-REPLACED-REPLACED-REPL
@@ -22052,7 +22376,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm2
 NAME:con-gsm3
 UUID:UUID-con-gsm3-REPLACED-REPLACED-REPL
@@ -22067,7 +22391,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-gsm3
 NAME:con-xx1
 UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -22082,7 +22406,7 @@ ACTIVE:no
 DEVICE:
 STATE:
 ACTIVE-PATH:
-SLAVE:
+PORT:
 FILENAME:/etc/NetworkManager/system-connections/con-xx1
 
 <<<
@@ -22144,12 +22468,12 @@ stderr: 58 bytes
 Błąd: ethernet — nie ma takiego profilu połączenia.
 
 <<<
-size: 602
+size: 627
 location: src/tests/client/test-client.py:test_003()/436
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
-stdout: 392 bytes
+stdout: 417 bytes
 >>>
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -22163,15 +22487,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 612
+size: 637
 location: src/tests/client/test-client.py:test_003()/437
 cmd: $NMCLI --mode multiline --terse --color yes c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 392 bytes
+stdout: 417 bytes
 >>>
 GENERAL.NAME:ethernet
 GENERAL.UUID:UUID-ethernet-REPLACED-REPLACED-REPL
@@ -22185,15 +22510,16 @@ GENERAL.VPN:no
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/6
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 2475
+size: 2579
 location: src/tests/client/test-client.py:test_003()/438
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
 lang: C
 returncode: 0
-stdout: 2298 bytes
+stdout: 2402 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -22240,6 +22566,7 @@ IP4.DNS[1]:192.168.213.113
 IP4.DOMAIN[1]:sear4.foo4.bar
 IP4.WINS[1]:192.168.156.115
 IP4.WINS[2]:192.168.8.33
+IP4.CLAT-ADDRESS:192.0.0.1
 IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
@@ -22250,6 +22577,8 @@ IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:sear6.fo.x.y
 IP6.DOMAIN[2]:sear6.foo4.bar
+IP6.CLAT-ADDRESS:2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:64:ff9b::/96
 DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
@@ -22260,12 +22589,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-
 CONNECTIONS.AVAILABLE-CONNECTIONS[3]:<invisible> | /org/freedesktop/NetworkManager/Settings/Connection/6
 
 <<<
-size: 2485
+size: 2589
 location: src/tests/client/test-client.py:test_003()/439
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2298 bytes
+stdout: 2402 bytes
 >>>
 GENERAL.DEVICE:eth0
 GENERAL.TYPE:ethernet
@@ -22312,6 +22641,7 @@ IP4.DNS[1]:192.168.213.113
 IP4.DOMAIN[1]:sear4.foo4.bar
 IP4.WINS[1]:192.168.156.115
 IP4.WINS[2]:192.168.8.33
+IP4.CLAT-ADDRESS:192.0.0.1
 IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69
 IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115
 IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103
@@ -22322,6 +22652,8 @@ IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb
 IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5
 IP6.DOMAIN[1]:sear6.fo.x.y
 IP6.DOMAIN[2]:sear6.foo4.bar
+IP6.CLAT-ADDRESS:2002:aaaa::2c0d:1e71:ef87:fac7
+IP6.CLAT-PREF64:64:ff9b::/96
 DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
diff --git a/src/tests/client/test-client.check-on-disk/test_004.expected b/src/tests/client/test-client.check-on-disk/test_004.expected
index 11ef7556..9b500996 100644
--- a/src/tests/client/test-client.check-on-disk/test_004.expected
+++ b/src/tests/client/test-client.check-on-disk/test_004.expected
@@ -58,12 +58,12 @@ location: src/tests/client/test-client.py:test_004()/7
 cmd: $NMCLI connection mod con-xx1 ipv4.addresses 192.168.77.5/24 ipv4.routes '2.3.4.5/32 192.168.77.1' ipv6.addresses 1:2:3:4::6/64 ipv6.routes 1:2:3:4:5:6::5/128
 lang: C
 returncode: 0
-size: 6252
+size: 6305
 location: src/tests/client/test-client.py:test_004()/8
 cmd: $NMCLI con s con-xx1
 lang: C
 returncode: 0
-stdout: 6121 bytes
+stdout: 6174 bytes
 >>>
 connection.id:                          con-xx1
 connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -149,6 +149,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -195,12 +196,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 6287
+size: 6340
 location: src/tests/client/test-client.py:test_004()/9
 cmd: $NMCLI con s con-xx1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6146 bytes
+stdout: 6199 bytes
 >>>
 connection.id:                          con-xx1
 connection.uuid:                        UUID-con-xx1-REPLACED-REPLACED-REPLA
@@ -286,6 +287,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -368,12 +370,12 @@ con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  vpn       --
 con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      --     
 
 <<<
-size: 5628
+size: 5681
 location: src/tests/client/test-client.py:test_004()/13
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5494 bytes
+stdout: 5547 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -441,6 +443,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -493,12 +496,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 5655
+size: 5708
 location: src/tests/client/test-client.py:test_004()/14
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5511 bytes
+stdout: 5564 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -566,6 +569,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -690,12 +694,12 @@ con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      wlan0
 con-1      5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --     
 
 <<<
-size: 6756
+size: 6852
 location: src/tests/client/test-client.py:test_004()/21
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 6622 bytes
+stdout: 6718 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -763,6 +767,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -825,6 +830,7 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
@@ -836,12 +842,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 6789
+size: 6885
 location: src/tests/client/test-client.py:test_004()/22
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6645 bytes
+stdout: 6741 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -909,6 +915,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -971,6 +978,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
@@ -1072,38 +1080,38 @@ Strony podręcznika nmcli(1) i nmcli-examples(7) zawierają pełne informacje
 o użyciu.
 
 <<<
-size: 1448
+size: 1444
 location: src/tests/client/test-client.py:test_004()/25
 cmd: $NMCLI -f all connection show --order na:-active
 lang: C
 returncode: 0
-stdout: 1288 bytes
+stdout: 1284 bytes
 >>>
-NAME       UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE      ACTIVE-PATH                                         SLAVE  FILENAME                                         
-con-1      5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --         --                                                  --     /etc/NetworkManager/system-connections/con-1     
-con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  vpn       0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  yes     wlan0   activated  /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/con-vpn-1 
-con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  yes     wlan0   activated  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/con-xx1   
+NAME       UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE      ACTIVE-PATH                                         PORT  FILENAME                                         
+con-1      5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --         --                                                  --    /etc/NetworkManager/system-connections/con-1     
+con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  vpn       0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  yes     wlan0   activated  /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/con-vpn-1 
+con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  yes     wlan0   activated  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/con-xx1   
 
 <<<
-size: 1448
+size: 1444
 location: src/tests/client/test-client.py:test_004()/26
 cmd: $NMCLI -f all connection show --order active:-na
 lang: C
 returncode: 0
-stdout: 1288 bytes
+stdout: 1284 bytes
 >>>
-NAME       UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE      ACTIVE-PATH                                         SLAVE  FILENAME                                         
-con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  vpn       0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  yes     wlan0   activated  /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/con-vpn-1 
-con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  yes     wlan0   activated  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/con-xx1   
-con-1      5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --         --                                                  --     /etc/NetworkManager/system-connections/con-1     
+NAME       UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE      ACTIVE-PATH                                         PORT  FILENAME                                         
+con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  vpn       0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  yes     wlan0   activated  /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/con-vpn-1 
+con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  yes     wlan0   activated  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/con-xx1   
+con-1      5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --         --                                                  --    /etc/NetworkManager/system-connections/con-1     
 
 <<<
-size: 6762
+size: 6858
 location: src/tests/client/test-client.py:test_004()/27
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 6628 bytes
+stdout: 6724 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1171,6 +1179,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -1233,6 +1242,7 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
@@ -1244,12 +1254,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 6799
+size: 6895
 location: src/tests/client/test-client.py:test_004()/28
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6655 bytes
+stdout: 6751 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1317,6 +1327,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -1379,6 +1390,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
@@ -1390,12 +1402,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 6762
+size: 6858
 location: src/tests/client/test-client.py:test_004()/29
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 6628 bytes
+stdout: 6724 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1463,6 +1475,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -1525,6 +1538,7 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
@@ -1536,12 +1550,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 6799
+size: 6895
 location: src/tests/client/test-client.py:test_004()/30
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6655 bytes
+stdout: 6751 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1609,6 +1623,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -1671,6 +1686,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
@@ -1682,12 +1698,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5635
+size: 5688
 location: src/tests/client/test-client.py:test_004()/31
 cmd: $NMCLI -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5494 bytes
+stdout: 5547 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1755,6 +1771,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -1807,12 +1824,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 5662
+size: 5715
 location: src/tests/client/test-client.py:test_004()/32
 cmd: $NMCLI -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5511 bytes
+stdout: 5564 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1880,6 +1897,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -1962,12 +1980,12 @@ vpn.persistent:                         nie
 vpn.timeout:                            0
 
 <<<
-size: 857
+size: 900
 location: src/tests/client/test-client.py:test_004()/35
 cmd: $NMCLI -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 713 bytes
+stdout: 756 bytes
 >>>
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -1981,15 +1999,16 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 870
+size: 913
 location: src/tests/client/test-client.py:test_004()/36
 cmd: $NMCLI -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 716 bytes
+stdout: 759 bytes
 >>>
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -2003,6 +2022,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
@@ -2358,12 +2378,12 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
-size: 22801
+size: 22992
 location: src/tests/client/test-client.py:test_004()/43
 cmd: $NMCLI -f all dev show
 lang: C
 returncode: 0
-stdout: 22666 bytes
+stdout: 22857 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -2417,7 +2437,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -2426,7 +2447,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -2435,7 +2457,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -2666,6 +2689,7 @@ AP[1].IN-USE:
 AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infra
+AP[1].BAND:                             2.4 GHz
 AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           48
@@ -2790,12 +2814,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 22968
+size: 23159
 location: src/tests/client/test-client.py:test_004()/44
 cmd: $NMCLI -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 22823 bytes
+stdout: 23014 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -2849,7 +2873,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -2858,7 +2883,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -2867,7 +2893,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -3098,6 +3125,7 @@ AP[1].IN-USE:
 AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infrastruktura
+AP[1].BAND:                             2.4 GHz
 AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           48
@@ -3288,12 +3316,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5454
+size: 5597
 location: src/tests/client/test-client.py:test_004()/47
 cmd: $NMCLI -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 5314 bytes
+stdout: 5457 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -3347,7 +3375,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -3356,7 +3385,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -3365,7 +3395,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -3400,12 +3431,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5516
+size: 5659
 location: src/tests/client/test-client.py:test_004()/48
 cmd: $NMCLI -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5366 bytes
+stdout: 5509 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -3459,7 +3490,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -3468,7 +3500,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -3477,7 +3510,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -3742,76 +3776,76 @@ wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
 
 <<<
-size: 2059
+size: 2119
 location: src/tests/client/test-client.py:test_004()/55
 cmd: $NMCLI -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 1917 bytes
+stdout: 1977 bytes
 >>>
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  40 MHz     55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND     FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5 GHz    5220 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  6     2.4 GHz  2437 MHz  54 Mbit/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  129   6 GHz    6595 MHz  54 Mbit/s  40 MHz     55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND     FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2.4 GHz  2412 MHz  54 Mbit/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
 
-NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
+NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  BAND  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
 <<<
-size: 2135
+size: 2195
 location: src/tests/client/test-client.py:test_004()/56
 cmd: $NMCLI -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1983 bytes
+stdout: 2043 bytes
 >>>
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND     FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5 GHz    5220 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  6     2.4 GHz  2437 MHz  54 Mb/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  129   6 GHz    6595 MHz  54 Mb/s  40 MHz     55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND     FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2.4 GHz  2412 MHz  54 Mb/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
 
-NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
+NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  BAND  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
 <<<
-size: 737
+size: 797
 location: src/tests/client/test-client.py:test_004()/57
 cmd: $NMCLI -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 593 bytes
+stdout: 653 bytes
 >>>
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  2.4 GHz  1     54 Mbit/s  48      **    WPA1 WPA2 
 
-IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 <<<
-size: 797
+size: 857
 location: src/tests/client/test-client.py:test_004()/58
 cmd: $NMCLI -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 643 bytes
+stdout: 703 bytes
 >>>
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  2.4 GHz  1     54 Mb/s  48      **    WPA1 WPA2 
 
-IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 <<<
 size: 2095
@@ -3822,9 +3856,9 @@ returncode: 0
 stdout: 1840 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5220 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  6     2437 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  129   6595 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -3840,9 +3874,9 @@ returncode: 0
 stdout: 1898 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5220 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  6     2437 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  129   6595 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -3850,54 +3884,54 @@ AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
 <<<
-size: 757
+size: 771
 location: src/tests/client/test-client.py:test_004()/61
 cmd: $NMCLI -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 592 bytes
+stdout: 606 bytes
 >>>
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND   FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5 GHz  5220 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 787
+size: 801
 location: src/tests/client/test-client.py:test_004()/62
 cmd: $NMCLI -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 612 bytes
+stdout: 626 bytes
 >>>
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND   FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5 GHz  5220 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 346
+size: 360
 location: src/tests/client/test-client.py:test_004()/63
 cmd: $NMCLI -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 178 bytes
+stdout: 192 bytes
 >>>
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   BAND   CHAN  RATE       SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz  44    54 Mbit/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
-size: 372
+size: 386
 location: src/tests/client/test-client.py:test_004()/64
 cmd: $NMCLI -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 194 bytes
+stdout: 208 bytes
 >>>
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            BAND   CHAN  RATE     SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz  44    54 Mb/s  92      ****  WPA1 WPA2 
 
 
 
@@ -3910,7 +3944,7 @@ returncode: 0
 stdout: 570 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5220 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
@@ -3923,17 +3957,17 @@ returncode: 0
 stdout: 588 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5220 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 5457
+size: 5600
 location: src/tests/client/test-client.py:test_004()/67
 cmd: $NMCLI -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 5314 bytes
+stdout: 5457 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -3987,7 +4021,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -3996,7 +4031,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -4005,7 +4041,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -4040,12 +4077,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5519
+size: 5662
 location: src/tests/client/test-client.py:test_004()/68
 cmd: $NMCLI -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5366 bytes
+stdout: 5509 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -4099,7 +4136,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -4108,7 +4146,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -4117,7 +4156,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -4218,12 +4258,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5421
+size: 5564
 location: src/tests/client/test-client.py:test_004()/71
 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: 5140 bytes
+stdout: 5283 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -4273,7 +4313,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -4282,7 +4323,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -4291,7 +4333,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -4326,12 +4369,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5481
+size: 5624
 location: src/tests/client/test-client.py:test_004()/72
 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: 5190 bytes
+stdout: 5333 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -4381,7 +4424,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -4390,7 +4434,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -4399,7 +4444,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -4542,12 +4588,12 @@ connection.type:                        802-11-wireless
 connection.interface-name:              --
 
 <<<
-size: 6774
+size: 6870
 location: src/tests/client/test-client.py:test_004()/77
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 6628 bytes
+stdout: 6724 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4615,6 +4661,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -4677,6 +4724,7 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
@@ -4688,12 +4736,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 6811
+size: 6907
 location: src/tests/client/test-client.py:test_004()/78
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6655 bytes
+stdout: 6751 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4761,6 +4809,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -4823,6 +4872,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
@@ -4834,12 +4884,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 6774
+size: 6870
 location: src/tests/client/test-client.py:test_004()/79
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 6628 bytes
+stdout: 6724 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -4907,6 +4957,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -4969,6 +5020,7 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
@@ -4980,12 +5032,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 6811
+size: 6907
 location: src/tests/client/test-client.py:test_004()/80
 cmd: $NMCLI --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6655 bytes
+stdout: 6751 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -5053,6 +5105,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -5115,6 +5168,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
@@ -5126,12 +5180,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5647
+size: 5700
 location: src/tests/client/test-client.py:test_004()/81
 cmd: $NMCLI --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5494 bytes
+stdout: 5547 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -5199,6 +5253,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -5251,12 +5306,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 5674
+size: 5727
 location: src/tests/client/test-client.py:test_004()/82
 cmd: $NMCLI --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5511 bytes
+stdout: 5564 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -5324,6 +5379,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -5406,12 +5462,12 @@ vpn.persistent:                         nie
 vpn.timeout:                            0
 
 <<<
-size: 869
+size: 912
 location: src/tests/client/test-client.py:test_004()/85
 cmd: $NMCLI --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 713 bytes
+stdout: 756 bytes
 >>>
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -5425,15 +5481,16 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 882
+size: 925
 location: src/tests/client/test-client.py:test_004()/86
 cmd: $NMCLI --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 716 bytes
+stdout: 759 bytes
 >>>
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -5447,6 +5504,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
@@ -5802,12 +5860,12 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
-size: 23137
+size: 23364
 location: src/tests/client/test-client.py:test_004()/93
 cmd: $NMCLI --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 22990 bytes
+stdout: 23217 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -5861,7 +5919,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -5870,7 +5929,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -5879,7 +5939,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -6110,6 +6171,7 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infra
+AP[1].BAND:                             2.4 GHz
 AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           48
@@ -6234,12 +6296,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 23304
+size: 23531
 location: src/tests/client/test-client.py:test_004()/94
 cmd: $NMCLI --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 23147 bytes
+stdout: 23374 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -6293,7 +6355,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -6302,7 +6365,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -6311,7 +6375,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -6542,6 +6607,7 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infrastruktura
+AP[1].BAND:                             2.4 GHz
 AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           48
@@ -6732,12 +6798,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5709
+size: 5879
 location: src/tests/client/test-client.py:test_004()/97
 cmd: $NMCLI --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 5557 bytes
+stdout: 5727 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -6791,7 +6857,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -6800,7 +6867,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -6809,7 +6877,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -6844,12 +6913,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5771
+size: 5941
 location: src/tests/client/test-client.py:test_004()/98
 cmd: $NMCLI --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5609 bytes
+stdout: 5779 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -6903,7 +6972,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -6912,7 +6982,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -6921,7 +6992,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -7186,76 +7258,76 @@ DEVICE  TYPE      DBUS-PATH
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
 
 <<<
-size: 2720
+size: 2816
 location: src/tests/client/test-client.py:test_004()/105
 cmd: $NMCLI --color yes -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 2565 bytes
+stdout: 2661 bytes
 >>>
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  40 MHz     55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND     FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5 GHz    5220 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  6     2.4 GHz  2437 MHz  54 Mbit/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  129   6 GHz    6595 MHz  54 Mbit/s  40 MHz     55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND     FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2.4 GHz  2412 MHz  54 Mbit/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
 
-NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
+NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  BAND  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
 <<<
-size: 2796
+size: 2892
 location: src/tests/client/test-client.py:test_004()/106
 cmd: $NMCLI --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2631 bytes
+stdout: 2727 bytes
 >>>
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND     FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5 GHz    5220 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  6     2.4 GHz  2437 MHz  54 Mb/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  129   6 GHz    6595 MHz  54 Mb/s  40 MHz     55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND     FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2.4 GHz  2412 MHz  54 Mb/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
 
-NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
+NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  BAND  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
 <<<
-size: 1074
+size: 1171
 location: src/tests/client/test-client.py:test_004()/107
 cmd: $NMCLI --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 917 bytes
+stdout: 1013 bytes
 >>>
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  2.4 GHz  1     54 Mbit/s  48      **    WPA1 WPA2 
 
-IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 <<<
-size: 1134
+size: 1231
 location: src/tests/client/test-client.py:test_004()/108
 cmd: $NMCLI --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 967 bytes
+stdout: 1063 bytes
 >>>
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  2.4 GHz  1     54 Mb/s  48      **    WPA1 WPA2 
 
-IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 <<<
 size: 2720
@@ -7266,9 +7338,9 @@ returncode: 0
 stdout: 2452 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5220 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  6     2437 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  129   6595 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -7284,9 +7356,9 @@ returncode: 0
 stdout: 2510 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5220 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  6     2437 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  129   6595 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -7294,54 +7366,54 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
 <<<
-size: 932
+size: 955
 location: src/tests/client/test-client.py:test_004()/111
 cmd: $NMCLI --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 754 bytes
+stdout: 777 bytes
 >>>
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND   FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5 GHz  5220 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 962
+size: 985
 location: src/tests/client/test-client.py:test_004()/112
 cmd: $NMCLI --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 774 bytes
+stdout: 797 bytes
 >>>
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND   FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5 GHz  5220 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 440
+size: 463
 location: src/tests/client/test-client.py:test_004()/113
 cmd: $NMCLI --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 259 bytes
+stdout: 282 bytes
 >>>
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   BAND   CHAN  RATE       SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz  44    54 Mbit/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
-size: 466
+size: 489
 location: src/tests/client/test-client.py:test_004()/114
 cmd: $NMCLI --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 275 bytes
+stdout: 298 bytes
 >>>
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            BAND   CHAN  RATE     SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz  44    54 Mb/s  92      ****  WPA1 WPA2 
 
 
 
@@ -7354,7 +7426,7 @@ returncode: 0
 stdout: 723 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5220 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
@@ -7367,17 +7439,17 @@ returncode: 0
 stdout: 741 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5220 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 5713
+size: 5883
 location: src/tests/client/test-client.py:test_004()/117
 cmd: $NMCLI --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 5557 bytes
+stdout: 5727 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -7431,7 +7503,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -7440,7 +7513,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -7449,7 +7523,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -7484,12 +7559,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5775
+size: 5945
 location: src/tests/client/test-client.py:test_004()/118
 cmd: $NMCLI --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5609 bytes
+stdout: 5779 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -7543,7 +7618,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -7552,7 +7628,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -7561,7 +7638,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -7662,12 +7740,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5677
+size: 5847
 location: src/tests/client/test-client.py:test_004()/121
 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: 5383 bytes
+stdout: 5553 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -7717,7 +7795,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -7726,7 +7805,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -7735,7 +7815,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -7770,12 +7851,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5737
+size: 5907
 location: src/tests/client/test-client.py:test_004()/122
 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: 5433 bytes
+stdout: 5603 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -7825,7 +7906,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -7834,7 +7916,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -7843,7 +7926,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -7986,12 +8070,12 @@ connection.type:                        802-11-wireless
 connection.interface-name:              --
 
 <<<
-size: 7783
+size: 7879
 location: src/tests/client/test-client.py:test_004()/127
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 7639 bytes
+stdout: 7735 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -8063,6 +8147,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -8132,6 +8217,7 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 VPN.TYPE:                               openvpn
@@ -8145,12 +8231,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 7833
+size: 7929
 location: src/tests/client/test-client.py:test_004()/128
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7679 bytes
+stdout: 7775 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -8222,6 +8308,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -8291,6 +8378,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 VPN.TYPE:                               openvpn
@@ -8304,12 +8392,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 7783
+size: 7879
 location: src/tests/client/test-client.py:test_004()/129
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 7639 bytes
+stdout: 7735 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -8381,6 +8469,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -8450,6 +8539,7 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 VPN.TYPE:                               openvpn
@@ -8463,12 +8553,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 7833
+size: 7929
 location: src/tests/client/test-client.py:test_004()/130
 cmd: $NMCLI --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7679 bytes
+stdout: 7775 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -8540,6 +8630,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -8609,6 +8700,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 VPN.TYPE:                               openvpn
@@ -8622,12 +8714,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6264
+size: 6317
 location: src/tests/client/test-client.py:test_004()/131
 cmd: $NMCLI --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 6113 bytes
+stdout: 6166 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -8699,6 +8791,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -8755,12 +8848,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6296
+size: 6349
 location: src/tests/client/test-client.py:test_004()/132
 cmd: $NMCLI --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6135 bytes
+stdout: 6188 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -8832,6 +8925,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -8926,12 +9020,12 @@ vpn.timeout:                            0
 -------------------------------------------------------------------------------
 
 <<<
-size: 1180
+size: 1223
 location: src/tests/client/test-client.py:test_004()/135
 cmd: $NMCLI --pretty -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1025 bytes
+stdout: 1068 bytes
 >>>
 ===============================================================================
        Active connection details (UUID-con-vpn-1-REPLACED-REPLACED-REP)
@@ -8948,16 +9042,17 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 1201
+size: 1244
 location: src/tests/client/test-client.py:test_004()/136
 cmd: $NMCLI --pretty -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1036 bytes
+stdout: 1079 bytes
 >>>
 ===============================================================================
     Szczegóły aktywowania połączenia (UUID-con-vpn-1-REPLACED-REPLACED-REP)
@@ -8974,6 +9069,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
@@ -9470,12 +9566,12 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
 <<<
-size: 27786
+size: 27977
 location: src/tests/client/test-client.py:test_004()/143
 cmd: $NMCLI --pretty -f all dev show
 lang: C
 returncode: 0
-stdout: 27641 bytes
+stdout: 27832 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -9536,7 +9632,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -9546,7 +9643,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -9556,7 +9654,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -9824,6 +9923,7 @@ AP[1].IN-USE:
 AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infra
+AP[1].BAND:                             2.4 GHz
 AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           48
@@ -9966,12 +10066,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 27986
+size: 28177
 location: src/tests/client/test-client.py:test_004()/144
 cmd: $NMCLI --pretty -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 27831 bytes
+stdout: 28022 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -10032,7 +10132,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -10042,7 +10143,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -10052,7 +10154,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -10320,6 +10423,7 @@ AP[1].IN-USE:
 AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infrastruktura
+AP[1].BAND:                             2.4 GHz
 AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           48
@@ -10552,12 +10656,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6635
+size: 6778
 location: src/tests/client/test-client.py:test_004()/147
 cmd: $NMCLI --pretty -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 6485 bytes
+stdout: 6628 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -10618,7 +10722,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -10628,7 +10733,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -10638,7 +10744,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -10679,12 +10786,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6704
+size: 6847
 location: src/tests/client/test-client.py:test_004()/148
 cmd: $NMCLI --pretty -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6544 bytes
+stdout: 6687 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -10745,7 +10852,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -10755,7 +10863,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -10765,7 +10874,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -11068,124 +11178,124 @@ wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
 
 <<<
-size: 3134
+size: 3218
 location: src/tests/client/test-client.py:test_004()/155
 cmd: $NMCLI --pretty -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 2982 bytes
+stdout: 3066 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  40 MHz     55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND     FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5 GHz    5220 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  6     2.4 GHz  2437 MHz  54 Mbit/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  129   6 GHz    6595 MHz  54 Mbit/s  40 MHz     55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND     FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2.4 GHz  2412 MHz  54 Mbit/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  BAND  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 <<<
-size: 3380
+size: 3464
 location: src/tests/client/test-client.py:test_004()/156
 cmd: $NMCLI --pretty -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3218 bytes
+stdout: 3302 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND     FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5 GHz    5220 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  6     2.4 GHz  2437 MHz  54 Mb/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  129   6 GHz    6595 MHz  54 Mb/s  40 MHz     55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND     FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2.4 GHz  2412 MHz  54 Mb/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  BAND  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 <<<
-size: 1317
+size: 1401
 location: src/tests/client/test-client.py:test_004()/157
 cmd: $NMCLI --pretty -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 1162 bytes
+stdout: 1246 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
--------------------------------------------------------------------------------------------------------------------
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+----------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
--------------------------------------------------------------------------------------------------------------------
-        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+----------------------------------------------------------------------------------------------------------------------------
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  2.4 GHz  1     54 Mbit/s  48      **    WPA1 WPA2 
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
-------------------------------------------------------------------------------------------
+IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
+------------------------------------------------------------------------------------------------
 
 <<<
-size: 1547
+size: 1631
 location: src/tests/client/test-client.py:test_004()/158
 cmd: $NMCLI --pretty -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1382 bytes
+stdout: 1466 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
----------------------------------------------------------------------------------------------------------------------------------------
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
----------------------------------------------------------------------------------------------------------------------------------------
-        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------------------------------------------------------
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  2.4 GHz  1     54 Mb/s  48      **    WPA1 WPA2 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
--------------------------------------------------------------------------------------------------------
+IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
+-------------------------------------------------------------------------------------------------------------
 
 <<<
 size: 3137
@@ -11200,9 +11310,9 @@ stdout: 2872 bytes
 ===========================
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5220 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  6     2437 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  129   6595 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ===========================
   Wi-Fi scan list (wlan1)
@@ -11230,9 +11340,9 @@ stdout: 3100 bytes
 ========================================
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5220 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  6     2437 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  129   6595 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
@@ -11248,70 +11358,70 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 <<<
-size: 1172
+size: 1194
 location: src/tests/client/test-client.py:test_004()/161
 cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 997 bytes
+stdout: 1018 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND   FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5 GHz  5220 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 1262
+size: 1283
 location: src/tests/client/test-client.py:test_004()/162
 cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1076 bytes
+stdout: 1097 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND   FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5 GHz  5220 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 554
+size: 575
 location: src/tests/client/test-client.py:test_004()/163
 cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 376 bytes
+stdout: 397 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
--------------------------------------------------------------------------------------------------------------------
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   BAND   CHAN  RATE       SIGNAL  BARS  SECURITY  
+--------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz  44    54 Mbit/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
-size: 639
+size: 660
 location: src/tests/client/test-client.py:test_004()/164
 cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 451 bytes
+stdout: 472 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
----------------------------------------------------------------------------------------------------------------------------------------
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            BAND   CHAN  RATE     SIGNAL  BARS  SECURITY  
+----------------------------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz  44    54 Mb/s  92      ****  WPA1 WPA2 
 
 
 
@@ -11328,7 +11438,7 @@ stdout: 964 bytes
 ===========================
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5220 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
@@ -11345,17 +11455,17 @@ stdout: 1041 bytes
 ========================================
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5220 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 6638
+size: 6781
 location: src/tests/client/test-client.py:test_004()/167
 cmd: $NMCLI --pretty -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 6485 bytes
+stdout: 6628 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -11416,7 +11526,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -11426,7 +11537,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -11436,7 +11548,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -11477,12 +11590,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6707
+size: 6850
 location: src/tests/client/test-client.py:test_004()/168
 cmd: $NMCLI --pretty -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6544 bytes
+stdout: 6687 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -11543,7 +11656,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -11553,7 +11667,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -11563,7 +11678,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -11694,12 +11810,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6522
+size: 6665
 location: src/tests/client/test-client.py:test_004()/171
 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: 6231 bytes
+stdout: 6374 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -11755,7 +11871,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -11765,7 +11882,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -11775,7 +11893,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -11816,12 +11935,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6589
+size: 6732
 location: src/tests/client/test-client.py:test_004()/172
 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: 6288 bytes
+stdout: 6431 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -11877,7 +11996,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -11887,7 +12007,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -11897,7 +12018,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -12102,12 +12224,12 @@ connection.interface-name:              --
 -------------------------------------------------------------------------------
 
 <<<
-size: 7795
+size: 7891
 location: src/tests/client/test-client.py:test_004()/177
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 7639 bytes
+stdout: 7735 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -12179,6 +12301,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -12248,6 +12371,7 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 VPN.TYPE:                               openvpn
@@ -12261,12 +12385,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 7845
+size: 7941
 location: src/tests/client/test-client.py:test_004()/178
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7679 bytes
+stdout: 7775 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -12338,6 +12462,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -12407,6 +12532,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 VPN.TYPE:                               openvpn
@@ -12420,12 +12546,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 7795
+size: 7891
 location: src/tests/client/test-client.py:test_004()/179
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 7639 bytes
+stdout: 7735 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -12497,6 +12623,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -12566,6 +12693,7 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 VPN.TYPE:                               openvpn
@@ -12579,12 +12707,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 7845
+size: 7941
 location: src/tests/client/test-client.py:test_004()/180
 cmd: $NMCLI --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7679 bytes
+stdout: 7775 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -12656,6 +12784,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -12725,6 +12854,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 VPN.TYPE:                               openvpn
@@ -12738,12 +12868,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6276
+size: 6329
 location: src/tests/client/test-client.py:test_004()/181
 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 6113 bytes
+stdout: 6166 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -12815,6 +12945,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -12871,12 +13002,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6308
+size: 6361
 location: src/tests/client/test-client.py:test_004()/182
 cmd: $NMCLI --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6135 bytes
+stdout: 6188 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -12948,6 +13079,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -13042,12 +13174,12 @@ vpn.timeout:                            0
 -------------------------------------------------------------------------------
 
 <<<
-size: 1192
+size: 1235
 location: src/tests/client/test-client.py:test_004()/185
 cmd: $NMCLI --pretty --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1025 bytes
+stdout: 1068 bytes
 >>>
 ===============================================================================
        Active connection details (UUID-con-vpn-1-REPLACED-REPLACED-REP)
@@ -13064,16 +13196,17 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 1213
+size: 1256
 location: src/tests/client/test-client.py:test_004()/186
 cmd: $NMCLI --pretty --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1036 bytes
+stdout: 1079 bytes
 >>>
 ===============================================================================
     Szczegóły aktywowania połączenia (UUID-con-vpn-1-REPLACED-REPLACED-REP)
@@ -13090,6 +13223,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
@@ -13586,12 +13720,12 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
 <<<
-size: 28122
+size: 28349
 location: src/tests/client/test-client.py:test_004()/193
 cmd: $NMCLI --pretty --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 27965 bytes
+stdout: 28192 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -13652,7 +13786,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -13662,7 +13797,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -13672,7 +13808,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -13940,6 +14077,7 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infra
+AP[1].BAND:                             2.4 GHz
 AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           48
@@ -14082,12 +14220,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 28322
+size: 28549
 location: src/tests/client/test-client.py:test_004()/194
 cmd: $NMCLI --pretty --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 28155 bytes
+stdout: 28382 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -14148,7 +14286,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -14158,7 +14297,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -14168,7 +14308,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -14436,6 +14577,7 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infrastruktura
+AP[1].BAND:                             2.4 GHz
 AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           48
@@ -14668,12 +14810,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6890
+size: 7060
 location: src/tests/client/test-client.py:test_004()/197
 cmd: $NMCLI --pretty --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 6728 bytes
+stdout: 6898 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -14734,7 +14876,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -14744,7 +14887,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -14754,7 +14898,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -14795,12 +14940,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6959
+size: 7129
 location: src/tests/client/test-client.py:test_004()/198
 cmd: $NMCLI --pretty --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6787 bytes
+stdout: 6957 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -14861,7 +15006,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -14871,7 +15017,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -14881,7 +15028,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -15184,124 +15332,124 @@ DEVICE  TYPE      DBUS-PATH
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
 
 <<<
-size: 3794
+size: 3914
 location: src/tests/client/test-client.py:test_004()/205
 cmd: $NMCLI --pretty --color yes -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 3630 bytes
+stdout: 3750 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  40 MHz     55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND     FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5 GHz    5220 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  6     2.4 GHz  2437 MHz  54 Mbit/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  129   6 GHz    6595 MHz  54 Mbit/s  40 MHz     55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND     FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2.4 GHz  2412 MHz  54 Mbit/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  BAND  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 <<<
-size: 4040
+size: 4160
 location: src/tests/client/test-client.py:test_004()/206
 cmd: $NMCLI --pretty --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3866 bytes
+stdout: 3986 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND     FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5 GHz    5220 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  6     2.4 GHz  2437 MHz  54 Mb/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  129   6 GHz    6595 MHz  54 Mb/s  40 MHz     55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND     FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2.4 GHz  2412 MHz  54 Mb/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  BAND  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 <<<
-size: 1653
+size: 1773
 location: src/tests/client/test-client.py:test_004()/207
 cmd: $NMCLI --pretty --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 1486 bytes
+stdout: 1606 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
--------------------------------------------------------------------------------------------------------------------
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+----------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
--------------------------------------------------------------------------------------------------------------------
-        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+----------------------------------------------------------------------------------------------------------------------------
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  2.4 GHz  1     54 Mbit/s  48      **    WPA1 WPA2 
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
-------------------------------------------------------------------------------------------
+IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
+------------------------------------------------------------------------------------------------
 
 <<<
-size: 1883
+size: 2003
 location: src/tests/client/test-client.py:test_004()/208
 cmd: $NMCLI --pretty --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1706 bytes
+stdout: 1826 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
----------------------------------------------------------------------------------------------------------------------------------------
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
----------------------------------------------------------------------------------------------------------------------------------------
-        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------------------------------------------------------
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  2.4 GHz  1     54 Mb/s  48      **    WPA1 WPA2 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
--------------------------------------------------------------------------------------------------------
+IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
+-------------------------------------------------------------------------------------------------------------
 
 <<<
 size: 3761
@@ -15316,9 +15464,9 @@ stdout: 3484 bytes
 ===========================
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5220 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  6     2437 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  129   6595 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ===========================
   Wi-Fi scan list (wlan1)
@@ -15346,9 +15494,9 @@ stdout: 3712 bytes
 ========================================
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5220 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  6     2437 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  129   6595 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
@@ -15364,70 +15512,70 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 <<<
-size: 1347
+size: 1377
 location: src/tests/client/test-client.py:test_004()/211
 cmd: $NMCLI --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 1159 bytes
+stdout: 1189 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND   FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5 GHz  5220 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 1436
+size: 1466
 location: src/tests/client/test-client.py:test_004()/212
 cmd: $NMCLI --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1238 bytes
+stdout: 1268 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND   FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5 GHz  5220 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 647
+size: 677
 location: src/tests/client/test-client.py:test_004()/213
 cmd: $NMCLI --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 457 bytes
+stdout: 487 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
--------------------------------------------------------------------------------------------------------------------
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   BAND   CHAN  RATE       SIGNAL  BARS  SECURITY  
+--------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz  44    54 Mbit/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
-size: 732
+size: 762
 location: src/tests/client/test-client.py:test_004()/214
 cmd: $NMCLI --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 532 bytes
+stdout: 562 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
----------------------------------------------------------------------------------------------------------------------------------------
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            BAND   CHAN  RATE     SIGNAL  BARS  SECURITY  
+----------------------------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz  44    54 Mb/s  92      ****  WPA1 WPA2 
 
 
 
@@ -15444,7 +15592,7 @@ stdout: 1117 bytes
 ===========================
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5220 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
@@ -15461,17 +15609,17 @@ stdout: 1194 bytes
 ========================================
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5220 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 6893
+size: 7063
 location: src/tests/client/test-client.py:test_004()/217
 cmd: $NMCLI --pretty --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 6728 bytes
+stdout: 6898 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -15532,7 +15680,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -15542,7 +15691,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -15552,7 +15702,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -15593,12 +15744,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6962
+size: 7132
 location: src/tests/client/test-client.py:test_004()/218
 cmd: $NMCLI --pretty --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6787 bytes
+stdout: 6957 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -15659,7 +15810,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -15669,7 +15821,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -15679,7 +15832,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -15810,12 +15964,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6777
+size: 6947
 location: src/tests/client/test-client.py:test_004()/221
 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: 6474 bytes
+stdout: 6644 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -15871,7 +16025,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -15881,7 +16036,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -15891,7 +16047,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -15932,12 +16089,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6844
+size: 7014
 location: src/tests/client/test-client.py:test_004()/222
 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: 6531 bytes
+stdout: 6701 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -15993,7 +16150,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -16003,7 +16161,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -16013,7 +16172,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -16218,12 +16378,12 @@ connection.interface-name:              --
 -------------------------------------------------------------------------------
 
 <<<
-size: 3449
+size: 3487
 location: src/tests/client/test-client.py:test_004()/227
 cmd: $NMCLI --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3306 bytes
+stdout: 3344 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -16291,6 +16451,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -16353,6 +16514,7 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 VPN.TYPE:openvpn
 VPN.USERNAME:
@@ -16364,12 +16526,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 3459
+size: 3497
 location: src/tests/client/test-client.py:test_004()/228
 cmd: $NMCLI --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3306 bytes
+stdout: 3344 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -16437,6 +16599,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -16499,6 +16662,7 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 VPN.TYPE:openvpn
 VPN.USERNAME:
@@ -16510,12 +16674,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 3449
+size: 3487
 location: src/tests/client/test-client.py:test_004()/229
 cmd: $NMCLI --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3306 bytes
+stdout: 3344 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -16583,6 +16747,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -16645,6 +16810,7 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 VPN.TYPE:openvpn
 VPN.USERNAME:
@@ -16656,12 +16822,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 3459
+size: 3497
 location: src/tests/client/test-client.py:test_004()/230
 cmd: $NMCLI --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3306 bytes
+stdout: 3344 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -16729,6 +16895,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -16791,6 +16958,7 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 VPN.TYPE:openvpn
 VPN.USERNAME:
@@ -16802,12 +16970,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2874
+size: 2887
 location: src/tests/client/test-client.py:test_004()/231
 cmd: $NMCLI --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2724 bytes
+stdout: 2737 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -16875,6 +17043,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -16927,12 +17096,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 2884
+size: 2897
 location: src/tests/client/test-client.py:test_004()/232
 cmd: $NMCLI --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2724 bytes
+stdout: 2737 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -17000,6 +17169,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -17082,12 +17252,12 @@ vpn.persistent:no
 vpn.timeout:0
 
 <<<
-size: 546
+size: 571
 location: src/tests/client/test-client.py:test_004()/235
 cmd: $NMCLI --terse -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 393 bytes
+stdout: 418 bytes
 >>>
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -17101,15 +17271,16 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 556
+size: 581
 location: src/tests/client/test-client.py:test_004()/236
 cmd: $NMCLI --terse -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 393 bytes
+stdout: 418 bytes
 >>>
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -17123,6 +17294,7 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
@@ -17474,12 +17646,12 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 13212
+size: 13287
 location: src/tests/client/test-client.py:test_004()/243
 cmd: $NMCLI --terse -f all dev show
 lang: C
 returncode: 0
-stdout: 13068 bytes
+stdout: 13143 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -17533,7 +17705,8 @@ AP[1].IN-USE:
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -17542,7 +17715,8 @@ AP[2].IN-USE:
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -17551,7 +17725,8 @@ AP[3].IN-USE:
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -17782,6 +17957,7 @@ AP[1].IN-USE:
 AP[1].BSSID:94:2B:E8:F6:D2:86
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infra
+AP[1].BAND:2.4 GHz
 AP[1].CHAN:1
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:48
@@ -17906,12 +18082,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 13258
+size: 13333
 location: src/tests/client/test-client.py:test_004()/244
 cmd: $NMCLI --terse -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 13104 bytes
+stdout: 13179 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -17965,7 +18141,8 @@ AP[1].IN-USE:
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -17974,7 +18151,8 @@ AP[2].IN-USE:
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -17983,7 +18161,8 @@ AP[3].IN-USE:
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -18214,6 +18393,7 @@ AP[1].IN-USE:
 AP[1].BSSID:94:2B:E8:F6:D2:86
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infrastruktura
+AP[1].BAND:2.4 GHz
 AP[1].CHAN:1
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:48
@@ -18404,12 +18584,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 3046
+size: 3102
 location: src/tests/client/test-client.py:test_004()/247
 cmd: $NMCLI --terse -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2897 bytes
+stdout: 2953 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18463,7 +18643,8 @@ AP[1].IN-USE:
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -18472,7 +18653,8 @@ AP[2].IN-USE:
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -18481,7 +18663,8 @@ AP[3].IN-USE:
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -18516,12 +18699,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 3083
+size: 3139
 location: src/tests/client/test-client.py:test_004()/248
 cmd: $NMCLI --terse -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2924 bytes
+stdout: 2980 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -18575,7 +18758,8 @@ AP[1].IN-USE:
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -18584,7 +18768,8 @@ AP[2].IN-USE:
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -18593,7 +18778,8 @@ AP[3].IN-USE:
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -18856,174 +19042,174 @@ wlan1:wifi:/org/freedesktop/NetworkManager/Devices/4
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
-size: 1112
+size: 1143
 location: src/tests/client/test-client.py:test_004()/255
 cmd: $NMCLI --terse -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 962 bytes
+stdout: 993 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:40 MHz:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:40 MHz:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:44:5 GHz:5220 MHz:54 Mbit/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:6:2.4 GHz:2437 MHz:54 Mbit/s:40 MHz:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:129:6 GHz:6595 MHz:54 Mbit/s:40 MHz:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:40 MHz:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2.4 GHz:2412 MHz:54 Mbit/s:40 MHz:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 1179
+size: 1210
 location: src/tests/client/test-client.py:test_004()/256
 cmd: $NMCLI --terse -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1018 bytes
+stdout: 1049 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:40 MHz:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:40 MHz:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:44:5 GHz:5220 MHz:54 Mb/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:6:2.4 GHz:2437 MHz:54 Mb/s:40 MHz:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:129:6 GHz:6595 MHz:54 Mb/s:40 MHz:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:40 MHz:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2.4 GHz:2412 MHz:54 Mb/s:40 MHz:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 433
+size: 464
 location: src/tests/client/test-client.py:test_004()/257
 cmd: $NMCLI --terse -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 280 bytes
+stdout: 311 bytes
 >>>
- :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
- :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
- :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:5 GHz:44:54 Mbit/s:92:****:WPA1 WPA2
+ :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:2.4 GHz:6:54 Mbit/s:81:****:WPA1
+ :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:6 GHz:129:54 Mbit/s:55:**  :WPA3
 
- :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
+ :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infra:2.4 GHz:1:54 Mbit/s:48:**  :WPA1 WPA2
 
 
 <<<
-size: 479
+size: 510
 location: src/tests/client/test-client.py:test_004()/258
 cmd: $NMCLI --terse -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 316 bytes
+stdout: 347 bytes
 >>>
- :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
- :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
- :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:5 GHz:44:54 Mb/s:92:****:WPA1 WPA2
+ :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:2.4 GHz:6:54 Mb/s:81:****:WPA1
+ :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:6 GHz:129:54 Mb/s:55:**  :WPA3
 
- :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
+ :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infrastruktura:2.4 GHz:1:54 Mb/s:48:**  :WPA1 WPA2
 
 
 <<<
-size: 1197
+size: 1200
 location: src/tests/client/test-client.py:test_004()/259
 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 934 bytes
+stdout: 937 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:44:5220 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:6:2437 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:129:6595 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 1255
+size: 1258
 location: src/tests/client/test-client.py:test_004()/260
 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 982 bytes
+stdout: 985 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:44:5220 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:6:2437 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:129:6595 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 438
+size: 445
 location: src/tests/client/test-client.py:test_004()/261
 cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 264 bytes
+stdout: 271 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:44:5 GHz:5220 MHz:54 Mbit/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 
 <<<
-size: 462
+size: 469
 location: src/tests/client/test-client.py:test_004()/262
 cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 278 bytes
+stdout: 285 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:44:5 GHz:5220 MHz:54 Mb/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 
 <<<
-size: 250
+size: 257
 location: src/tests/client/test-client.py:test_004()/263
 cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 74 bytes
+stdout: 81 bytes
 >>>
- :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:5 GHz:44:54 Mbit/s:92:****:WPA1 WPA2
 
 
 
 <<<
-size: 269
+size: 276
 location: src/tests/client/test-client.py:test_004()/264
 cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 83 bytes
+stdout: 90 bytes
 >>>
- :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:5 GHz:44:54 Mb/s:92:****:WPA1 WPA2
 
 
 
 <<<
-size: 544
+size: 545
 location: src/tests/client/test-client.py:test_004()/265
 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 257 bytes
+stdout: 258 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:44:5220 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 
 <<<
-size: 566
+size: 567
 location: src/tests/client/test-client.py:test_004()/266
 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 269 bytes
+stdout: 270 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:44:5220 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 
 <<<
-size: 3049
+size: 3105
 location: src/tests/client/test-client.py:test_004()/267
 cmd: $NMCLI --terse -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2897 bytes
+stdout: 2953 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -19077,7 +19263,8 @@ AP[1].IN-USE:
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -19086,7 +19273,8 @@ AP[2].IN-USE:
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -19095,7 +19283,8 @@ AP[3].IN-USE:
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -19130,12 +19319,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 3086
+size: 3142
 location: src/tests/client/test-client.py:test_004()/268
 cmd: $NMCLI --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2924 bytes
+stdout: 2980 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -19189,7 +19378,8 @@ AP[1].IN-USE:
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -19198,7 +19388,8 @@ AP[2].IN-USE:
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -19207,7 +19398,8 @@ AP[3].IN-USE:
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -19308,12 +19500,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 3081
+size: 3137
 location: src/tests/client/test-client.py:test_004()/271
 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: 2791 bytes
+stdout: 2847 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -19363,7 +19555,8 @@ AP[1].IN-USE:
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -19372,7 +19565,8 @@ AP[2].IN-USE:
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -19381,7 +19575,8 @@ AP[3].IN-USE:
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -19416,12 +19611,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 3118
+size: 3174
 location: src/tests/client/test-client.py:test_004()/272
 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: 2818 bytes
+stdout: 2874 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -19471,7 +19666,8 @@ AP[1].IN-USE:
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -19480,7 +19676,8 @@ AP[2].IN-USE:
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -19489,7 +19686,8 @@ AP[3].IN-USE:
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -19632,12 +19830,12 @@ connection.type:802-11-wireless
 connection.interface-name:
 
 <<<
-size: 3461
+size: 3499
 location: src/tests/client/test-client.py:test_004()/277
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3306 bytes
+stdout: 3344 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -19705,6 +19903,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -19767,6 +19966,7 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 VPN.TYPE:openvpn
 VPN.USERNAME:
@@ -19778,12 +19978,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 3471
+size: 3509
 location: src/tests/client/test-client.py:test_004()/278
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3306 bytes
+stdout: 3344 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -19851,6 +20051,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -19913,6 +20114,7 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 VPN.TYPE:openvpn
 VPN.USERNAME:
@@ -19924,12 +20126,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 3461
+size: 3499
 location: src/tests/client/test-client.py:test_004()/279
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3306 bytes
+stdout: 3344 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -19997,6 +20199,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -20059,6 +20262,7 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 VPN.TYPE:openvpn
 VPN.USERNAME:
@@ -20070,12 +20274,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 3471
+size: 3509
 location: src/tests/client/test-client.py:test_004()/280
 cmd: $NMCLI --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3306 bytes
+stdout: 3344 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -20143,6 +20347,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -20205,6 +20410,7 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 VPN.TYPE:openvpn
 VPN.USERNAME:
@@ -20216,12 +20422,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2886
+size: 2899
 location: src/tests/client/test-client.py:test_004()/281
 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2724 bytes
+stdout: 2737 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -20289,6 +20495,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -20341,12 +20548,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 2896
+size: 2909
 location: src/tests/client/test-client.py:test_004()/282
 cmd: $NMCLI --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2724 bytes
+stdout: 2737 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -20414,6 +20621,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -20496,12 +20704,12 @@ vpn.persistent:no
 vpn.timeout:0
 
 <<<
-size: 558
+size: 583
 location: src/tests/client/test-client.py:test_004()/285
 cmd: $NMCLI --terse --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 393 bytes
+stdout: 418 bytes
 >>>
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -20515,15 +20723,16 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 568
+size: 593
 location: src/tests/client/test-client.py:test_004()/286
 cmd: $NMCLI --terse --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 393 bytes
+stdout: 418 bytes
 >>>
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -20537,6 +20746,7 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
@@ -20888,12 +21098,12 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 13548
+size: 13659
 location: src/tests/client/test-client.py:test_004()/293
 cmd: $NMCLI --terse --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 13392 bytes
+stdout: 13503 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -20947,7 +21157,8 @@ AP[1].IN-USE: 
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -20956,7 +21167,8 @@ AP[2].IN-USE: 
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -20965,7 +21177,8 @@ AP[3].IN-USE: 
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -21196,6 +21409,7 @@ AP[1].IN-USE: 
 AP[1].BSSID:94:2B:E8:F6:D2:86
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infra
+AP[1].BAND:2.4 GHz
 AP[1].CHAN:1
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:48
@@ -21320,12 +21534,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 13594
+size: 13705
 location: src/tests/client/test-client.py:test_004()/294
 cmd: $NMCLI --terse --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 13428 bytes
+stdout: 13539 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -21379,7 +21593,8 @@ AP[1].IN-USE: 
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -21388,7 +21603,8 @@ AP[2].IN-USE: 
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -21397,7 +21613,8 @@ AP[3].IN-USE: 
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -21628,6 +21845,7 @@ AP[1].IN-USE: 
 AP[1].BSSID:94:2B:E8:F6:D2:86
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infrastruktura
+AP[1].BAND:2.4 GHz
 AP[1].CHAN:1
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:48
@@ -21818,12 +22036,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 3301
+size: 3384
 location: src/tests/client/test-client.py:test_004()/297
 cmd: $NMCLI --terse --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 3140 bytes
+stdout: 3223 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -21877,7 +22095,8 @@ AP[1].IN-USE: 
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -21886,7 +22105,8 @@ AP[2].IN-USE: 
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -21895,7 +22115,8 @@ AP[3].IN-USE: 
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -21930,12 +22151,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 3338
+size: 3421
 location: src/tests/client/test-client.py:test_004()/298
 cmd: $NMCLI --terse --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3167 bytes
+stdout: 3250 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -21989,7 +22210,8 @@ AP[1].IN-USE: 
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -21998,7 +22220,8 @@ AP[2].IN-USE: 
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -22007,7 +22230,8 @@ AP[3].IN-USE: 
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -22270,174 +22494,174 @@ stdout: 406 bytes
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
-size: 1773
+size: 1840
 location: src/tests/client/test-client.py:test_004()/305
 cmd: $NMCLI --terse --color yes -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 1610 bytes
+stdout: 1677 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:40 MHz:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:40 MHz:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:44:5 GHz:5220 MHz:54 Mbit/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:6:2.4 GHz:2437 MHz:54 Mbit/s:40 MHz:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:129:6 GHz:6595 MHz:54 Mbit/s:40 MHz:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:40 MHz:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2.4 GHz:2412 MHz:54 Mbit/s:40 MHz:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 1839
+size: 1906
 location: src/tests/client/test-client.py:test_004()/306
 cmd: $NMCLI --terse --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1666 bytes
+stdout: 1733 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:40 MHz:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:40 MHz:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:44:5 GHz:5220 MHz:54 Mb/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:6:2.4 GHz:2437 MHz:54 Mb/s:40 MHz:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:129:6 GHz:6595 MHz:54 Mb/s:40 MHz:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:40 MHz:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2.4 GHz:2412 MHz:54 Mb/s:40 MHz:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 769
+size: 836
 location: src/tests/client/test-client.py:test_004()/307
 cmd: $NMCLI --terse --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 604 bytes
+stdout: 671 bytes
 >>>
- :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
- :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
- :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:5 GHz:44:54 Mbit/s:92:****:WPA1 WPA2
+ :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:2.4 GHz:6:54 Mbit/s:81:****:WPA1
+ :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:6 GHz:129:54 Mbit/s:55:**  :WPA3
 
- :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
+ :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infra:2.4 GHz:1:54 Mbit/s:48:**  :WPA1 WPA2
 
 
 <<<
-size: 815
+size: 882
 location: src/tests/client/test-client.py:test_004()/308
 cmd: $NMCLI --terse --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 640 bytes
+stdout: 707 bytes
 >>>
- :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
- :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
- :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:5 GHz:44:54 Mb/s:92:****:WPA1 WPA2
+ :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:2.4 GHz:6:54 Mb/s:81:****:WPA1
+ :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:6 GHz:129:54 Mb/s:55:**  :WPA3
 
- :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
+ :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infrastruktura:2.4 GHz:1:54 Mb/s:48:**  :WPA1 WPA2
 
 
 <<<
-size: 1822
+size: 1825
 location: src/tests/client/test-client.py:test_004()/309
 cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 1546 bytes
+stdout: 1549 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:44:5220 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:6:2437 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:129:6595 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 1880
+size: 1883
 location: src/tests/client/test-client.py:test_004()/310
 cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1594 bytes
+stdout: 1597 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:44:5220 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:6:2437 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:129:6595 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 612
+size: 628
 location: src/tests/client/test-client.py:test_004()/311
 cmd: $NMCLI --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 426 bytes
+stdout: 442 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:44:5 GHz:5220 MHz:54 Mbit/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 
 <<<
-size: 636
+size: 652
 location: src/tests/client/test-client.py:test_004()/312
 cmd: $NMCLI --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 440 bytes
+stdout: 456 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:44:5 GHz:5220 MHz:54 Mb/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 
 <<<
-size: 344
+size: 360
 location: src/tests/client/test-client.py:test_004()/313
 cmd: $NMCLI --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 155 bytes
+stdout: 171 bytes
 >>>
- :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:5 GHz:44:54 Mbit/s:92:****:WPA1 WPA2
 
 
 
 <<<
-size: 363
+size: 379
 location: src/tests/client/test-client.py:test_004()/314
 cmd: $NMCLI --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 164 bytes
+stdout: 180 bytes
 >>>
- :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:5 GHz:44:54 Mb/s:92:****:WPA1 WPA2
 
 
 
 <<<
-size: 709
+size: 710
 location: src/tests/client/test-client.py:test_004()/315
 cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 410 bytes
+stdout: 411 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:44:5220 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 
 <<<
-size: 731
+size: 732
 location: src/tests/client/test-client.py:test_004()/316
 cmd: $NMCLI --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 422 bytes
+stdout: 423 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:44:5220 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 
 <<<
-size: 3304
+size: 3387
 location: src/tests/client/test-client.py:test_004()/317
 cmd: $NMCLI --terse --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 3140 bytes
+stdout: 3223 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -22491,7 +22715,8 @@ AP[1].IN-USE: 
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -22500,7 +22725,8 @@ AP[2].IN-USE: 
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -22509,7 +22735,8 @@ AP[3].IN-USE: 
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -22544,12 +22771,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 3341
+size: 3424
 location: src/tests/client/test-client.py:test_004()/318
 cmd: $NMCLI --terse --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3167 bytes
+stdout: 3250 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -22603,7 +22830,8 @@ AP[1].IN-USE: 
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -22612,7 +22840,8 @@ AP[2].IN-USE: 
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -22621,7 +22850,8 @@ AP[3].IN-USE: 
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -22722,12 +22952,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 3336
+size: 3419
 location: src/tests/client/test-client.py:test_004()/321
 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: 3034 bytes
+stdout: 3117 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -22777,7 +23007,8 @@ AP[1].IN-USE: 
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -22786,7 +23017,8 @@ AP[2].IN-USE: 
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -22795,7 +23027,8 @@ AP[3].IN-USE: 
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -22830,12 +23063,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 3373
+size: 3456
 location: src/tests/client/test-client.py:test_004()/322
 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: 3061 bytes
+stdout: 3144 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -22885,7 +23118,8 @@ AP[1].IN-USE: 
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -22894,7 +23128,8 @@ AP[2].IN-USE: 
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -22903,7 +23138,8 @@ AP[3].IN-USE: 
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -23046,18 +23282,18 @@ connection.type:802-11-wireless
 connection.interface-name:
 
 <<<
-size: 4574
+size: 4636
 location: src/tests/client/test-client.py:test_004()/327
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4424 bytes
+stdout: 4486 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  permissions  zone  controller  master  slave-type  port-type  autoconnect-slaves  autoconnect-ports  down-on-poweroff  secondaries  gateway-ping-timeout  ip-ping-timeout  ip-ping-addresses  ip-ping-addresses-require-all  metered  lldp     mdns          llmnr         dns-over-tls  dnssec        mptcp-flags    wait-device-timeout  wait-activation-delay 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   unknown  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu   dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               no             yes       -1 (default)      -1 (default)  0 (default)          0 (default)              default        0 (default)  auto  --            --         --         0 (default)   yes                            -1 (default)        --             0x0 (none)           -1 (default)       --    
@@ -23068,25 +23304,25 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
 
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE          CFG                                     
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4613
+size: 4675
 location: src/tests/client/test-client.py:test_004()/328
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4453 bytes
+stdout: 4515 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  permissions  zone  controller  master  slave-type  port-type  autoconnect-slaves  autoconnect-ports  down-on-poweroff  secondaries  gateway-ping-timeout  ip-ping-timeout  ip-ping-addresses  ip-ping-addresses-require-all  metered   lldp     mdns          llmnr         dns-over-tls  dnssec        mptcp-flags    wait-device-timeout  wait-activation-delay 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   nieznane  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu           dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              nie            tak       -1 (default)      -1 (default)  0 (default)          0 (default)              default        0 (default)  automatyczne  --            --         --         0 (default)   tak                            -1 (default)        --             0x0 (none)           -1 (default)       --    
@@ -23097,25 +23333,25 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
 
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4574
+size: 4636
 location: src/tests/client/test-client.py:test_004()/329
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4424 bytes
+stdout: 4486 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  permissions  zone  controller  master  slave-type  port-type  autoconnect-slaves  autoconnect-ports  down-on-poweroff  secondaries  gateway-ping-timeout  ip-ping-timeout  ip-ping-addresses  ip-ping-addresses-require-all  metered  lldp     mdns          llmnr         dns-over-tls  dnssec        mptcp-flags    wait-device-timeout  wait-activation-delay 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   unknown  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu   dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               no             yes       -1 (default)      -1 (default)  0 (default)          0 (default)              default        0 (default)  auto  --            --         --         0 (default)   yes                            -1 (default)        --             0x0 (none)           -1 (default)       --    
@@ -23126,25 +23362,25 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
 
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE          CFG                                     
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4613
+size: 4675
 location: src/tests/client/test-client.py:test_004()/330
 cmd: $NMCLI --mode tabular con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4453 bytes
+stdout: 4515 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  permissions  zone  controller  master  slave-type  port-type  autoconnect-slaves  autoconnect-ports  down-on-poweroff  secondaries  gateway-ping-timeout  ip-ping-timeout  ip-ping-addresses  ip-ping-addresses-require-all  metered   lldp     mdns          llmnr         dns-over-tls  dnssec        mptcp-flags    wait-device-timeout  wait-activation-delay 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   nieznane  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu           dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              nie            tak       -1 (default)      -1 (default)  0 (default)          0 (default)              default        0 (default)  automatyczne  --            --         --         0 (default)   tak                            -1 (default)        --             0x0 (none)           -1 (default)       --    
@@ -23155,25 +23391,25 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
 
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3822
+size: 3850
 location: src/tests/client/test-client.py:test_004()/331
 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3665 bytes
+stdout: 3693 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  permissions  zone  controller  master  slave-type  port-type  autoconnect-slaves  autoconnect-ports  down-on-poweroff  secondaries  gateway-ping-timeout  ip-ping-timeout  ip-ping-addresses  ip-ping-addresses-require-all  metered  lldp     mdns          llmnr         dns-over-tls  dnssec        mptcp-flags    wait-device-timeout  wait-activation-delay 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   unknown  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu   dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               no             yes       -1 (default)      -1 (default)  0 (default)          0 (default)              default        0 (default)  auto  --            --         --         0 (default)   yes                            -1 (default)        --             0x0 (none)           -1 (default)       --    
@@ -23186,18 +23422,18 @@ proxy  none    no            --       --
 
 
 <<<
-size: 3850
+size: 3878
 location: src/tests/client/test-client.py:test_004()/332
 cmd: $NMCLI --mode tabular -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3683 bytes
+stdout: 3711 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  permissions  zone  controller  master  slave-type  port-type  autoconnect-slaves  autoconnect-ports  down-on-poweroff  secondaries  gateway-ping-timeout  ip-ping-timeout  ip-ping-addresses  ip-ping-addresses-require-all  metered   lldp     mdns          llmnr         dns-over-tls  dnssec        mptcp-flags    wait-device-timeout  wait-activation-delay 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   nieznane  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu           dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              nie            tak       -1 (default)      -1 (default)  0 (default)          0 (default)              default        0 (default)  automatyczne  --            --         --         0 (default)   tak                            -1 (default)        --             0x0 (none)           -1 (default)       --    
@@ -23232,26 +23468,26 @@ name  service-type                            user-name  data
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
 
 <<<
-size: 662
+size: 696
 location: src/tests/client/test-client.py:test_004()/335
 cmd: $NMCLI --mode tabular -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 502 bytes
+stdout: 536 bytes
 >>>
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 <<<
-size: 674
+size: 708
 location: src/tests/client/test-client.py:test_004()/336
 cmd: $NMCLI --mode tabular -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 504 bytes
+stdout: 538 bytes
 >>>
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 <<<
 size: 403
@@ -23612,12 +23848,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: 16331
+size: 16391
 location: src/tests/client/test-client.py:test_004()/343
 cmd: $NMCLI --mode tabular -f all dev show
 lang: C
 returncode: 0
-stdout: 16180 bytes
+stdout: 16240 bytes
 >>>
 NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
 GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    100 (connected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --    wlan0     no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
@@ -23631,10 +23867,10 @@ INTERFACE-FLAGS  yes  yes       no       no
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ     MESH  IBSS-RSN 
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  --        192.168.120.79 
@@ -23717,8 +23953,8 @@ INTERFACE-FLAGS  yes  yes       no       no
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ     MESH  IBSS-RSN 
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  2.4 GHz  1     54 Mbit/s  48      **    WPA1 WPA2 
 
 GROUP  ADDRESS  GATEWAY         ROUTE                                                                                                                                                  DNS            DOMAIN                                                                                             SEARCHES  WINS 
 IP4    --       192.168.57.160  dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69  192.168.61.83  sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar  --        --   
@@ -23747,7 +23983,7 @@ INTERFACE-FLAGS  yes  yes       no       no
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ     MESH  IBSS-RSN 
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME  IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+NAME  IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 GROUP  ADDRESS                                GATEWAY  ROUTE                                                           DNS              DOMAIN                                                                            SEARCHES  WINS                          
 IP4    192.168.97.124/29 | 192.168.76.154/18  --       dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551  192.168.107.109  sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar  --        192.168.60.60 | 192.168.63.92 
@@ -23765,12 +24001,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 16481
+size: 16541
 location: src/tests/client/test-client.py:test_004()/344
 cmd: $NMCLI --mode tabular -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 16320 bytes
+stdout: 16380 bytes
 >>>
 NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
 GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    100 (połączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --    wlan0     nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
@@ -23784,10 +24020,10 @@ INTERFACE-FLAGS  tak  tak       nie      nie
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GHZ      MESH  IBSS-RSN 
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  --        192.168.120.79 
@@ -23870,8 +24106,8 @@ INTERFACE-FLAGS  tak  tak       nie      nie
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GHZ      MESH  IBSS-RSN 
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  2.4 GHz  1     54 Mb/s  48      **    WPA1 WPA2 
 
 GROUP  ADDRESS  GATEWAY         ROUTE                                                                                                                                                  DNS            DOMAIN                                                                                             SEARCHES  WINS 
 IP4    --       192.168.57.160  dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69  192.168.61.83  sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar  --        --   
@@ -23900,7 +24136,7 @@ INTERFACE-FLAGS  tak  tak       nie      nie
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GHZ      MESH  IBSS-RSN 
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME  IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+NAME  IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 GROUP  ADDRESS                                GATEWAY  ROUTE                                                           DNS              DOMAIN                                                                            SEARCHES  WINS                          
 IP4    192.168.97.124/29 | 192.168.76.154/18  --       dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551  192.168.107.109  sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar  --        192.168.60.60 | 192.168.63.92 
@@ -23988,12 +24224,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: 3373
+size: 3409
 location: src/tests/client/test-client.py:test_004()/347
 cmd: $NMCLI --mode tabular -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 3217 bytes
+stdout: 3253 bytes
 >>>
 NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
 GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    100 (connected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --    wlan0     no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
@@ -24007,10 +24243,10 @@ INTERFACE-FLAGS  yes  yes       no       no
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ     MESH  IBSS-RSN 
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  --        192.168.120.79 
@@ -24028,12 +24264,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3439
+size: 3475
 location: src/tests/client/test-client.py:test_004()/348
 cmd: $NMCLI --mode tabular -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3273 bytes
+stdout: 3309 bytes
 >>>
 NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
 GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    100 (połączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --    wlan0     nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
@@ -24047,10 +24283,10 @@ INTERFACE-FLAGS  tak  tak       nie      nie
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GHZ      MESH  IBSS-RSN 
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  --        192.168.120.79 
@@ -24166,76 +24402,76 @@ wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
 
 <<<
-size: 2075
+size: 2135
 location: src/tests/client/test-client.py:test_004()/355
 cmd: $NMCLI --mode tabular -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 1917 bytes
+stdout: 1977 bytes
 >>>
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  40 MHz     55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND     FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5 GHz    5220 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  6     2.4 GHz  2437 MHz  54 Mbit/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  129   6 GHz    6595 MHz  54 Mbit/s  40 MHz     55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND     FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2.4 GHz  2412 MHz  54 Mbit/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
 
-NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
+NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  BAND  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
 <<<
-size: 2151
+size: 2211
 location: src/tests/client/test-client.py:test_004()/356
 cmd: $NMCLI --mode tabular -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1983 bytes
+stdout: 2043 bytes
 >>>
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND     FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5 GHz    5220 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  6     2.4 GHz  2437 MHz  54 Mb/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  129   6 GHz    6595 MHz  54 Mb/s  40 MHz     55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND     FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2.4 GHz  2412 MHz  54 Mb/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
 
-NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
+NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  BAND  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
 <<<
-size: 753
+size: 813
 location: src/tests/client/test-client.py:test_004()/357
 cmd: $NMCLI --mode tabular -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 593 bytes
+stdout: 653 bytes
 >>>
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  2.4 GHz  1     54 Mbit/s  48      **    WPA1 WPA2 
 
-IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 <<<
-size: 813
+size: 873
 location: src/tests/client/test-client.py:test_004()/358
 cmd: $NMCLI --mode tabular -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 643 bytes
+stdout: 703 bytes
 >>>
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  2.4 GHz  1     54 Mb/s  48      **    WPA1 WPA2 
 
-IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 <<<
 size: 2111
@@ -24246,9 +24482,9 @@ returncode: 0
 stdout: 1840 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5220 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  6     2437 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  129   6595 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -24264,9 +24500,9 @@ returncode: 0
 stdout: 1898 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5220 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  6     2437 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  129   6595 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -24274,54 +24510,54 @@ AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
 <<<
-size: 773
+size: 787
 location: src/tests/client/test-client.py:test_004()/361
 cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 592 bytes
+stdout: 606 bytes
 >>>
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND   FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5 GHz  5220 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 803
+size: 817
 location: src/tests/client/test-client.py:test_004()/362
 cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 612 bytes
+stdout: 626 bytes
 >>>
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND   FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5 GHz  5220 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 362
+size: 376
 location: src/tests/client/test-client.py:test_004()/363
 cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 178 bytes
+stdout: 192 bytes
 >>>
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   BAND   CHAN  RATE       SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz  44    54 Mbit/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
-size: 388
+size: 402
 location: src/tests/client/test-client.py:test_004()/364
 cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 194 bytes
+stdout: 208 bytes
 >>>
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            BAND   CHAN  RATE     SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz  44    54 Mb/s  92      ****  WPA1 WPA2 
 
 
 
@@ -24334,7 +24570,7 @@ returncode: 0
 stdout: 570 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5220 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
@@ -24347,17 +24583,17 @@ returncode: 0
 stdout: 588 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5220 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 3376
+size: 3412
 location: src/tests/client/test-client.py:test_004()/367
 cmd: $NMCLI --mode tabular -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 3217 bytes
+stdout: 3253 bytes
 >>>
 NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
 GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    100 (connected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --    wlan0     no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
@@ -24371,10 +24607,10 @@ INTERFACE-FLAGS  yes  yes       no       no
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ     MESH  IBSS-RSN 
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  --        192.168.120.79 
@@ -24392,12 +24628,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3442
+size: 3478
 location: src/tests/client/test-client.py:test_004()/368
 cmd: $NMCLI --mode tabular -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3273 bytes
+stdout: 3309 bytes
 >>>
 NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
 GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    100 (połączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --    wlan0     nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
@@ -24411,10 +24647,10 @@ INTERFACE-FLAGS  tak  tak       nie      nie
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GHZ      MESH  IBSS-RSN 
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  --        192.168.120.79 
@@ -24502,12 +24738,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: 3413
+size: 3449
 location: src/tests/client/test-client.py:test_004()/371
 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: 3116 bytes
+stdout: 3152 bytes
 >>>
 NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
 GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    100 (connected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --    wlan0     no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
@@ -24518,10 +24754,10 @@ CAPABILITIES  no              21 Mb/s  no           no
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ     MESH  IBSS-RSN 
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  --        192.168.120.79 
@@ -24539,12 +24775,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3479
+size: 3515
 location: src/tests/client/test-client.py:test_004()/372
 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: 3172 bytes
+stdout: 3208 bytes
 >>>
 NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
 GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    100 (połączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --    wlan0     nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
@@ -24555,10 +24791,10 @@ CAPABILITIES  nie             21 Mb/s  nie          nie
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GHZ      MESH  IBSS-RSN 
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  --        192.168.120.79 
@@ -24700,18 +24936,18 @@ interface-name
 
 
 <<<
-size: 4586
+size: 4648
 location: src/tests/client/test-client.py:test_004()/377
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4424 bytes
+stdout: 4486 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  permissions  zone  controller  master  slave-type  port-type  autoconnect-slaves  autoconnect-ports  down-on-poweroff  secondaries  gateway-ping-timeout  ip-ping-timeout  ip-ping-addresses  ip-ping-addresses-require-all  metered  lldp     mdns          llmnr         dns-over-tls  dnssec        mptcp-flags    wait-device-timeout  wait-activation-delay 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   unknown  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu   dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               no             yes       -1 (default)      -1 (default)  0 (default)          0 (default)              default        0 (default)  auto  --            --         --         0 (default)   yes                            -1 (default)        --             0x0 (none)           -1 (default)       --    
@@ -24722,25 +24958,25 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
 
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE          CFG                                     
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4625
+size: 4687
 location: src/tests/client/test-client.py:test_004()/378
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4453 bytes
+stdout: 4515 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  permissions  zone  controller  master  slave-type  port-type  autoconnect-slaves  autoconnect-ports  down-on-poweroff  secondaries  gateway-ping-timeout  ip-ping-timeout  ip-ping-addresses  ip-ping-addresses-require-all  metered   lldp     mdns          llmnr         dns-over-tls  dnssec        mptcp-flags    wait-device-timeout  wait-activation-delay 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   nieznane  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu           dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              nie            tak       -1 (default)      -1 (default)  0 (default)          0 (default)              default        0 (default)  automatyczne  --            --         --         0 (default)   tak                            -1 (default)        --             0x0 (none)           -1 (default)       --    
@@ -24751,25 +24987,25 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
 
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4586
+size: 4648
 location: src/tests/client/test-client.py:test_004()/379
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 4424 bytes
+stdout: 4486 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  permissions  zone  controller  master  slave-type  port-type  autoconnect-slaves  autoconnect-ports  down-on-poweroff  secondaries  gateway-ping-timeout  ip-ping-timeout  ip-ping-addresses  ip-ping-addresses-require-all  metered  lldp     mdns          llmnr         dns-over-tls  dnssec        mptcp-flags    wait-device-timeout  wait-activation-delay 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   unknown  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu   dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               no             yes       -1 (default)      -1 (default)  0 (default)          0 (default)              default        0 (default)  auto  --            --         --         0 (default)   yes                            -1 (default)        --             0x0 (none)           -1 (default)       --    
@@ -24780,25 +25016,25 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 name   method  browser-only  pac-url  pac-script 
 proxy  none    no            --       --         
 
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE          CFG                                     
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 4625
+size: 4687
 location: src/tests/client/test-client.py:test_004()/380
 cmd: $NMCLI --mode tabular --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4453 bytes
+stdout: 4515 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  permissions  zone  controller  master  slave-type  port-type  autoconnect-slaves  autoconnect-ports  down-on-poweroff  secondaries  gateway-ping-timeout  ip-ping-timeout  ip-ping-addresses  ip-ping-addresses-require-all  metered   lldp     mdns          llmnr         dns-over-tls  dnssec        mptcp-flags    wait-device-timeout  wait-activation-delay 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   nieznane  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu           dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              nie            tak       -1 (default)      -1 (default)  0 (default)          0 (default)              default        0 (default)  automatyczne  --            --         --         0 (default)   tak                            -1 (default)        --             0x0 (none)           -1 (default)       --    
@@ -24809,25 +25045,25 @@ vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val
 name   method  browser-only  pac-url  pac-script 
 proxy  none    nie           --       --         
 
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 3834
+size: 3862
 location: src/tests/client/test-client.py:test_004()/381
 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3665 bytes
+stdout: 3693 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  permissions  zone  controller  master  slave-type  port-type  autoconnect-slaves  autoconnect-ports  down-on-poweroff  secondaries  gateway-ping-timeout  ip-ping-timeout  ip-ping-addresses  ip-ping-addresses-require-all  metered  lldp     mdns          llmnr         dns-over-tls  dnssec        mptcp-flags    wait-device-timeout  wait-activation-delay 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   unknown  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu   dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               no             yes       -1 (default)      -1 (default)  0 (default)          0 (default)              default        0 (default)  auto  --            --         --         0 (default)   yes                            -1 (default)        --             0x0 (none)           -1 (default)       --    
@@ -24840,18 +25076,18 @@ proxy  none    no            --       --
 
 
 <<<
-size: 3862
+size: 3890
 location: src/tests/client/test-client.py:test_004()/382
 cmd: $NMCLI --mode tabular --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3683 bytes
+stdout: 3711 bytes
 >>>
 name        id         uuid                                  stable-id  type  interface-name  autoconnect  autoconnect-priority  autoconnect-retries  multi-connect  auth-retries  timestamp  permissions  zone  controller  master  slave-type  port-type  autoconnect-slaves  autoconnect-ports  down-on-poweroff  secondaries  gateway-ping-timeout  ip-ping-timeout  ip-ping-addresses  ip-ping-addresses-require-all  metered   lldp     mdns          llmnr         dns-over-tls  dnssec        mptcp-flags    wait-device-timeout  wait-activation-delay 
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   nieznane  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu           dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ipv6  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              nie            tak       -1 (default)      -1 (default)  0 (default)          0 (default)              default        0 (default)  automatyczne  --            --         --         0 (default)   tak                            -1 (default)        --             0x0 (none)           -1 (default)       --    
@@ -24886,26 +25122,26 @@ name  service-type                            user-name  data
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
 
 <<<
-size: 674
+size: 708
 location: src/tests/client/test-client.py:test_004()/385
 cmd: $NMCLI --mode tabular --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 502 bytes
+stdout: 536 bytes
 >>>
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 <<<
-size: 686
+size: 720
 location: src/tests/client/test-client.py:test_004()/386
 cmd: $NMCLI --mode tabular --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 504 bytes
+stdout: 538 bytes
 >>>
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 <<<
 size: 595
@@ -25266,12 +25502,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: 16703
+size: 16799
 location: src/tests/client/test-client.py:test_004()/393
 cmd: $NMCLI --mode tabular --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 16540 bytes
+stdout: 16636 bytes
 >>>
 NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
 GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    100 (connected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --    wlan0     no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
@@ -25285,10 +25521,10 @@ INTERFACE-FLAGS  yes  yes       no       no
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ     MESH  IBSS-RSN 
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  --        192.168.120.79 
@@ -25371,8 +25607,8 @@ INTERFACE-FLAGS  yes  yes       no       no
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ     MESH  IBSS-RSN 
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  2.4 GHz  1     54 Mbit/s  48      **    WPA1 WPA2 
 
 GROUP  ADDRESS  GATEWAY         ROUTE                                                                                                                                                  DNS            DOMAIN                                                                                             SEARCHES  WINS 
 IP4    --       192.168.57.160  dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69  192.168.61.83  sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar  --        --   
@@ -25401,7 +25637,7 @@ INTERFACE-FLAGS  yes  yes       no       no
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ     MESH  IBSS-RSN 
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME  IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+NAME  IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 GROUP  ADDRESS                                GATEWAY  ROUTE                                                           DNS              DOMAIN                                                                            SEARCHES  WINS                          
 IP4    192.168.97.124/29 | 192.168.76.154/18  --       dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551  192.168.107.109  sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar  --        192.168.60.60 | 192.168.63.92 
@@ -25419,12 +25655,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 16853
+size: 16949
 location: src/tests/client/test-client.py:test_004()/394
 cmd: $NMCLI --mode tabular --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 16680 bytes
+stdout: 16776 bytes
 >>>
 NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
 GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    100 (połączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --    wlan0     nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
@@ -25438,10 +25674,10 @@ INTERFACE-FLAGS  tak  tak       nie      nie
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GHZ      MESH  IBSS-RSN 
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  --        192.168.120.79 
@@ -25524,8 +25760,8 @@ INTERFACE-FLAGS  tak  tak       nie      nie
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GHZ      MESH  IBSS-RSN 
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  2.4 GHz  1     54 Mb/s  48      **    WPA1 WPA2 
 
 GROUP  ADDRESS  GATEWAY         ROUTE                                                                                                                                                  DNS            DOMAIN                                                                                             SEARCHES  WINS 
 IP4    --       192.168.57.160  dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69  192.168.61.83  sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar  --        --   
@@ -25554,7 +25790,7 @@ INTERFACE-FLAGS  tak  tak       nie      nie
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GHZ      MESH  IBSS-RSN 
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME  IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+NAME  IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 GROUP  ADDRESS                                GATEWAY  ROUTE                                                           DNS              DOMAIN                                                                            SEARCHES  WINS                          
 IP4    192.168.97.124/29 | 192.168.76.154/18  --       dst = 192.168.33.233/22, nh = 192.168.222.210, mt = 2810496551  192.168.107.109  sear4.fo.o.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo3.bar | sear4.foo4.bar  --        192.168.60.60 | 192.168.63.92 
@@ -25642,12 +25878,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: 3655
+size: 3718
 location: src/tests/client/test-client.py:test_004()/397
 cmd: $NMCLI --mode tabular --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 3487 bytes
+stdout: 3550 bytes
 >>>
 NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
 GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    100 (connected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --    wlan0     no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
@@ -25661,10 +25897,10 @@ INTERFACE-FLAGS  yes  yes       no       no
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ     MESH  IBSS-RSN 
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  --        192.168.120.79 
@@ -25682,12 +25918,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3721
+size: 3784
 location: src/tests/client/test-client.py:test_004()/398
 cmd: $NMCLI --mode tabular --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3543 bytes
+stdout: 3606 bytes
 >>>
 NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
 GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    100 (połączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --    wlan0     nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
@@ -25701,10 +25937,10 @@ INTERFACE-FLAGS  tak  tak       nie      nie
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GHZ      MESH  IBSS-RSN 
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  --        192.168.120.79 
@@ -25820,76 +26056,76 @@ DEVICE  TYPE      DBUS-PATH
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
 
 <<<
-size: 2735
+size: 2831
 location: src/tests/client/test-client.py:test_004()/405
 cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 2565 bytes
+stdout: 2661 bytes
 >>>
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  40 MHz     55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND     FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5 GHz    5220 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  6     2.4 GHz  2437 MHz  54 Mbit/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  129   6 GHz    6595 MHz  54 Mbit/s  40 MHz     55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND     FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2.4 GHz  2412 MHz  54 Mbit/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
 
-NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
+NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  BAND  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
 <<<
-size: 2811
+size: 2907
 location: src/tests/client/test-client.py:test_004()/406
 cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2631 bytes
+stdout: 2727 bytes
 >>>
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND     FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5 GHz    5220 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  6     2.4 GHz  2437 MHz  54 Mb/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  129   6 GHz    6595 MHz  54 Mb/s  40 MHz     55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND     FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2.4 GHz  2412 MHz  54 Mb/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
 
-NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
+NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  BAND  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
 <<<
-size: 1089
+size: 1186
 location: src/tests/client/test-client.py:test_004()/407
 cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 917 bytes
+stdout: 1013 bytes
 >>>
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  2.4 GHz  1     54 Mbit/s  48      **    WPA1 WPA2 
 
-IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 <<<
-size: 1149
+size: 1246
 location: src/tests/client/test-client.py:test_004()/408
 cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 967 bytes
+stdout: 1063 bytes
 >>>
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  2.4 GHz  1     54 Mb/s  48      **    WPA1 WPA2 
 
-IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
+IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
 
 <<<
 size: 2735
@@ -25900,9 +26136,9 @@ returncode: 0
 stdout: 2452 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5220 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  6     2437 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  129   6595 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -25918,9 +26154,9 @@ returncode: 0
 stdout: 2510 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5220 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  6     2437 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  129   6595 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
@@ -25928,54 +26164,54 @@ NAME   SSID        SSID-HEX              BSSID              MODE            CHAN
 NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
 
 <<<
-size: 947
+size: 970
 location: src/tests/client/test-client.py:test_004()/411
 cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 754 bytes
+stdout: 777 bytes
 >>>
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND   FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5 GHz  5220 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 977
+size: 1000
 location: src/tests/client/test-client.py:test_004()/412
 cmd: $NMCLI --mode tabular --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 774 bytes
+stdout: 797 bytes
 >>>
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND   FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5 GHz  5220 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 455
+size: 478
 location: src/tests/client/test-client.py:test_004()/413
 cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 259 bytes
+stdout: 282 bytes
 >>>
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   BAND   CHAN  RATE       SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz  44    54 Mbit/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
-size: 481
+size: 504
 location: src/tests/client/test-client.py:test_004()/414
 cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 275 bytes
+stdout: 298 bytes
 >>>
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            BAND   CHAN  RATE     SIGNAL  BARS  SECURITY  
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz  44    54 Mb/s  92      ****  WPA1 WPA2 
 
 
 
@@ -25988,7 +26224,7 @@ returncode: 0
 stdout: 723 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5220 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
@@ -26001,17 +26237,17 @@ returncode: 0
 stdout: 741 bytes
 >>>
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5220 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 3658
+size: 3721
 location: src/tests/client/test-client.py:test_004()/417
 cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 3487 bytes
+stdout: 3550 bytes
 >>>
 NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
 GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    100 (connected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --    wlan0     no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
@@ -26025,10 +26261,10 @@ INTERFACE-FLAGS  yes  yes       no       no
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ     MESH  IBSS-RSN 
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  --        192.168.120.79 
@@ -26046,12 +26282,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3724
+size: 3787
 location: src/tests/client/test-client.py:test_004()/418
 cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3543 bytes
+stdout: 3606 bytes
 >>>
 NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
 GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    100 (połączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --    wlan0     nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
@@ -26065,10 +26301,10 @@ INTERFACE-FLAGS  tak  tak       nie      nie
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GHZ      MESH  IBSS-RSN 
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  --        192.168.120.79 
@@ -26156,12 +26392,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: 3695
+size: 3758
 location: src/tests/client/test-client.py:test_004()/421
 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: 3386 bytes
+stdout: 3449 bytes
 >>>
 NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON               IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED 
 GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    100 (connected)  0 (No reason given)  0 (unknown)       0 (unknown)       /sys/devices/virtual/wlan0  --    wlan0     no           yes         yes          no                no                 --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  unknown 
@@ -26172,10 +26408,10 @@ CAPABILITIES  no              21 Mb/s  no           no
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ     MESH  IBSS-RSN 
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  --        192.168.120.79 
@@ -26193,12 +26429,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 3761
+size: 3824
 location: src/tests/client/test-client.py:test_004()/422
 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: 3442 bytes
+stdout: 3505 bytes
 >>>
 NAME     DEVICE  TYPE  NM-TYPE       DBUS-PATH                                  VENDOR  PRODUCT  DRIVER   DRIVER-VERSION  FIRMWARE-VERSION  HWADDR             MTU  STATE            REASON                    IP4-CONNECTIVITY  IP6-CONNECTIVITY  UDI                         PATH  IP-IFACE  IS-SOFTWARE  NM-MANAGED  AUTOCONNECT  FIRMWARE-MISSING  NM-PLUGIN-MISSING  PHYS-PORT-ID  CONNECTION  CON-UUID                              CON-PATH                                            METERED  
 GENERAL  wlan0   wifi  NMDeviceWifi  /org/freedesktop/NetworkManager/Devices/3  --      --       virtual  --              --                13:E0:74:85:7C:D9  0    100 (połączono)  0 (Nie podano przyczyny)  0 (nieznane)      0 (nieznane)      /sys/devices/virtual/wlan0  --    wlan0     nie          tak         tak          nie               nie                --            con-vpn-1   UUID-con-vpn-1-REPLACED-REPLACED-REP  /org/freedesktop/NetworkManager/ActiveConnection/2  nieznane 
@@ -26209,10 +26445,10 @@ CAPABILITIES  nie             21 Mb/s  nie          nie
 NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GHZ      MESH  IBSS-RSN 
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 IP4    192.168.228.18/32 | 192.168.209.179/25  192.168.41.120  --     --   sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar  --        192.168.120.79 
@@ -26354,12 +26590,12 @@ interface-name
 
 
 <<<
-size: 7131
+size: 7224
 location: src/tests/client/test-client.py:test_004()/427
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 6972 bytes
+stdout: 7065 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
@@ -26368,9 +26604,9 @@ name        id         uuid                                  stable-id  type  in
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   unknown  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu   dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26387,21 +26623,21 @@ proxy  none    no            --       --
 ====================================================================
   Active connection details (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ====================================================================
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE          CFG                                     
 --------------------------------------------------------------------------------------------------------------------------------
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 7217
+size: 7310
 location: src/tests/client/test-client.py:test_004()/428
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7048 bytes
+stdout: 7141 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -26410,9 +26646,9 @@ name        id         uuid                                  stable-id  type  in
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   nieznane  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu           dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26429,21 +26665,21 @@ proxy  none    nie           --       --
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ===========================================================================
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 ----------------------------------------------------------------------------------------------------------------------------------
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 7131
+size: 7224
 location: src/tests/client/test-client.py:test_004()/429
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 6972 bytes
+stdout: 7065 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
@@ -26452,9 +26688,9 @@ name        id         uuid                                  stable-id  type  in
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   unknown  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu   dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26471,21 +26707,21 @@ proxy  none    no            --       --
 ====================================================================
   Active connection details (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ====================================================================
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE          CFG                                     
 --------------------------------------------------------------------------------------------------------------------------------
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 7217
+size: 7310
 location: src/tests/client/test-client.py:test_004()/430
 cmd: $NMCLI --mode tabular --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7048 bytes
+stdout: 7141 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -26494,9 +26730,9 @@ name        id         uuid                                  stable-id  type  in
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   nieznane  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu           dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26513,21 +26749,21 @@ proxy  none    nie           --       --
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ===========================================================================
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 ----------------------------------------------------------------------------------------------------------------------------------
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 5793
+size: 5835
 location: src/tests/client/test-client.py:test_004()/431
 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5627 bytes
+stdout: 5669 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
@@ -26536,9 +26772,9 @@ name        id         uuid                                  stable-id  type  in
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   unknown  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu   dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26554,12 +26790,12 @@ proxy  none    no            --       --
 
 
 <<<
-size: 5840
+size: 5882
 location: src/tests/client/test-client.py:test_004()/432
 cmd: $NMCLI --mode tabular --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5664 bytes
+stdout: 5706 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -26568,9 +26804,9 @@ name        id         uuid                                  stable-id  type  in
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   nieznane  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu           dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -26616,34 +26852,34 @@ name  service-type                            user-name  data
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
 
 <<<
-size: 1128
+size: 1180
 location: src/tests/client/test-client.py:test_004()/435
 cmd: $NMCLI --mode tabular --pretty -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 959 bytes
+stdout: 1010 bytes
 >>>
 ====================================================================
   Active connection details (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ====================================================================
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 <<<
-size: 1166
+size: 1218
 location: src/tests/client/test-client.py:test_004()/436
 cmd: $NMCLI --mode tabular --pretty -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 987 bytes
+stdout: 1038 bytes
 >>>
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ===========================================================================
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 <<<
 size: 542
@@ -27144,12 +27380,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: 24783
+size: 24867
 location: src/tests/client/test-client.py:test_004()/443
 cmd: $NMCLI --mode tabular --pretty -f all dev show
 lang: C
 returncode: 0
-stdout: 24623 bytes
+stdout: 24707 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -27170,11 +27406,11 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ
 ----------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------------------
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+--------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -27293,9 +27529,9 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ
 ----------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------------------
-AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+--------------------------------------------------------------------------------------------------------
+AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  2.4 GHz  1     54 Mbit/s  48      **    WPA1 WPA2 
 
 GROUP  ADDRESS  GATEWAY         ROUTE                                                                                                                                                  DNS            DOMAIN                                                                                             SEARCHES  WINS 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -27336,8 +27572,8 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ
 ----------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME  IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
----------------------------------------------------------------------
+NAME  IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
+---------------------------------------------------------------------------
 
 GROUP  ADDRESS                                GATEWAY  ROUTE                                                           DNS              DOMAIN                                                                            SEARCHES  WINS                          
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -27360,12 +27596,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 25127
+size: 25211
 location: src/tests/client/test-client.py:test_004()/444
 cmd: $NMCLI --mode tabular --pretty -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 24957 bytes
+stdout: 25041 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -27386,11 +27622,11 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GH
 -------------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------------
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -27509,9 +27745,9 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GH
 -------------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------------
-AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------
+AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  2.4 GHz  1     54 Mb/s  48      **    WPA1 WPA2 
 
 GROUP  ADDRESS  GATEWAY         ROUTE                                                                                                                                                  DNS            DOMAIN                                                                                             SEARCHES  WINS 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -27552,8 +27788,8 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GH
 -------------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME  IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
----------------------------------------------------------------------
+NAME  IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
+---------------------------------------------------------------------------
 
 GROUP  ADDRESS                                GATEWAY  ROUTE                                                           DNS              DOMAIN                                                                            SEARCHES  WINS                          
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -27670,12 +27906,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: 4980
+size: 5025
 location: src/tests/client/test-client.py:test_004()/447
 cmd: $NMCLI --mode tabular --pretty -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 4815 bytes
+stdout: 4860 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -27696,11 +27932,11 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ
 ----------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------------------
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+--------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -27723,12 +27959,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 5091
+size: 5136
 location: src/tests/client/test-client.py:test_004()/448
 cmd: $NMCLI --mode tabular --pretty -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4916 bytes
+stdout: 4961 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -27749,11 +27985,11 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GH
 -------------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------------
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -27906,124 +28142,124 @@ wlan1   wifi      /org/freedesktop/NetworkManager/Devices/4
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
 
 <<<
-size: 3149
+size: 3233
 location: src/tests/client/test-client.py:test_004()/455
 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 2982 bytes
+stdout: 3066 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  40 MHz     55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND     FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5 GHz    5220 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  6     2.4 GHz  2437 MHz  54 Mbit/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  129   6 GHz    6595 MHz  54 Mbit/s  40 MHz     55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND     FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2.4 GHz  2412 MHz  54 Mbit/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  BAND  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 <<<
-size: 3395
+size: 3479
 location: src/tests/client/test-client.py:test_004()/456
 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3218 bytes
+stdout: 3302 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND     FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5 GHz    5220 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  6     2.4 GHz  2437 MHz  54 Mb/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  129   6 GHz    6595 MHz  54 Mb/s  40 MHz     55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND     FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2.4 GHz  2412 MHz  54 Mb/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  BAND  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 <<<
-size: 1332
+size: 1416
 location: src/tests/client/test-client.py:test_004()/457
 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 1162 bytes
+stdout: 1246 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
--------------------------------------------------------------------------------------------------------------------
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+----------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
--------------------------------------------------------------------------------------------------------------------
-        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+----------------------------------------------------------------------------------------------------------------------------
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  2.4 GHz  1     54 Mbit/s  48      **    WPA1 WPA2 
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
-------------------------------------------------------------------------------------------
+IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
+------------------------------------------------------------------------------------------------
 
 <<<
-size: 1562
+size: 1646
 location: src/tests/client/test-client.py:test_004()/458
 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1382 bytes
+stdout: 1466 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
----------------------------------------------------------------------------------------------------------------------------------------
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
----------------------------------------------------------------------------------------------------------------------------------------
-        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------------------------------------------------------
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  2.4 GHz  1     54 Mb/s  48      **    WPA1 WPA2 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
--------------------------------------------------------------------------------------------------------
+IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
+-------------------------------------------------------------------------------------------------------------
 
 <<<
 size: 3152
@@ -28038,9 +28274,9 @@ stdout: 2872 bytes
 ===========================
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5220 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  6     2437 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  129   6595 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ===========================
   Wi-Fi scan list (wlan1)
@@ -28068,9 +28304,9 @@ stdout: 3100 bytes
 ========================================
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5220 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  6     2437 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  129   6595 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
@@ -28086,70 +28322,70 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 <<<
-size: 1187
+size: 1209
 location: src/tests/client/test-client.py:test_004()/461
 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 997 bytes
+stdout: 1018 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND   FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5 GHz  5220 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 1277
+size: 1298
 location: src/tests/client/test-client.py:test_004()/462
 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1076 bytes
+stdout: 1097 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND   FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5 GHz  5220 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 569
+size: 590
 location: src/tests/client/test-client.py:test_004()/463
 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 376 bytes
+stdout: 397 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
--------------------------------------------------------------------------------------------------------------------
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   BAND   CHAN  RATE       SIGNAL  BARS  SECURITY  
+--------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz  44    54 Mbit/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
-size: 654
+size: 675
 location: src/tests/client/test-client.py:test_004()/464
 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 451 bytes
+stdout: 472 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
----------------------------------------------------------------------------------------------------------------------------------------
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            BAND   CHAN  RATE     SIGNAL  BARS  SECURITY  
+----------------------------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz  44    54 Mb/s  92      ****  WPA1 WPA2 
 
 
 
@@ -28166,7 +28402,7 @@ stdout: 964 bytes
 ===========================
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5220 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
@@ -28183,17 +28419,17 @@ stdout: 1041 bytes
 ========================================
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5220 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 4983
+size: 5028
 location: src/tests/client/test-client.py:test_004()/467
 cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 4815 bytes
+stdout: 4860 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -28214,11 +28450,11 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ
 ----------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------------------
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+--------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -28241,12 +28477,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 5094
+size: 5139
 location: src/tests/client/test-client.py:test_004()/468
 cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4916 bytes
+stdout: 4961 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -28267,11 +28503,11 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GH
 -------------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------------
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -28388,12 +28624,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: 4969
+size: 5014
 location: src/tests/client/test-client.py:test_004()/471
 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: 4663 bytes
+stdout: 4708 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -28410,11 +28646,11 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ
 ----------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------------------
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+--------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -28437,12 +28673,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 5080
+size: 5125
 location: src/tests/client/test-client.py:test_004()/472
 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: 4764 bytes
+stdout: 4809 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -28459,11 +28695,11 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GH
 -------------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------------
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -28662,12 +28898,12 @@ interface-name
 
 
 <<<
-size: 7143
+size: 7236
 location: src/tests/client/test-client.py:test_004()/477
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 6972 bytes
+stdout: 7065 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
@@ -28676,9 +28912,9 @@ name        id         uuid                                  stable-id  type  in
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   unknown  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu   dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -28695,21 +28931,21 @@ proxy  none    no            --       --
 ====================================================================
   Active connection details (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ====================================================================
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE          CFG                                     
 --------------------------------------------------------------------------------------------------------------------------------
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 7229
+size: 7322
 location: src/tests/client/test-client.py:test_004()/478
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7048 bytes
+stdout: 7141 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -28718,9 +28954,9 @@ name        id         uuid                                  stable-id  type  in
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   nieznane  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu           dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -28737,21 +28973,21 @@ proxy  none    nie           --       --
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ===========================================================================
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 ----------------------------------------------------------------------------------------------------------------------------------
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 7143
+size: 7236
 location: src/tests/client/test-client.py:test_004()/479
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 6972 bytes
+stdout: 7065 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
@@ -28760,9 +28996,9 @@ name        id         uuid                                  stable-id  type  in
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   unknown  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu   dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -28779,21 +29015,21 @@ proxy  none    no            --       --
 ====================================================================
   Active connection details (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ====================================================================
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE          CFG                                     
 --------------------------------------------------------------------------------------------------------------------------------
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 - VPN connected  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 7229
+size: 7322
 location: src/tests/client/test-client.py:test_004()/480
 cmd: $NMCLI --mode tabular --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7048 bytes
+stdout: 7141 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -28802,9 +29038,9 @@ name        id         uuid                                  stable-id  type  in
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   nieznane  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu           dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -28821,21 +29057,21 @@ proxy  none    nie           --       --
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ===========================================================================
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 NAME  TYPE     USERNAME  GATEWAY  BANNER                            VPN-STATE            CFG                                     
 ----------------------------------------------------------------------------------------------------------------------------------
 VPN   openvpn  --        --       *** VPN connection con-vpn-1 ***  5 — Połączono z VPN  key1 = val1 | key2 = val2 | key3 = val3 
 
 <<<
-size: 5805
+size: 5847
 location: src/tests/client/test-client.py:test_004()/481
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5627 bytes
+stdout: 5669 bytes
 >>>
 ==========================================
   Connection profile details (con-vpn-1)
@@ -28844,9 +29080,9 @@ name        id         uuid                                  stable-id  type  in
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              yes          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   unknown  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  no                  no               --              --         --         0 (default)   yes                            -1 (default)        -1 (default)  --             --         0x0 (none)           no             yes       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu   dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -28862,12 +29098,12 @@ proxy  none    no            --       --
 
 
 <<<
-size: 5852
+size: 5894
 location: src/tests/client/test-client.py:test_004()/482
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5664 bytes
+stdout: 5706 bytes
 >>>
 ============================================
   Szczegóły profilu połączenia (con-vpn-1)
@@ -28876,9 +29112,9 @@ name        id         uuid                                  stable-id  type  in
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 connection  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  --         vpn   --              tak          0                     -1 (default)         0 (default)    -1            0          --           --    --          --      --          --         -1 (default)        -1 (default)       -1 (default)      --           0                     0                --                 -1 (default)                   nieznane  default  -1 (default)  -1 (default)  -1 (default)  -1 (default)  0x0 (default)  -1                   -1                    
 
-name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              0 (default)  --                   -1 (default)       --                 0 (default)            
+name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  dhcp-client-id  dhcp-iaid  dhcp-dscp  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  forwarding    dhcp-hostname  dhcp-fqdn  dhcp-hostname-flags  never-default  may-fail  required-timeout  dad-timeout   dhcp-vendor-class-identifier  dhcp-ipv6-only-preferred  clat          link-local   dhcp-reject-servers  auto-route-ext-gw  shared-dhcp-range  shared-dhcp-lease-time 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ipv4  auto    --   --          --           0             --         --       --      -1            0 (unspec)   --             -1 (default)        -1 (default)       -1 (default)  nie                 nie              --              --         --         0 (default)   tak                            -1 (default)        -1 (default)  --             --         0x0 (none)           nie            tak       -1 (default)      -1 (default)  --                            -1 (default)              -1 (default)  0 (default)  --                   -1 (default)       --                 0 (default)            
 
 name  method  dns  dns-search  dns-options  dns-priority  addresses  gateway  routes  route-metric  route-table  routing-rules  replace-local-rule  dhcp-send-release  routed-dns    ignore-auto-routes  ignore-auto-dns  never-default  may-fail  required-timeout  ip6-privacy   temp-valid-lifetime  temp-preferred-lifetime  addr-gen-mode  ra-timeout   mtu           dhcp-pd-hint  dhcp-duid  dhcp-iaid  dhcp-timeout  dhcp-send-hostname-deprecated  dhcp-send-hostname  dhcp-hostname  dhcp-hostname-flags  auto-route-ext-gw  token 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -28924,34 +29160,34 @@ name  service-type                            user-name  data
 vpn   org.freedesktop.NetworkManager.openvpn  --         key1 = val1, key2 = val2, key3 = val3  <hidden>  nie         0       
 
 <<<
-size: 1140
+size: 1192
 location: src/tests/client/test-client.py:test_004()/485
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 959 bytes
+stdout: 1010 bytes
 >>>
 ====================================================================
   Active connection details (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ====================================================================
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE      DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     activated  no       no        --           yes  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 <<<
-size: 1178
+size: 1230
 location: src/tests/client/test-client.py:test_004()/486
 cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 987 bytes
+stdout: 1038 bytes
 >>>
 ===========================================================================
   Szczegóły aktywowania połączenia (UUID-con-vpn-1-REPLACED-REPLACED-REP)
 ===========================================================================
-GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  MASTER-PATH 
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --          
+GROUP    NAME       UUID                                  DEVICES  IP-IFACE  STATE       DEFAULT  DEFAULT6  SPEC-OBJECT  VPN  DBUS-PATH                                           CON-PATH                                               ZONE  CONTROLLER-PATH  MASTER-PATH 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+GENERAL  con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  wlan0    wlan0     aktywowano  nie      nie       --           tak  /org/freedesktop/NetworkManager/ActiveConnection/2  /org/freedesktop/NetworkManager/Settings/Connection/3  --    --               --          
 
 <<<
 size: 734
@@ -29452,12 +29688,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: 25155
+size: 25275
 location: src/tests/client/test-client.py:test_004()/493
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 24983 bytes
+stdout: 25103 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -29478,11 +29714,11 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ
 ----------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------------------
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+--------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -29601,9 +29837,9 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ
 ----------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------------------
-AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+--------------------------------------------------------------------------------------------------------
+AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  2.4 GHz  1     54 Mbit/s  48      **    WPA1 WPA2 
 
 GROUP  ADDRESS  GATEWAY         ROUTE                                                                                                                                                  DNS            DOMAIN                                                                                             SEARCHES  WINS 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -29644,8 +29880,8 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ
 ----------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME  IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
----------------------------------------------------------------------
+NAME  IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
+---------------------------------------------------------------------------
 
 GROUP  ADDRESS                                GATEWAY  ROUTE                                                           DNS              DOMAIN                                                                            SEARCHES  WINS                          
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -29668,12 +29904,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 25499
+size: 25619
 location: src/tests/client/test-client.py:test_004()/494
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 25317 bytes
+stdout: 25437 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -29694,11 +29930,11 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GH
 -------------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------------
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -29817,9 +30053,9 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GH
 -------------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------------
-AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------
+AP[1]          94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  2.4 GHz  1     54 Mb/s  48      **    WPA1 WPA2 
 
 GROUP  ADDRESS  GATEWAY         ROUTE                                                                                                                                                  DNS            DOMAIN                                                                                             SEARCHES  WINS 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -29860,8 +30096,8 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GH
 -------------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME  IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
----------------------------------------------------------------------
+NAME  IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
+---------------------------------------------------------------------------
 
 GROUP  ADDRESS                                GATEWAY  ROUTE                                                           DNS              DOMAIN                                                                            SEARCHES  WINS                          
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -29978,12 +30214,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: 5262
+size: 5334
 location: src/tests/client/test-client.py:test_004()/497
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 5085 bytes
+stdout: 5157 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -30004,11 +30240,11 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ
 ----------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------------------
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+--------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -30031,12 +30267,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 5373
+size: 5445
 location: src/tests/client/test-client.py:test_004()/498
 cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5186 bytes
+stdout: 5258 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -30057,11 +30293,11 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GH
 -------------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------------
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -30214,124 +30450,124 @@ DEVICE  TYPE      DBUS-PATH
 wlan1   wifi      /org/freedesktop/NetworkManager/Devices/5 
 
 <<<
-size: 3809
+size: 3929
 location: src/tests/client/test-client.py:test_004()/505
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 3630 bytes
+stdout: 3750 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  40 MHz     55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND     FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5 GHz    5220 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  6     2.4 GHz  2437 MHz  54 Mbit/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  129   6 GHz    6595 MHz  54 Mbit/s  40 MHz     55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2412 MHz  54 Mbit/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND     FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infra  1     2.4 GHz  2412 MHz  54 Mbit/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  BAND  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 <<<
-size: 4055
+size: 4175
 location: src/tests/client/test-client.py:test_004()/506
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3866 bytes
+stdout: 3986 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND     FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5 GHz    5220 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  6     2.4 GHz  2437 MHz  54 Mb/s  40 MHz     81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  129   6 GHz    6595 MHz  54 Mb/s  40 MHz     55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND     FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan1-ap-4  776C616E312D61702D34  94:2B:E8:F6:D2:86  Infrastruktura  1     2.4 GHz  2412 MHz  54 Mb/s  40 MHz     48      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  BAND  FREQ  RATE  BANDWIDTH  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 <<<
-size: 1668
+size: 1788
 location: src/tests/client/test-client.py:test_004()/507
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 1486 bytes
+stdout: 1606 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
--------------------------------------------------------------------------------------------------------------------
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+----------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
--------------------------------------------------------------------------------------------------------------------
-        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  1     54 Mbit/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+----------------------------------------------------------------------------------------------------------------------------
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infra  2.4 GHz  1     54 Mbit/s  48      **    WPA1 WPA2 
 
 ===========================
   Wi-Fi scan list (wlan1)
 ===========================
-IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
-------------------------------------------------------------------------------------------
+IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
+------------------------------------------------------------------------------------------------
 
 <<<
-size: 1898
+size: 2018
 location: src/tests/client/test-client.py:test_004()/508
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1706 bytes
+stdout: 1826 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
----------------------------------------------------------------------------------------------------------------------------------------
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+        61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+        9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
----------------------------------------------------------------------------------------------------------------------------------------
-        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  1     54 Mb/s  48      **    WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+------------------------------------------------------------------------------------------------------------------------------------------------
+        94:2B:E8:F6:D2:86  wlan1-ap-4  Infrastruktura  2.4 GHz  1     54 Mb/s  48      **    WPA1 WPA2 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
 ========================================
-IN-USE  BSSID  SSID  MODE  CHAN  RATE  SIGNAL  BARS  SECURITY 
--------------------------------------------------------------------------------------------------------
+IN-USE  BSSID  SSID  MODE  BAND  CHAN  RATE  SIGNAL  BARS  SECURITY 
+-------------------------------------------------------------------------------------------------------------
 
 <<<
 size: 3776
@@ -30346,9 +30582,9 @@ stdout: 3484 bytes
 ===========================
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  1     2412 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  1     2412 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5220 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infra  6     2437 MHz  54 Mbit/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (none)                                         wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infra  129   6595 MHz  54 Mbit/s  55      **    WPA3       (none)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ===========================
   Wi-Fi scan list (wlan1)
@@ -30376,9 +30612,9 @@ stdout: 3712 bytes
 ========================================
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
-AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  1     2412 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
-AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  1     2412 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5220 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[2]  wlan0-ap-1  776C616E302D61702D31  61:95:77:AC:1E:4C  Infrastruktura  6     2437 MHz  54 Mb/s  81      ****  WPA1       pair_tkip pair_ccmp group_tkip group_ccmp psk  (brak)                                         wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+AP[3]  wlan0-ap-3  776C616E302D61702D33  9B:F6:B7:EC:97:76  Infrastruktura  129   6595 MHz  54 Mb/s  55      **    WPA3       (brak)                                         pair_tkip pair_ccmp group_tkip group_ccmp sae  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
 
 ========================================
   Lista skanowania sieci Wi-Fi (wlan1)
@@ -30394,70 +30630,70 @@ NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 <<<
-size: 1362
+size: 1392
 location: src/tests/client/test-client.py:test_004()/511
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 1159 bytes
+stdout: 1189 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  BAND   FREQ      RATE       BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5 GHz  5220 MHz  54 Mbit/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 1451
+size: 1481
 location: src/tests/client/test-client.py:test_004()/512
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1238 bytes
+stdout: 1268 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  BAND   FREQ      RATE     BANDWIDTH  SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5 GHz  5220 MHz  54 Mb/s  40 MHz     92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 662
+size: 692
 location: src/tests/client/test-client.py:test_004()/513
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 457 bytes
+stdout: 487 bytes
 >>>
 ===========================
   Wi-Fi scan list (wlan0)
 ===========================
-IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
--------------------------------------------------------------------------------------------------------------------
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE   BAND   CHAN  RATE       SIGNAL  BARS  SECURITY  
+--------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz  44    54 Mbit/s  92      ****  WPA1 WPA2 
 
 
 
 <<<
-size: 747
+size: 777
 location: src/tests/client/test-client.py:test_004()/514
 cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 532 bytes
+stdout: 562 bytes
 >>>
 ========================================
   Lista skanowania sieci Wi-Fi (wlan0)
 ========================================
-IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
----------------------------------------------------------------------------------------------------------------------------------------
-        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
+IN-USE  BSSID              SSID        MODE            BAND   CHAN  RATE     SIGNAL  BARS  SECURITY  
+----------------------------------------------------------------------------------------------------------------------------------------------
+        C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz  44    54 Mb/s  92      ****  WPA1 WPA2 
 
 
 
@@ -30474,7 +30710,7 @@ stdout: 1117 bytes
 ===========================
 NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  1     2412 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infra  44    5220 MHz  54 Mbit/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
@@ -30491,17 +30727,17 @@ stdout: 1194 bytes
 ========================================
 NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  1     2412 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[1]  wlan0-ap-2  776C616E302D61702D32  C0:E2:BE:E8:EF:B6  Infrastruktura  44    5220 MHz  54 Mb/s  92      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
 
 
 
 <<<
-size: 5265
+size: 5337
 location: src/tests/client/test-client.py:test_004()/517
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 5085 bytes
+stdout: 5157 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -30522,11 +30758,11 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ
 ----------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------------------
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+--------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -30549,12 +30785,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 5376
+size: 5448
 location: src/tests/client/test-client.py:test_004()/518
 cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5186 bytes
+stdout: 5258 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -30575,11 +30811,11 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GH
 -------------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------------
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -30696,12 +30932,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: 5251
+size: 5323
 location: src/tests/client/test-client.py:test_004()/521
 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: 4933 bytes
+stdout: 5005 bytes
 >>>
 ==========================
   Device details (wlan0)
@@ -30718,11 +30954,11 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ     5GHZ     6GHZ
 ----------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  yes  yes  yes   yes   yes   yes  yes    unknown  unknown  unknown  no    no       
 
-NAME   IN-USE  BSSID              SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
------------------------------------------------------------------------------------------------
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  1     54 Mbit/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  1     54 Mbit/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  1     54 Mbit/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE   BAND     CHAN  RATE       SIGNAL  BARS  SECURITY  
+--------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infra  5 GHz    44    54 Mbit/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infra  2.4 GHz  6     54 Mbit/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infra  6 GHz    129   54 Mbit/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -30745,12 +30981,12 @@ NAME         AVAILABLE-CONNECTION-PATHS                               AVAILABLE-
 CONNECTIONS  /org/freedesktop/NetworkManager/Settings/Connection/{2}  UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 
 
 <<<
-size: 5362
+size: 5434
 location: src/tests/client/test-client.py:test_004()/522
 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: 5034 bytes
+stdout: 5106 bytes
 >>>
 ===================================
   Informacje o urządzeniu (wlan0)
@@ -30767,11 +31003,11 @@ NAME             WEP  WPA  WPA2  TKIP  CCMP  AP   ADHOC  2GHZ      5GHZ      6GH
 -------------------------------------------------------------------------------------------------------
 WIFI-PROPERTIES  tak  tak  tak   tak   tak   tak  tak    nieznane  nieznane  nieznane  nie   nie      
 
-NAME   IN-USE  BSSID              SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
-------------------------------------------------------------------------------------------------------
-AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  1     54 Mb/s  92      ****  WPA1 WPA2 
-AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  1     54 Mb/s  81      ****  WPA1      
-AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  1     54 Mb/s  55      **    WPA3      
+NAME   IN-USE  BSSID              SSID        MODE            BAND     CHAN  RATE     SIGNAL  BARS  SECURITY  
+---------------------------------------------------------------------------------------------------------------
+AP[1]          C0:E2:BE:E8:EF:B6  wlan0-ap-2  Infrastruktura  5 GHz    44    54 Mb/s  92      ****  WPA1 WPA2 
+AP[2]          61:95:77:AC:1E:4C  wlan0-ap-1  Infrastruktura  2.4 GHz  6     54 Mb/s  81      ****  WPA1      
+AP[3]          9B:F6:B7:EC:97:76  wlan0-ap-3  Infrastruktura  6 GHz    129   54 Mb/s  55      **    WPA3      
 
 GROUP  ADDRESS                                 GATEWAY         ROUTE  DNS  DOMAIN                                                                            SEARCHES  WINS           
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -30970,93 +31206,93 @@ interface-name
 
 
 <<<
-size: 889
+size: 893
 location: src/tests/client/test-client.py:test_004()/527
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 732 bytes
+stdout: 736 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
-ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 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:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0: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: 899
+size: 903
 location: src/tests/client/test-client.py:test_004()/528
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 732 bytes
+stdout: 736 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
-ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 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:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0: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: 889
+size: 893
 location: src/tests/client/test-client.py:test_004()/529
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 732 bytes
+stdout: 736 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
-ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 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:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0: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: 899
+size: 903
 location: src/tests/client/test-client.py:test_004()/530
 cmd: $NMCLI --mode tabular --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 732 bytes
+stdout: 736 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
-ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 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:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0: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: 596
+size: 599
 location: src/tests/client/test-client.py:test_004()/531
 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 432 bytes
+stdout: 435 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
-ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 
 <<<
-size: 606
+size: 609
 location: src/tests/client/test-client.py:test_004()/532
 cmd: $NMCLI --mode tabular --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 432 bytes
+stdout: 435 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
-ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
@@ -31082,24 +31318,24 @@ stdout: 96 bytes
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 
 <<<
-size: 363
+size: 364
 location: src/tests/client/test-client.py:test_004()/535
 cmd: $NMCLI --mode tabular --terse -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 195 bytes
+stdout: 196 bytes
 >>>
-GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3:::
 
 <<<
-size: 373
+size: 374
 location: src/tests/client/test-client.py:test_004()/536
 cmd: $NMCLI --mode tabular --terse -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 195 bytes
+stdout: 196 bytes
 >>>
-GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3:::
 
 <<<
 size: 284
@@ -31278,20 +31514,20 @@ 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: 6846
+size: 6877
 location: src/tests/client/test-client.py:test_004()/543
 cmd: $NMCLI --mode tabular --terse -f all dev show
 lang: C
 returncode: 0
-stdout: 6688 bytes
+stdout: 6719 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::wlan0:no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:21 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
-AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
-AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:5 GHz:44:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:2.4 GHz:6:54 Mbit/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:6 GHz:129:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar::192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar:
@@ -31322,7 +31558,7 @@ GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/4:::virt
 CAPABILITIES:no:unknown:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
-AP[1]: :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
+AP[1]: :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infra:2.4 GHz:1:54 Mbit/s:48:**  :WPA1 WPA2
 IP4::192.168.57.160:dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69:192.168.61.83:sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar::
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-1 = val-1 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-6 = val-6 | dhcp-4-opt-7 = val-7 | dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9
 IP6:2001\:a\:\:fa05\:2ab4\:9300\:e8fe/116 | 2001\:a\:\:e9cf\:bd3\:caba\:99b3/86 | 2001\:a\:\:2be6\:44fa\:2c95\:5559/78:2001\:a\:\:4d70\:d91a\:770f\:2319:dst = 2001\:a\:\:3cb2\:719d\:bb00\:b22f/66, nh = 2001\:a\:\:81b1\:58b9\:7237\:3511, mt = 2280277732 | dst = 2001\:a\:\:986f\:983c\:5eb\:1c7d/99, nh = \:\:, mt = 1204008676:2001\:a\:\:85e7\:3d7d\:53e8\:50ac | 2001\:a\:\:1c5\:9cb5\:e86d\:25a5:sear6.foo4.bar | sear6.foo2.bar:
@@ -31340,20 +31576,20 @@ 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: 6892
+size: 6923
 location: src/tests/client/test-client.py:test_004()/544
 cmd: $NMCLI --mode tabular --terse -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6724 bytes
+stdout: 6755 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::wlan0:no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:21 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
-AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
-AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:5 GHz:44:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:2.4 GHz:6:54 Mb/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:6 GHz:129:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar::192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar:
@@ -31384,7 +31620,7 @@ GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/4:::virt
 CAPABILITIES:no:unknown:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
-AP[1]: :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
+AP[1]: :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infrastruktura:2.4 GHz:1:54 Mb/s:48:**  :WPA1 WPA2
 IP4::192.168.57.160:dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69:192.168.61.83:sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar::
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-1 = val-1 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-6 = val-6 | dhcp-4-opt-7 = val-7 | dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9
 IP6:2001\:a\:\:fa05\:2ab4\:9300\:e8fe/116 | 2001\:a\:\:e9cf\:bd3\:caba\:99b3/86 | 2001\:a\:\:2be6\:44fa\:2c95\:5559/78:2001\:a\:\:4d70\:d91a\:770f\:2319:dst = 2001\:a\:\:3cb2\:719d\:bb00\:b22f/66, nh = 2001\:a\:\:81b1\:58b9\:7237\:3511, mt = 2280277732 | dst = 2001\:a\:\:986f\:983c\:5eb\:1c7d/99, nh = \:\:, mt = 1204008676:2001\:a\:\:85e7\:3d7d\:53e8\:50ac | 2001\:a\:\:1c5\:9cb5\:e86d\:25a5:sear6.foo4.bar | sear6.foo2.bar:
@@ -31438,20 +31674,20 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar:
 
 <<<
-size: 1515
+size: 1538
 location: src/tests/client/test-client.py:test_004()/547
 cmd: $NMCLI --mode tabular --terse -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 1351 bytes
+stdout: 1374 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::wlan0:no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:21 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
-AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
-AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:5 GHz:44:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:2.4 GHz:6:54 Mbit/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:6 GHz:129:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar::192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar:
@@ -31459,20 +31695,20 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1552
+size: 1575
 location: src/tests/client/test-client.py:test_004()/548
 cmd: $NMCLI --mode tabular --terse -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1378 bytes
+stdout: 1401 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::wlan0:no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:21 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
-AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
-AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:5 GHz:44:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:2.4 GHz:6:54 Mb/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:6 GHz:129:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar::192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar:
@@ -31556,182 +31792,182 @@ wlan1:wifi:/org/freedesktop/NetworkManager/Devices/4
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
-size: 1127
+size: 1158
 location: src/tests/client/test-client.py:test_004()/555
 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 962 bytes
+stdout: 993 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:40 MHz:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:40 MHz:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:44:5 GHz:5220 MHz:54 Mbit/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:6:2.4 GHz:2437 MHz:54 Mbit/s:40 MHz:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:129:6 GHz:6595 MHz:54 Mbit/s:40 MHz:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:40 MHz:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2.4 GHz:2412 MHz:54 Mbit/s:40 MHz:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 1194
+size: 1225
 location: src/tests/client/test-client.py:test_004()/556
 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1018 bytes
+stdout: 1049 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:40 MHz:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:40 MHz:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:44:5 GHz:5220 MHz:54 Mb/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:6:2.4 GHz:2437 MHz:54 Mb/s:40 MHz:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:129:6 GHz:6595 MHz:54 Mb/s:40 MHz:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:40 MHz:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2.4 GHz:2412 MHz:54 Mb/s:40 MHz:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 448
+size: 479
 location: src/tests/client/test-client.py:test_004()/557
 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 280 bytes
+stdout: 311 bytes
 >>>
- :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
- :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
- :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:5 GHz:44:54 Mbit/s:92:****:WPA1 WPA2
+ :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:2.4 GHz:6:54 Mbit/s:81:****:WPA1
+ :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:6 GHz:129:54 Mbit/s:55:**  :WPA3
 
- :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
+ :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infra:2.4 GHz:1:54 Mbit/s:48:**  :WPA1 WPA2
 
 
 <<<
-size: 494
+size: 525
 location: src/tests/client/test-client.py:test_004()/558
 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 316 bytes
+stdout: 347 bytes
 >>>
- :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
- :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
- :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:5 GHz:44:54 Mb/s:92:****:WPA1 WPA2
+ :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:2.4 GHz:6:54 Mb/s:81:****:WPA1
+ :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:6 GHz:129:54 Mb/s:55:**  :WPA3
 
- :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
+ :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infrastruktura:2.4 GHz:1:54 Mb/s:48:**  :WPA1 WPA2
 
 
 <<<
-size: 1212
+size: 1215
 location: src/tests/client/test-client.py:test_004()/559
 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 934 bytes
+stdout: 937 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:44:5220 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:6:2437 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:129:6595 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 1270
+size: 1273
 location: src/tests/client/test-client.py:test_004()/560
 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 982 bytes
+stdout: 985 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:44:5220 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:6:2437 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:129:6595 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 453
+size: 460
 location: src/tests/client/test-client.py:test_004()/561
 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 264 bytes
+stdout: 271 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:44:5 GHz:5220 MHz:54 Mbit/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 
 <<<
-size: 477
+size: 484
 location: src/tests/client/test-client.py:test_004()/562
 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 278 bytes
+stdout: 285 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:44:5 GHz:5220 MHz:54 Mb/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 
 <<<
-size: 265
+size: 272
 location: src/tests/client/test-client.py:test_004()/563
 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 74 bytes
+stdout: 81 bytes
 >>>
- :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:5 GHz:44:54 Mbit/s:92:****:WPA1 WPA2
 
 
 
 <<<
-size: 284
+size: 291
 location: src/tests/client/test-client.py:test_004()/564
 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 83 bytes
+stdout: 90 bytes
 >>>
- :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:5 GHz:44:54 Mb/s:92:****:WPA1 WPA2
 
 
 
 <<<
-size: 559
+size: 560
 location: src/tests/client/test-client.py:test_004()/565
 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 257 bytes
+stdout: 258 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:44:5220 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 
 <<<
-size: 581
+size: 582
 location: src/tests/client/test-client.py:test_004()/566
 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 269 bytes
+stdout: 270 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:44:5220 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 
 <<<
-size: 1518
+size: 1541
 location: src/tests/client/test-client.py:test_004()/567
 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 1351 bytes
+stdout: 1374 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::wlan0:no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:21 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
-AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
-AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:5 GHz:44:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:2.4 GHz:6:54 Mbit/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:6 GHz:129:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar::192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar:
@@ -31739,20 +31975,20 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1555
+size: 1578
 location: src/tests/client/test-client.py:test_004()/568
 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1378 bytes
+stdout: 1401 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::wlan0:no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:21 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
-AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
-AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:5 GHz:44:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:2.4 GHz:6:54 Mb/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:6 GHz:129:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar::192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar:
@@ -31796,19 +32032,19 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar:
 
 <<<
-size: 1626
+size: 1649
 location: src/tests/client/test-client.py:test_004()/571
 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: 1321 bytes
+stdout: 1344 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::wlan0:no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:21 Mb/s:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
-AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
-AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:5 GHz:44:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:2.4 GHz:6:54 Mbit/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:6 GHz:129:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar::192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar:
@@ -31816,19 +32052,19 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1663
+size: 1686
 location: src/tests/client/test-client.py:test_004()/572
 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: 1348 bytes
+stdout: 1371 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::wlan0:no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:21 Mb/s:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
-AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
-AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:5 GHz:44:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:2.4 GHz:6:54 Mb/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:6 GHz:129:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar::192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar:
@@ -31908,93 +32144,93 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA
 
 
 <<<
-size: 901
+size: 905
 location: src/tests/client/test-client.py:test_004()/577
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 732 bytes
+stdout: 736 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
-ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 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:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0: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: 911
+size: 915
 location: src/tests/client/test-client.py:test_004()/578
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 732 bytes
+stdout: 736 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
-ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 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:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0: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: 901
+size: 905
 location: src/tests/client/test-client.py:test_004()/579
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 732 bytes
+stdout: 736 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
-ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 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:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0: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: 911
+size: 915
 location: src/tests/client/test-client.py:test_004()/580
 cmd: $NMCLI --mode tabular --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 732 bytes
+stdout: 736 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
-ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 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:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0: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: 608
+size: 611
 location: src/tests/client/test-client.py:test_004()/581
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 432 bytes
+stdout: 435 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
-ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
 
 <<<
-size: 618
+size: 621
 location: src/tests/client/test-client.py:test_004()/582
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 432 bytes
+stdout: 435 bytes
 >>>
 connection:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP::vpn::yes:0:-1:0:-1:0:::::::-1:-1:-1::0:0::-1:unknown:default:-1:-1:-1:-1:0x0:-1:-1
-ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:0::-1::0
+ipv4:auto::::0::::-1:0::-1:-1:-1:no:no::::0:yes:-1:-1:::0x0:no:yes:-1:-1::-1:-1:0::-1::0
 ipv6:auto::::0::::-1:0::-1:-1:-1:no:no:no:yes:-1:-1:0:0:default:0:auto::::0:yes:-1::0x0:-1:
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 proxy:none:no::
@@ -32020,24 +32256,24 @@ stdout: 96 bytes
 vpn:org.freedesktop.NetworkManager.openvpn::key1 = val1, key2 = val2, key3 = val3:<hidden>:no:0
 
 <<<
-size: 375
+size: 376
 location: src/tests/client/test-client.py:test_004()/585
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 195 bytes
+stdout: 196 bytes
 >>>
-GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3:::
 
 <<<
-size: 385
+size: 386
 location: src/tests/client/test-client.py:test_004()/586
 cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 195 bytes
+stdout: 196 bytes
 >>>
-GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3::
+GENERAL:con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:wlan0:wlan0:activated:no:no::yes:/org/freedesktop/NetworkManager/ActiveConnection/2:/org/freedesktop/NetworkManager/Settings/Connection/3:::
 
 <<<
 size: 476
@@ -32216,20 +32452,20 @@ 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: 7218
+size: 7285
 location: src/tests/client/test-client.py:test_004()/593
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 7048 bytes
+stdout: 7115 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::wlan0:no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:21 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
-AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
-AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:5 GHz:44:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:2.4 GHz:6:54 Mbit/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:6 GHz:129:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar::192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar:
@@ -32260,7 +32496,7 @@ GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/4:::virt
 CAPABILITIES:no:unknown:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
-AP[1]: :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
+AP[1]: :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infra:2.4 GHz:1:54 Mbit/s:48:**  :WPA1 WPA2
 IP4::192.168.57.160:dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69:192.168.61.83:sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar::
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-1 = val-1 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-6 = val-6 | dhcp-4-opt-7 = val-7 | dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9
 IP6:2001\:a\:\:fa05\:2ab4\:9300\:e8fe/116 | 2001\:a\:\:e9cf\:bd3\:caba\:99b3/86 | 2001\:a\:\:2be6\:44fa\:2c95\:5559/78:2001\:a\:\:4d70\:d91a\:770f\:2319:dst = 2001\:a\:\:3cb2\:719d\:bb00\:b22f/66, nh = 2001\:a\:\:81b1\:58b9\:7237\:3511, mt = 2280277732 | dst = 2001\:a\:\:986f\:983c\:5eb\:1c7d/99, nh = \:\:, mt = 1204008676:2001\:a\:\:85e7\:3d7d\:53e8\:50ac | 2001\:a\:\:1c5\:9cb5\:e86d\:25a5:sear6.foo4.bar | sear6.foo2.bar:
@@ -32278,20 +32514,20 @@ 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: 7264
+size: 7331
 location: src/tests/client/test-client.py:test_004()/594
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7084 bytes
+stdout: 7151 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::wlan0:no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:21 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
-AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
-AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:5 GHz:44:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:2.4 GHz:6:54 Mb/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:6 GHz:129:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar::192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar:
@@ -32322,7 +32558,7 @@ GENERAL:wlan1:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/4:::virt
 CAPABILITIES:no:unknown:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
-AP[1]: :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
+AP[1]: :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infrastruktura:2.4 GHz:1:54 Mb/s:48:**  :WPA1 WPA2
 IP4::192.168.57.160:dst = 192.168.36.106/21, nh = 192.168.199.128, mt = 979274165 | dst = 192.168.238.130/19, nh = 0.0.0.0 | dst = 192.168.224.39/32, nh = 192.168.148.69:192.168.61.83:sear4.foo4.bar | sear4.fo.x.y | sear4.foo2.bar | sear4.foo1.bar | sear4.fo.o.bar | sear4.foo3.bar::
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-1 = val-1 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-6 = val-6 | dhcp-4-opt-7 = val-7 | dhcp-4-opt-8 = val-8 | dhcp-4-opt-9 = val-9
 IP6:2001\:a\:\:fa05\:2ab4\:9300\:e8fe/116 | 2001\:a\:\:e9cf\:bd3\:caba\:99b3/86 | 2001\:a\:\:2be6\:44fa\:2c95\:5559/78:2001\:a\:\:4d70\:d91a\:770f\:2319:dst = 2001\:a\:\:3cb2\:719d\:bb00\:b22f/66, nh = 2001\:a\:\:81b1\:58b9\:7237\:3511, mt = 2280277732 | dst = 2001\:a\:\:986f\:983c\:5eb\:1c7d/99, nh = \:\:, mt = 1204008676:2001\:a\:\:85e7\:3d7d\:53e8\:50ac | 2001\:a\:\:1c5\:9cb5\:e86d\:25a5:sear6.foo4.bar | sear6.foo2.bar:
@@ -32376,20 +32612,20 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar:
 
 <<<
-size: 1797
+size: 1847
 location: src/tests/client/test-client.py:test_004()/597
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 1621 bytes
+stdout: 1671 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::wlan0:no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:21 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
-AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
-AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:5 GHz:44:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:2.4 GHz:6:54 Mbit/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:6 GHz:129:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar::192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar:
@@ -32397,20 +32633,20 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1834
+size: 1884
 location: src/tests/client/test-client.py:test_004()/598
 cmd: $NMCLI --mode tabular --terse --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1648 bytes
+stdout: 1698 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::wlan0:no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:21 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
-AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
-AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:5 GHz:44:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:2.4 GHz:6:54 Mb/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:6 GHz:129:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar::192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar:
@@ -32494,182 +32730,182 @@ stdout: 406 bytes
 wlan1:wifi:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
-size: 1788
+size: 1855
 location: src/tests/client/test-client.py:test_004()/605
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 1610 bytes
+stdout: 1677 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:40 MHz:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:40 MHz:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:44:5 GHz:5220 MHz:54 Mbit/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:6:2.4 GHz:2437 MHz:54 Mbit/s:40 MHz:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:129:6 GHz:6595 MHz:54 Mbit/s:40 MHz:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:40 MHz:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2.4 GHz:2412 MHz:54 Mbit/s:40 MHz:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 1854
+size: 1921
 location: src/tests/client/test-client.py:test_004()/606
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1666 bytes
+stdout: 1733 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:40 MHz:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:40 MHz:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:44:5 GHz:5220 MHz:54 Mb/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:6:2.4 GHz:2437 MHz:54 Mb/s:40 MHz:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:129:6 GHz:6595 MHz:54 Mb/s:40 MHz:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
-AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:40 MHz:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
+AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2.4 GHz:2412 MHz:54 Mb/s:40 MHz:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 784
+size: 851
 location: src/tests/client/test-client.py:test_004()/607
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 604 bytes
+stdout: 671 bytes
 >>>
- :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
- :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
- :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:5 GHz:44:54 Mbit/s:92:****:WPA1 WPA2
+ :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:2.4 GHz:6:54 Mbit/s:81:****:WPA1
+ :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:6 GHz:129:54 Mbit/s:55:**  :WPA3
 
- :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infra:1:54 Mbit/s:48:**  :WPA1 WPA2
+ :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infra:2.4 GHz:1:54 Mbit/s:48:**  :WPA1 WPA2
 
 
 <<<
-size: 830
+size: 897
 location: src/tests/client/test-client.py:test_004()/608
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 640 bytes
+stdout: 707 bytes
 >>>
- :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
- :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
- :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:5 GHz:44:54 Mb/s:92:****:WPA1 WPA2
+ :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:2.4 GHz:6:54 Mb/s:81:****:WPA1
+ :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:6 GHz:129:54 Mb/s:55:**  :WPA3
 
- :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infrastruktura:1:54 Mb/s:48:**  :WPA1 WPA2
+ :94\:2B\:E8\:F6\:D2\:86:wlan1-ap-4:Infrastruktura:2.4 GHz:1:54 Mb/s:48:**  :WPA1 WPA2
 
 
 <<<
-size: 1837
+size: 1840
 location: src/tests/client/test-client.py:test_004()/609
 cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 1546 bytes
+stdout: 1549 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:1:2412 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:1:2412 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:44:5220 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infra:6:2437 MHz:54 Mbit/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(none):wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infra:129:6595 MHz:54 Mbit/s:55:**  :WPA3:(none):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infra:1:2412 MHz:54 Mbit/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:no: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 1895
+size: 1898
 location: src/tests/client/test-client.py:test_004()/610
 cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1594 bytes
+stdout: 1597 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
-AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:1:2412 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
-AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:1:2412 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:44:5220 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[2]:wlan0-ap-1:776C616E302D61702D31:61\:95\:77\:AC\:1E\:4C:Infrastruktura:6:2437 MHz:54 Mb/s:81:****:WPA1:pair_tkip pair_ccmp group_tkip group_ccmp psk:(brak):wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/1
+AP[3]:wlan0-ap-3:776C616E302D61702D33:9B\:F6\:B7\:EC\:97\:76:Infrastruktura:129:6595 MHz:54 Mb/s:55:**  :WPA3:(brak):pair_tkip pair_ccmp group_tkip group_ccmp sae:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/3
 
 AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:2412 MHz:54 Mb/s:48:**  :WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan1:nie: :/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 627
+size: 643
 location: src/tests/client/test-client.py:test_004()/611
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 426 bytes
+stdout: 442 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:44:5 GHz:5220 MHz:54 Mbit/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 
 <<<
-size: 651
+size: 667
 location: src/tests/client/test-client.py:test_004()/612
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 440 bytes
+stdout: 456 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:44:5 GHz:5220 MHz:54 Mb/s:40 MHz:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 
 <<<
-size: 359
+size: 375
 location: src/tests/client/test-client.py:test_004()/613
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 155 bytes
+stdout: 171 bytes
 >>>
- :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:5 GHz:44:54 Mbit/s:92:****:WPA1 WPA2
 
 
 
 <<<
-size: 378
+size: 394
 location: src/tests/client/test-client.py:test_004()/614
 cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 164 bytes
+stdout: 180 bytes
 >>>
- :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
+ :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:5 GHz:44:54 Mb/s:92:****:WPA1 WPA2
 
 
 
 <<<
-size: 724
+size: 725
 location: src/tests/client/test-client.py:test_004()/615
 cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 410 bytes
+stdout: 411 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:1:2412 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infra:44:5220 MHz:54 Mbit/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:no: :/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 
 <<<
-size: 746
+size: 747
 location: src/tests/client/test-client.py:test_004()/616
 cmd: $NMCLI --mode tabular --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 422 bytes
+stdout: 423 bytes
 >>>
-AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:2412 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
+AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:44:5220 MHz:54 Mb/s:92:****:WPA1 WPA2:pair_tkip pair_ccmp group_tkip group_ccmp psk:pair_tkip pair_ccmp group_tkip group_ccmp psk:wlan0:nie: :/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 
 <<<
-size: 1800
+size: 1850
 location: src/tests/client/test-client.py:test_004()/617
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 1621 bytes
+stdout: 1671 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::wlan0:no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:21 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
-AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
-AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:5 GHz:44:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:2.4 GHz:6:54 Mbit/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:6 GHz:129:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar::192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar:
@@ -32677,20 +32913,20 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1837
+size: 1887
 location: src/tests/client/test-client.py:test_004()/618
 cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1648 bytes
+stdout: 1698 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::wlan0:no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:21 Mb/s:no:no
 INTERFACE-FLAGS:yes:yes:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
-AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
-AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:5 GHz:44:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:2.4 GHz:6:54 Mb/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:6 GHz:129:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar::192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar:
@@ -32734,19 +32970,19 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar:
 
 <<<
-size: 1908
+size: 1958
 location: src/tests/client/test-client.py:test_004()/621
 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: 1591 bytes
+stdout: 1641 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::wlan0:no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:21 Mb/s:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
-AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:1:54 Mbit/s:92:****:WPA1 WPA2
-AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:1:54 Mbit/s:81:****:WPA1
-AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:1:54 Mbit/s:55:**  :WPA3
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infra:5 GHz:44:54 Mbit/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infra:2.4 GHz:6:54 Mbit/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infra:6 GHz:129:54 Mbit/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar::192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar:
@@ -32754,19 +32990,19 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp-
 CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 1945
+size: 1995
 location: src/tests/client/test-client.py:test_004()/622
 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: 1618 bytes
+stdout: 1668 bytes
 >>>
 GENERAL:wlan0:wifi:NMDeviceWifi:/org/freedesktop/NetworkManager/Devices/3:::virtual:::13\:E0\:74\:85\:7C\:D9:0:100 (connected):0 (No reason given):0 (unknown):0 (unknown):/sys/devices/virtual/wlan0::wlan0:no:yes:yes:no:no::con-vpn-1:UUID-con-vpn-1-REPLACED-REPLACED-REP:/org/freedesktop/NetworkManager/ActiveConnection/2:unknown
 CAPABILITIES:no:21 Mb/s:no:no
 WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:unknown:no:no
-AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:1:54 Mb/s:92:****:WPA1 WPA2
-AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:1:54 Mb/s:81:****:WPA1
-AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:**  :WPA3
+AP[1]: :C0\:E2\:BE\:E8\:EF\:B6:wlan0-ap-2:Infrastruktura:5 GHz:44:54 Mb/s:92:****:WPA1 WPA2
+AP[2]: :61\:95\:77\:AC\:1E\:4C:wlan0-ap-1:Infrastruktura:2.4 GHz:6:54 Mb/s:81:****:WPA1
+AP[3]: :9B\:F6\:B7\:EC\:97\:76:wlan0-ap-3:Infrastruktura:6 GHz:129:54 Mb/s:55:**  :WPA3
 IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sear4.fo.x.y | sear4.foo1.bar | sear4.foo4.bar | sear4.fo.o.bar::192.168.120.79
 DHCP4:dhcp-4-opt-0 = val-0 | dhcp-4-opt-2 = val-2 | dhcp-4-opt-4 = val-4 | dhcp-4-opt-7 = val-7
 IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar:
@@ -32846,12 +33082,12 @@ UUID-con-xx1-REPLACED-REPLACED-REPLA
 
 
 <<<
-size: 6780
+size: 6876
 location: src/tests/client/test-client.py:test_004()/627
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 6628 bytes
+stdout: 6724 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -32919,6 +33155,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -32981,6 +33218,7 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
@@ -32992,12 +33230,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 6817
+size: 6913
 location: src/tests/client/test-client.py:test_004()/628
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6655 bytes
+stdout: 6751 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -33065,6 +33303,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -33127,6 +33366,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
@@ -33138,12 +33378,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 6780
+size: 6876
 location: src/tests/client/test-client.py:test_004()/629
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 6628 bytes
+stdout: 6724 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -33211,6 +33451,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -33273,6 +33514,7 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
@@ -33284,12 +33526,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 6817
+size: 6913
 location: src/tests/client/test-client.py:test_004()/630
 cmd: $NMCLI --mode multiline con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6655 bytes
+stdout: 6751 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -33357,6 +33599,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -33419,6 +33662,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
@@ -33430,12 +33674,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5653
+size: 5706
 location: src/tests/client/test-client.py:test_004()/631
 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5494 bytes
+stdout: 5547 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -33503,6 +33747,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -33555,12 +33800,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 5680
+size: 5733
 location: src/tests/client/test-client.py:test_004()/632
 cmd: $NMCLI --mode multiline -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5511 bytes
+stdout: 5564 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -33628,6 +33873,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -33710,12 +33956,12 @@ vpn.persistent:                         nie
 vpn.timeout:                            0
 
 <<<
-size: 875
+size: 918
 location: src/tests/client/test-client.py:test_004()/635
 cmd: $NMCLI --mode multiline -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 713 bytes
+stdout: 756 bytes
 >>>
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -33729,15 +33975,16 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 888
+size: 931
 location: src/tests/client/test-client.py:test_004()/636
 cmd: $NMCLI --mode multiline -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 716 bytes
+stdout: 759 bytes
 >>>
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -33751,6 +33998,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
@@ -34212,12 +34460,12 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
-size: 22819
+size: 23010
 location: src/tests/client/test-client.py:test_004()/643
 cmd: $NMCLI --mode multiline -f all dev show
 lang: C
 returncode: 0
-stdout: 22666 bytes
+stdout: 22857 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -34271,7 +34519,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -34280,7 +34529,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -34289,7 +34539,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -34520,6 +34771,7 @@ AP[1].IN-USE:
 AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infra
+AP[1].BAND:                             2.4 GHz
 AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           48
@@ -34644,12 +34896,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 22986
+size: 23177
 location: src/tests/client/test-client.py:test_004()/644
 cmd: $NMCLI --mode multiline -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 22823 bytes
+stdout: 23014 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -34703,7 +34955,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -34712,7 +34965,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -34721,7 +34975,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -34952,6 +35207,7 @@ AP[1].IN-USE:
 AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infrastruktura
+AP[1].BAND:                             2.4 GHz
 AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           48
@@ -35142,12 +35398,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5472
+size: 5615
 location: src/tests/client/test-client.py:test_004()/647
 cmd: $NMCLI --mode multiline -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 5314 bytes
+stdout: 5457 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -35201,7 +35457,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -35210,7 +35467,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -35219,7 +35477,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -35254,12 +35513,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5534
+size: 5677
 location: src/tests/client/test-client.py:test_004()/648
 cmd: $NMCLI --mode multiline -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5366 bytes
+stdout: 5509 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -35313,7 +35572,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -35322,7 +35582,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -35331,7 +35592,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -35614,20 +35876,21 @@ TYPE:                                   wifi
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
 
 <<<
-size: 3982
+size: 4173
 location: src/tests/client/test-client.py:test_004()/655
 cmd: $NMCLI --mode multiline -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 3822 bytes
+stdout: 4013 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+BAND:                                   5 GHz
+FREQ:                                   5220 MHz
 RATE:                                   54 Mbit/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 92
@@ -35644,8 +35907,9 @@ SSID:                                   wlan0-ap-1
 SSID-HEX:                               776C616E302D61702D31
 BSSID:                                  61:95:77:AC:1E:4C
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   6
+BAND:                                   2.4 GHz
+FREQ:                                   2437 MHz
 RATE:                                   54 Mbit/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 81
@@ -35662,8 +35926,9 @@ SSID:                                   wlan0-ap-3
 SSID-HEX:                               776C616E302D61702D33
 BSSID:                                  9B:F6:B7:EC:97:76
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   129
+BAND:                                   6 GHz
+FREQ:                                   6595 MHz
 RATE:                                   54 Mbit/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 55
@@ -35682,6 +35947,7 @@ SSID-HEX:                               776C616E312D61702D34
 BSSID:                                  94:2B:E8:F6:D2:86
 MODE:                                   Infra
 CHAN:                                   1
+BAND:                                   2.4 GHz
 FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 BANDWIDTH:                              40 MHz
@@ -35697,20 +35963,21 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 4048
+size: 4239
 location: src/tests/client/test-client.py:test_004()/656
 cmd: $NMCLI --mode multiline -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3878 bytes
+stdout: 4069 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+BAND:                                   5 GHz
+FREQ:                                   5220 MHz
 RATE:                                   54 Mb/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 92
@@ -35727,8 +35994,9 @@ SSID:                                   wlan0-ap-1
 SSID-HEX:                               776C616E302D61702D31
 BSSID:                                  61:95:77:AC:1E:4C
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   6
+BAND:                                   2.4 GHz
+FREQ:                                   2437 MHz
 RATE:                                   54 Mb/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 81
@@ -35745,8 +36013,9 @@ SSID:                                   wlan0-ap-3
 SSID-HEX:                               776C616E302D61702D33
 BSSID:                                  9B:F6:B7:EC:97:76
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   129
+BAND:                                   6 GHz
+FREQ:                                   6595 MHz
 RATE:                                   54 Mb/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 55
@@ -35765,6 +36034,7 @@ SSID-HEX:                               776C616E312D61702D34
 BSSID:                                  94:2B:E8:F6:D2:86
 MODE:                                   Infrastruktura
 CHAN:                                   1
+BAND:                                   2.4 GHz
 FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 BANDWIDTH:                              40 MHz
@@ -35780,18 +36050,19 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 1863
+size: 2054
 location: src/tests/client/test-client.py:test_004()/657
 cmd: $NMCLI --mode multiline -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 1700 bytes
+stdout: 1891 bytes
 >>>
 IN-USE:                                  
 BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infra
-CHAN:                                   1
+BAND:                                   5 GHz
+CHAN:                                   44
 RATE:                                   54 Mbit/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -35800,7 +36071,8 @@ IN-USE:
 BSSID:                                  61:95:77:AC:1E:4C
 SSID:                                   wlan0-ap-1
 MODE:                                   Infra
-CHAN:                                   1
+BAND:                                   2.4 GHz
+CHAN:                                   6
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
@@ -35809,7 +36081,8 @@ IN-USE:
 BSSID:                                  9B:F6:B7:EC:97:76
 SSID:                                   wlan0-ap-3
 MODE:                                   Infra
-CHAN:                                   1
+BAND:                                   6 GHz
+CHAN:                                   129
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
@@ -35819,6 +36092,7 @@ IN-USE:
 BSSID:                                  94:2B:E8:F6:D2:86
 SSID:                                   wlan1-ap-4
 MODE:                                   Infra
+BAND:                                   2.4 GHz
 CHAN:                                   1
 RATE:                                   54 Mbit/s
 SIGNAL:                                 48
@@ -35827,18 +36101,19 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 1909
+size: 2100
 location: src/tests/client/test-client.py:test_004()/658
 cmd: $NMCLI --mode multiline -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1736 bytes
+stdout: 1927 bytes
 >>>
 IN-USE:                                  
 BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infrastruktura
-CHAN:                                   1
+BAND:                                   5 GHz
+CHAN:                                   44
 RATE:                                   54 Mb/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -35847,7 +36122,8 @@ IN-USE:
 BSSID:                                  61:95:77:AC:1E:4C
 SSID:                                   wlan0-ap-1
 MODE:                                   Infrastruktura
-CHAN:                                   1
+BAND:                                   2.4 GHz
+CHAN:                                   6
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
@@ -35856,7 +36132,8 @@ IN-USE:
 BSSID:                                  9B:F6:B7:EC:97:76
 SSID:                                   wlan0-ap-3
 MODE:                                   Infrastruktura
-CHAN:                                   1
+BAND:                                   6 GHz
+CHAN:                                   129
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
@@ -35866,6 +36143,7 @@ IN-USE:
 BSSID:                                  94:2B:E8:F6:D2:86
 SSID:                                   wlan1-ap-4
 MODE:                                   Infrastruktura
+BAND:                                   2.4 GHz
 CHAN:                                   1
 RATE:                                   54 Mb/s
 SIGNAL:                                 48
@@ -35874,20 +36152,20 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 3907
+size: 3910
 location: src/tests/client/test-client.py:test_004()/659
 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 3634 bytes
+stdout: 3637 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+FREQ:                                   5220 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -35903,8 +36181,8 @@ SSID:                                   wlan0-ap-1
 SSID-HEX:                               776C616E302D61702D31
 BSSID:                                  61:95:77:AC:1E:4C
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   6
+FREQ:                                   2437 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
@@ -35920,8 +36198,8 @@ SSID:                                   wlan0-ap-3
 SSID-HEX:                               776C616E302D61702D33
 BSSID:                                  9B:F6:B7:EC:97:76
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   129
+FREQ:                                   6595 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
@@ -35953,20 +36231,20 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 3965
+size: 3968
 location: src/tests/client/test-client.py:test_004()/660
 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3682 bytes
+stdout: 3685 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+FREQ:                                   5220 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -35982,8 +36260,8 @@ SSID:                                   wlan0-ap-1
 SSID-HEX:                               776C616E302D61702D31
 BSSID:                                  61:95:77:AC:1E:4C
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   6
+FREQ:                                   2437 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
@@ -35999,8 +36277,8 @@ SSID:                                   wlan0-ap-3
 SSID-HEX:                               776C616E302D61702D33
 BSSID:                                  9B:F6:B7:EC:97:76
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   129
+FREQ:                                   6595 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
@@ -36032,20 +36310,21 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 1162
+size: 1210
 location: src/tests/client/test-client.py:test_004()/661
 cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 979 bytes
+stdout: 1026 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+BAND:                                   5 GHz
+FREQ:                                   5220 MHz
 RATE:                                   54 Mbit/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 92
@@ -36061,20 +36340,21 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 1186
+size: 1234
 location: src/tests/client/test-client.py:test_004()/662
 cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 993 bytes
+stdout: 1040 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+BAND:                                   5 GHz
+FREQ:                                   5220 MHz
 RATE:                                   54 Mb/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 92
@@ -36090,18 +36370,19 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 615
+size: 662
 location: src/tests/client/test-client.py:test_004()/663
 cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 429 bytes
+stdout: 476 bytes
 >>>
 IN-USE:                                  
 BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infra
-CHAN:                                   1
+BAND:                                   5 GHz
+CHAN:                                   44
 RATE:                                   54 Mbit/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -36110,18 +36391,19 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 634
+size: 681
 location: src/tests/client/test-client.py:test_004()/664
 cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 438 bytes
+stdout: 485 bytes
 >>>
 IN-USE:                                  
 BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infrastruktura
-CHAN:                                   1
+BAND:                                   5 GHz
+CHAN:                                   44
 RATE:                                   54 Mb/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -36130,20 +36412,20 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 1228
+size: 1229
 location: src/tests/client/test-client.py:test_004()/665
 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 932 bytes
+stdout: 933 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+FREQ:                                   5220 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -36158,20 +36440,20 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 1250
+size: 1251
 location: src/tests/client/test-client.py:test_004()/666
 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 944 bytes
+stdout: 945 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+FREQ:                                   5220 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -36186,12 +36468,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 5475
+size: 5618
 location: src/tests/client/test-client.py:test_004()/667
 cmd: $NMCLI --mode multiline -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 5314 bytes
+stdout: 5457 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -36245,7 +36527,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -36254,7 +36537,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -36263,7 +36547,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -36298,12 +36583,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5537
+size: 5680
 location: src/tests/client/test-client.py:test_004()/668
 cmd: $NMCLI --mode multiline -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5366 bytes
+stdout: 5509 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -36357,7 +36642,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -36366,7 +36652,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -36375,7 +36662,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -36476,12 +36764,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5439
+size: 5582
 location: src/tests/client/test-client.py:test_004()/671
 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: 5140 bytes
+stdout: 5283 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -36531,7 +36819,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -36540,7 +36829,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -36549,7 +36839,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -36584,12 +36875,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5499
+size: 5642
 location: src/tests/client/test-client.py:test_004()/672
 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: 5190 bytes
+stdout: 5333 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -36639,7 +36930,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -36648,7 +36940,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -36657,7 +36950,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -36800,12 +37094,12 @@ connection.type:                        802-11-wireless
 connection.interface-name:              --
 
 <<<
-size: 6792
+size: 6888
 location: src/tests/client/test-client.py:test_004()/677
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 6628 bytes
+stdout: 6724 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -36873,6 +37167,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -36935,6 +37230,7 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
@@ -36946,12 +37242,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 6829
+size: 6925
 location: src/tests/client/test-client.py:test_004()/678
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6655 bytes
+stdout: 6751 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -37019,6 +37315,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -37081,6 +37378,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
@@ -37092,12 +37390,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 6792
+size: 6888
 location: src/tests/client/test-client.py:test_004()/679
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 6628 bytes
+stdout: 6724 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -37165,6 +37463,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -37227,6 +37526,7 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
@@ -37238,12 +37538,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 6829
+size: 6925
 location: src/tests/client/test-client.py:test_004()/680
 cmd: $NMCLI --mode multiline --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6655 bytes
+stdout: 6751 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -37311,6 +37611,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -37373,6 +37674,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 VPN.TYPE:                               openvpn
 VPN.USERNAME:                           --
@@ -37384,12 +37686,12 @@ VPN.CFG[2]:                             key2 = val2
 VPN.CFG[3]:                             key3 = val3
 
 <<<
-size: 5665
+size: 5718
 location: src/tests/client/test-client.py:test_004()/681
 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 5494 bytes
+stdout: 5547 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -37457,6 +37759,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -37509,12 +37812,12 @@ proxy.pac-url:                          --
 proxy.pac-script:                       --
 
 <<<
-size: 5692
+size: 5745
 location: src/tests/client/test-client.py:test_004()/682
 cmd: $NMCLI --mode multiline --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5511 bytes
+stdout: 5564 bytes
 >>>
 connection.id:                          con-vpn-1
 connection.uuid:                        UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -37582,6 +37885,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -37664,12 +37968,12 @@ vpn.persistent:                         nie
 vpn.timeout:                            0
 
 <<<
-size: 887
+size: 930
 location: src/tests/client/test-client.py:test_004()/685
 cmd: $NMCLI --mode multiline --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 713 bytes
+stdout: 756 bytes
 >>>
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -37683,15 +37987,16 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
-size: 900
+size: 943
 location: src/tests/client/test-client.py:test_004()/686
 cmd: $NMCLI --mode multiline --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 716 bytes
+stdout: 759 bytes
 >>>
 GENERAL.NAME:                           con-vpn-1
 GENERAL.UUID:                           UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -37705,6 +38010,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 
 <<<
@@ -38166,12 +38472,12 @@ IP6.DNS[1]:                             2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:                          sear6.fo.x.y
 
 <<<
-size: 23155
+size: 23382
 location: src/tests/client/test-client.py:test_004()/693
 cmd: $NMCLI --mode multiline --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 22990 bytes
+stdout: 23217 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -38225,7 +38531,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -38234,7 +38541,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -38243,7 +38551,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -38474,6 +38783,7 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infra
+AP[1].BAND:                             2.4 GHz
 AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           48
@@ -38598,12 +38908,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 23322
+size: 23549
 location: src/tests/client/test-client.py:test_004()/694
 cmd: $NMCLI --mode multiline --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 23147 bytes
+stdout: 23374 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -38657,7 +38967,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -38666,7 +38977,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -38675,7 +38987,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -38906,6 +39219,7 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infrastruktura
+AP[1].BAND:                             2.4 GHz
 AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           48
@@ -39096,12 +39410,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5727
+size: 5897
 location: src/tests/client/test-client.py:test_004()/697
 cmd: $NMCLI --mode multiline --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 5557 bytes
+stdout: 5727 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -39155,7 +39469,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -39164,7 +39479,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -39173,7 +39489,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -39208,12 +39525,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5789
+size: 5959
 location: src/tests/client/test-client.py:test_004()/698
 cmd: $NMCLI --mode multiline --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5609 bytes
+stdout: 5779 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -39267,7 +39584,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -39276,7 +39594,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -39285,7 +39604,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -39568,20 +39888,21 @@ TYPE:                                   wifi
 DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/5
 
 <<<
-size: 4642
+size: 4869
 location: src/tests/client/test-client.py:test_004()/705
 cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 4470 bytes
+stdout: 4697 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+BAND:                                   5 GHz
+FREQ:                                   5220 MHz
 RATE:                                   54 Mbit/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 92
@@ -39598,8 +39919,9 @@ SSID:                                   wlan0-ap-1
 SSID-HEX:                               776C616E302D61702D31
 BSSID:                                  61:95:77:AC:1E:4C
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   6
+BAND:                                   2.4 GHz
+FREQ:                                   2437 MHz
 RATE:                                   54 Mbit/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 81
@@ -39616,8 +39938,9 @@ SSID:                                   wlan0-ap-3
 SSID-HEX:                               776C616E302D61702D33
 BSSID:                                  9B:F6:B7:EC:97:76
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   129
+BAND:                                   6 GHz
+FREQ:                                   6595 MHz
 RATE:                                   54 Mbit/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 55
@@ -39636,6 +39959,7 @@ SSID-HEX:                               776C616E312D61702D34
 BSSID:                                  94:2B:E8:F6:D2:86
 MODE:                                   Infra
 CHAN:                                   1
+BAND:                                   2.4 GHz
 FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 BANDWIDTH:                              40 MHz
@@ -39651,20 +39975,21 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 4708
+size: 4935
 location: src/tests/client/test-client.py:test_004()/706
 cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4526 bytes
+stdout: 4753 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+BAND:                                   5 GHz
+FREQ:                                   5220 MHz
 RATE:                                   54 Mb/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 92
@@ -39681,8 +40006,9 @@ SSID:                                   wlan0-ap-1
 SSID-HEX:                               776C616E302D61702D31
 BSSID:                                  61:95:77:AC:1E:4C
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   6
+BAND:                                   2.4 GHz
+FREQ:                                   2437 MHz
 RATE:                                   54 Mb/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 81
@@ -39699,8 +40025,9 @@ SSID:                                   wlan0-ap-3
 SSID-HEX:                               776C616E302D61702D33
 BSSID:                                  9B:F6:B7:EC:97:76
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   129
+BAND:                                   6 GHz
+FREQ:                                   6595 MHz
 RATE:                                   54 Mb/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 55
@@ -39719,6 +40046,7 @@ SSID-HEX:                               776C616E312D61702D34
 BSSID:                                  94:2B:E8:F6:D2:86
 MODE:                                   Infrastruktura
 CHAN:                                   1
+BAND:                                   2.4 GHz
 FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 BANDWIDTH:                              40 MHz
@@ -39734,18 +40062,19 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 2199
+size: 2426
 location: src/tests/client/test-client.py:test_004()/707
 cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 2024 bytes
+stdout: 2251 bytes
 >>>
 IN-USE:                                  
 BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infra
-CHAN:                                   1
+BAND:                                   5 GHz
+CHAN:                                   44
 RATE:                                   54 Mbit/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -39754,7 +40083,8 @@ IN-USE:                                  
 BSSID:                                  61:95:77:AC:1E:4C
 SSID:                                   wlan0-ap-1
 MODE:                                   Infra
-CHAN:                                   1
+BAND:                                   2.4 GHz
+CHAN:                                   6
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
@@ -39763,7 +40093,8 @@ IN-USE:                                  
 BSSID:                                  9B:F6:B7:EC:97:76
 SSID:                                   wlan0-ap-3
 MODE:                                   Infra
-CHAN:                                   1
+BAND:                                   6 GHz
+CHAN:                                   129
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
@@ -39773,6 +40104,7 @@ IN-USE:                                  
 BSSID:                                  94:2B:E8:F6:D2:86
 SSID:                                   wlan1-ap-4
 MODE:                                   Infra
+BAND:                                   2.4 GHz
 CHAN:                                   1
 RATE:                                   54 Mbit/s
 SIGNAL:                                 48
@@ -39781,18 +40113,19 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 2245
+size: 2472
 location: src/tests/client/test-client.py:test_004()/708
 cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2060 bytes
+stdout: 2287 bytes
 >>>
 IN-USE:                                  
 BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infrastruktura
-CHAN:                                   1
+BAND:                                   5 GHz
+CHAN:                                   44
 RATE:                                   54 Mb/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -39801,7 +40134,8 @@ IN-USE:                                  
 BSSID:                                  61:95:77:AC:1E:4C
 SSID:                                   wlan0-ap-1
 MODE:                                   Infrastruktura
-CHAN:                                   1
+BAND:                                   2.4 GHz
+CHAN:                                   6
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
@@ -39810,7 +40144,8 @@ IN-USE:                                  
 BSSID:                                  9B:F6:B7:EC:97:76
 SSID:                                   wlan0-ap-3
 MODE:                                   Infrastruktura
-CHAN:                                   1
+BAND:                                   6 GHz
+CHAN:                                   129
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
@@ -39820,6 +40155,7 @@ IN-USE:                                  
 BSSID:                                  94:2B:E8:F6:D2:86
 SSID:                                   wlan1-ap-4
 MODE:                                   Infrastruktura
+BAND:                                   2.4 GHz
 CHAN:                                   1
 RATE:                                   54 Mb/s
 SIGNAL:                                 48
@@ -39828,20 +40164,20 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 4531
+size: 4534
 location: src/tests/client/test-client.py:test_004()/709
 cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 4246 bytes
+stdout: 4249 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+FREQ:                                   5220 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -39857,8 +40193,8 @@ SSID:                                   wlan0-ap-1
 SSID-HEX:                               776C616E302D61702D31
 BSSID:                                  61:95:77:AC:1E:4C
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   6
+FREQ:                                   2437 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
@@ -39874,8 +40210,8 @@ SSID:                                   wlan0-ap-3
 SSID-HEX:                               776C616E302D61702D33
 BSSID:                                  9B:F6:B7:EC:97:76
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   129
+FREQ:                                   6595 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
@@ -39907,20 +40243,20 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 4589
+size: 4592
 location: src/tests/client/test-client.py:test_004()/710
 cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4294 bytes
+stdout: 4297 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+FREQ:                                   5220 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -39936,8 +40272,8 @@ SSID:                                   wlan0-ap-1
 SSID-HEX:                               776C616E302D61702D31
 BSSID:                                  61:95:77:AC:1E:4C
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   6
+FREQ:                                   2437 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
@@ -39953,8 +40289,8 @@ SSID:                                   wlan0-ap-3
 SSID-HEX:                               776C616E302D61702D33
 BSSID:                                  9B:F6:B7:EC:97:76
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   129
+FREQ:                                   6595 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
@@ -39986,20 +40322,21 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 1337
+size: 1393
 location: src/tests/client/test-client.py:test_004()/711
 cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 1141 bytes
+stdout: 1197 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+BAND:                                   5 GHz
+FREQ:                                   5220 MHz
 RATE:                                   54 Mbit/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 92
@@ -40015,20 +40352,21 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 1361
+size: 1417
 location: src/tests/client/test-client.py:test_004()/712
 cmd: $NMCLI --mode multiline --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1155 bytes
+stdout: 1211 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+BAND:                                   5 GHz
+FREQ:                                   5220 MHz
 RATE:                                   54 Mb/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 92
@@ -40044,18 +40382,19 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 708
+size: 764
 location: src/tests/client/test-client.py:test_004()/713
 cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 510 bytes
+stdout: 566 bytes
 >>>
 IN-USE:                                  
 BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infra
-CHAN:                                   1
+BAND:                                   5 GHz
+CHAN:                                   44
 RATE:                                   54 Mbit/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -40064,18 +40403,19 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 727
+size: 783
 location: src/tests/client/test-client.py:test_004()/714
 cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 519 bytes
+stdout: 575 bytes
 >>>
 IN-USE:                                  
 BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infrastruktura
-CHAN:                                   1
+BAND:                                   5 GHz
+CHAN:                                   44
 RATE:                                   54 Mb/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -40084,20 +40424,20 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 1394
+size: 1395
 location: src/tests/client/test-client.py:test_004()/715
 cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 1085 bytes
+stdout: 1086 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+FREQ:                                   5220 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -40112,20 +40452,20 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 1416
+size: 1417
 location: src/tests/client/test-client.py:test_004()/716
 cmd: $NMCLI --mode multiline --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1097 bytes
+stdout: 1098 bytes
 >>>
 NAME:                                   AP[1]
 SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+FREQ:                                   5220 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -40140,12 +40480,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 5730
+size: 5900
 location: src/tests/client/test-client.py:test_004()/717
 cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 5557 bytes
+stdout: 5727 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -40199,7 +40539,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -40208,7 +40549,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -40217,7 +40559,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -40252,12 +40595,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5792
+size: 5962
 location: src/tests/client/test-client.py:test_004()/718
 cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5609 bytes
+stdout: 5779 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -40311,7 +40654,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -40320,7 +40664,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -40329,7 +40674,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -40430,12 +40776,12 @@ IP6.DOMAIN[5]:                          sear6.foo3.bar
 IP6.DOMAIN[6]:                          sear6.foo4.bar
 
 <<<
-size: 5694
+size: 5864
 location: src/tests/client/test-client.py:test_004()/721
 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: 5383 bytes
+stdout: 5553 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -40485,7 +40831,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -40494,7 +40841,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -40503,7 +40851,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -40538,12 +40887,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 5754
+size: 5924
 location: src/tests/client/test-client.py:test_004()/722
 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: 5433 bytes
+stdout: 5603 bytes
 >>>
 GENERAL.DEVICE:                         wlan0
 GENERAL.TYPE:                           wifi
@@ -40593,7 +40942,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -40602,7 +40952,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -40611,7 +40962,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -40754,12 +41106,12 @@ connection.type:                        802-11-wireless
 connection.interface-name:              --
 
 <<<
-size: 7800
+size: 7896
 location: src/tests/client/test-client.py:test_004()/727
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 7639 bytes
+stdout: 7735 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -40831,6 +41183,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -40900,6 +41253,7 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 VPN.TYPE:                               openvpn
@@ -40913,12 +41267,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 7850
+size: 7946
 location: src/tests/client/test-client.py:test_004()/728
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7679 bytes
+stdout: 7775 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -40990,6 +41344,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -41059,6 +41414,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 VPN.TYPE:                               openvpn
@@ -41072,12 +41428,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 7800
+size: 7896
 location: src/tests/client/test-client.py:test_004()/729
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 7639 bytes
+stdout: 7735 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -41149,6 +41505,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -41218,6 +41575,7 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 VPN.TYPE:                               openvpn
@@ -41231,12 +41589,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 7850
+size: 7946
 location: src/tests/client/test-client.py:test_004()/730
 cmd: $NMCLI --mode multiline --pretty con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7679 bytes
+stdout: 7775 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -41308,6 +41666,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -41377,6 +41736,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 VPN.TYPE:                               openvpn
@@ -41390,12 +41750,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6281
+size: 6334
 location: src/tests/client/test-client.py:test_004()/731
 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 6113 bytes
+stdout: 6166 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -41467,6 +41827,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -41523,12 +41884,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6313
+size: 6366
 location: src/tests/client/test-client.py:test_004()/732
 cmd: $NMCLI --mode multiline --pretty -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6135 bytes
+stdout: 6188 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -41600,6 +41961,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -41694,12 +42056,12 @@ vpn.timeout:                            0
 -------------------------------------------------------------------------------
 
 <<<
-size: 1197
+size: 1240
 location: src/tests/client/test-client.py:test_004()/735
 cmd: $NMCLI --mode multiline --pretty -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1025 bytes
+stdout: 1068 bytes
 >>>
 ===============================================================================
        Active connection details (UUID-con-vpn-1-REPLACED-REPLACED-REP)
@@ -41716,16 +42078,17 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 1218
+size: 1261
 location: src/tests/client/test-client.py:test_004()/736
 cmd: $NMCLI --mode multiline --pretty -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1036 bytes
+stdout: 1079 bytes
 >>>
 ===============================================================================
     Szczegóły aktywowania połączenia (UUID-con-vpn-1-REPLACED-REPLACED-REP)
@@ -41742,6 +42105,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
@@ -42360,12 +42724,12 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
 <<<
-size: 27803
+size: 27994
 location: src/tests/client/test-client.py:test_004()/743
 cmd: $NMCLI --mode multiline --pretty -f all dev show
 lang: C
 returncode: 0
-stdout: 27641 bytes
+stdout: 27832 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -42426,7 +42790,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -42436,7 +42801,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -42446,7 +42812,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -42714,6 +43081,7 @@ AP[1].IN-USE:
 AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infra
+AP[1].BAND:                             2.4 GHz
 AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           48
@@ -42856,12 +43224,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 28003
+size: 28194
 location: src/tests/client/test-client.py:test_004()/744
 cmd: $NMCLI --mode multiline --pretty -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 27831 bytes
+stdout: 28022 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -42922,7 +43290,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -42932,7 +43301,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -42942,7 +43312,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -43210,6 +43581,7 @@ AP[1].IN-USE:
 AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infrastruktura
+AP[1].BAND:                             2.4 GHz
 AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           48
@@ -43442,12 +43814,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6652
+size: 6795
 location: src/tests/client/test-client.py:test_004()/747
 cmd: $NMCLI --mode multiline --pretty -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 6485 bytes
+stdout: 6628 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -43508,7 +43880,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -43518,7 +43891,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -43528,7 +43902,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -43569,12 +43944,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6721
+size: 6864
 location: src/tests/client/test-client.py:test_004()/748
 cmd: $NMCLI --mode multiline --pretty -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6544 bytes
+stdout: 6687 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -43635,7 +44010,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -43645,7 +44021,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -43655,7 +44032,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -43984,12 +44362,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Devices/
 -------------------------------------------------------------------------------
 
 <<<
-size: 4947
+size: 5138
 location: src/tests/client/test-client.py:test_004()/755
 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 4778 bytes
+stdout: 4969 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -43999,8 +44377,9 @@ SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+BAND:                                   5 GHz
+FREQ:                                   5220 MHz
 RATE:                                   54 Mbit/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 92
@@ -44018,8 +44397,9 @@ SSID:                                   wlan0-ap-1
 SSID-HEX:                               776C616E302D61702D31
 BSSID:                                  61:95:77:AC:1E:4C
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   6
+BAND:                                   2.4 GHz
+FREQ:                                   2437 MHz
 RATE:                                   54 Mbit/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 81
@@ -44037,8 +44417,9 @@ SSID:                                   wlan0-ap-3
 SSID-HEX:                               776C616E302D61702D33
 BSSID:                                  9B:F6:B7:EC:97:76
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   129
+BAND:                                   6 GHz
+FREQ:                                   6595 MHz
 RATE:                                   54 Mbit/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 55
@@ -44061,6 +44442,7 @@ SSID-HEX:                               776C616E312D61702D34
 BSSID:                                  94:2B:E8:F6:D2:86
 MODE:                                   Infra
 CHAN:                                   1
+BAND:                                   2.4 GHz
 FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 BANDWIDTH:                              40 MHz
@@ -44080,12 +44462,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 ===============================================================================
 
 <<<
-size: 5031
+size: 5222
 location: src/tests/client/test-client.py:test_004()/756
 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4852 bytes
+stdout: 5043 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -44095,8 +44477,9 @@ SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+BAND:                                   5 GHz
+FREQ:                                   5220 MHz
 RATE:                                   54 Mb/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 92
@@ -44114,8 +44497,9 @@ SSID:                                   wlan0-ap-1
 SSID-HEX:                               776C616E302D61702D31
 BSSID:                                  61:95:77:AC:1E:4C
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   6
+BAND:                                   2.4 GHz
+FREQ:                                   2437 MHz
 RATE:                                   54 Mb/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 81
@@ -44133,8 +44517,9 @@ SSID:                                   wlan0-ap-3
 SSID-HEX:                               776C616E302D61702D33
 BSSID:                                  9B:F6:B7:EC:97:76
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   129
+BAND:                                   6 GHz
+FREQ:                                   6595 MHz
 RATE:                                   54 Mb/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 55
@@ -44157,6 +44542,7 @@ SSID-HEX:                               776C616E312D61702D34
 BSSID:                                  94:2B:E8:F6:D2:86
 MODE:                                   Infrastruktura
 CHAN:                                   1
+BAND:                                   2.4 GHz
 FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 BANDWIDTH:                              40 MHz
@@ -44176,12 +44562,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 ===============================================================================
 
 <<<
-size: 2828
+size: 3019
 location: src/tests/client/test-client.py:test_004()/757
 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 2656 bytes
+stdout: 2847 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -44190,7 +44576,8 @@ IN-USE:
 BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infra
-CHAN:                                   1
+BAND:                                   5 GHz
+CHAN:                                   44
 RATE:                                   54 Mbit/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -44200,7 +44587,8 @@ IN-USE:
 BSSID:                                  61:95:77:AC:1E:4C
 SSID:                                   wlan0-ap-1
 MODE:                                   Infra
-CHAN:                                   1
+BAND:                                   2.4 GHz
+CHAN:                                   6
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
@@ -44210,7 +44598,8 @@ IN-USE:
 BSSID:                                  9B:F6:B7:EC:97:76
 SSID:                                   wlan0-ap-3
 MODE:                                   Infra
-CHAN:                                   1
+BAND:                                   6 GHz
+CHAN:                                   129
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
@@ -44224,6 +44613,7 @@ IN-USE:
 BSSID:                                  94:2B:E8:F6:D2:86
 SSID:                                   wlan1-ap-4
 MODE:                                   Infra
+BAND:                                   2.4 GHz
 CHAN:                                   1
 RATE:                                   54 Mbit/s
 SIGNAL:                                 48
@@ -44236,12 +44626,12 @@ SECURITY:                               WPA1 WPA2
 ===============================================================================
 
 <<<
-size: 2892
+size: 3083
 location: src/tests/client/test-client.py:test_004()/758
 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2710 bytes
+stdout: 2901 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -44250,7 +44640,8 @@ IN-USE:
 BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infrastruktura
-CHAN:                                   1
+BAND:                                   5 GHz
+CHAN:                                   44
 RATE:                                   54 Mb/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -44260,7 +44651,8 @@ IN-USE:
 BSSID:                                  61:95:77:AC:1E:4C
 SSID:                                   wlan0-ap-1
 MODE:                                   Infrastruktura
-CHAN:                                   1
+BAND:                                   2.4 GHz
+CHAN:                                   6
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
@@ -44270,7 +44662,8 @@ IN-USE:
 BSSID:                                  9B:F6:B7:EC:97:76
 SSID:                                   wlan0-ap-3
 MODE:                                   Infrastruktura
-CHAN:                                   1
+BAND:                                   6 GHz
+CHAN:                                   129
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
@@ -44284,6 +44677,7 @@ IN-USE:
 BSSID:                                  94:2B:E8:F6:D2:86
 SSID:                                   wlan1-ap-4
 MODE:                                   Infrastruktura
+BAND:                                   2.4 GHz
 CHAN:                                   1
 RATE:                                   54 Mb/s
 SIGNAL:                                 48
@@ -44296,12 +44690,12 @@ SECURITY:                               WPA1 WPA2
 ===============================================================================
 
 <<<
-size: 4872
+size: 4875
 location: src/tests/client/test-client.py:test_004()/759
 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 4590 bytes
+stdout: 4593 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -44311,8 +44705,8 @@ SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+FREQ:                                   5220 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -44329,8 +44723,8 @@ SSID:                                   wlan0-ap-1
 SSID-HEX:                               776C616E302D61702D31
 BSSID:                                  61:95:77:AC:1E:4C
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   6
+FREQ:                                   2437 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
@@ -44347,8 +44741,8 @@ SSID:                                   wlan0-ap-3
 SSID-HEX:                               776C616E302D61702D33
 BSSID:                                  9B:F6:B7:EC:97:76
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   129
+FREQ:                                   6595 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
@@ -44388,12 +44782,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 ===============================================================================
 
 <<<
-size: 4948
+size: 4951
 location: src/tests/client/test-client.py:test_004()/760
 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 4656 bytes
+stdout: 4659 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -44403,8 +44797,8 @@ SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+FREQ:                                   5220 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -44421,8 +44815,8 @@ SSID:                                   wlan0-ap-1
 SSID-HEX:                               776C616E302D61702D31
 BSSID:                                  61:95:77:AC:1E:4C
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   6
+FREQ:                                   2437 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
@@ -44439,8 +44833,8 @@ SSID:                                   wlan0-ap-3
 SSID-HEX:                               776C616E302D61702D33
 BSSID:                                  9B:F6:B7:EC:97:76
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   129
+FREQ:                                   6595 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
@@ -44480,12 +44874,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 ===============================================================================
 
 <<<
-size: 1464
+size: 1511
 location: src/tests/client/test-client.py:test_004()/761
 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 1271 bytes
+stdout: 1318 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -44495,8 +44889,9 @@ SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+BAND:                                   5 GHz
+FREQ:                                   5220 MHz
 RATE:                                   54 Mbit/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 92
@@ -44513,12 +44908,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 1494
+size: 1541
 location: src/tests/client/test-client.py:test_004()/762
 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1291 bytes
+stdout: 1338 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -44528,8 +44923,9 @@ SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+BAND:                                   5 GHz
+FREQ:                                   5220 MHz
 RATE:                                   54 Mb/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 92
@@ -44546,12 +44942,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 916
+size: 963
 location: src/tests/client/test-client.py:test_004()/763
 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 721 bytes
+stdout: 768 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -44560,7 +44956,8 @@ IN-USE:
 BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infra
-CHAN:                                   1
+BAND:                                   5 GHz
+CHAN:                                   44
 RATE:                                   54 Mbit/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -44570,12 +44967,12 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 941
+size: 988
 location: src/tests/client/test-client.py:test_004()/764
 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 736 bytes
+stdout: 783 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -44584,7 +44981,8 @@ IN-USE:
 BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infrastruktura
-CHAN:                                   1
+BAND:                                   5 GHz
+CHAN:                                   44
 RATE:                                   54 Mb/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -44594,12 +44992,12 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 1530
+size: 1531
 location: src/tests/client/test-client.py:test_004()/765
 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 1224 bytes
+stdout: 1225 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -44609,8 +45007,8 @@ SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+FREQ:                                   5220 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -44626,12 +45024,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 1558
+size: 1559
 location: src/tests/client/test-client.py:test_004()/766
 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1242 bytes
+stdout: 1243 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -44641,8 +45039,8 @@ SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+FREQ:                                   5220 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -44658,12 +45056,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/AccessPo
 
 
 <<<
-size: 6655
+size: 6798
 location: src/tests/client/test-client.py:test_004()/767
 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 6485 bytes
+stdout: 6628 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -44724,7 +45122,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -44734,7 +45133,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -44744,7 +45144,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -44785,12 +45186,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6724
+size: 6867
 location: src/tests/client/test-client.py:test_004()/768
 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6544 bytes
+stdout: 6687 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -44851,7 +45252,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -44861,7 +45263,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -44871,7 +45274,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -45002,12 +45406,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6539
+size: 6682
 location: src/tests/client/test-client.py:test_004()/771
 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: 6231 bytes
+stdout: 6374 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -45063,7 +45467,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -45073,7 +45478,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -45083,7 +45489,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -45124,12 +45531,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6606
+size: 6749
 location: src/tests/client/test-client.py:test_004()/772
 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: 6288 bytes
+stdout: 6431 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -45185,7 +45592,8 @@ AP[1].IN-USE:
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -45195,7 +45603,8 @@ AP[2].IN-USE:
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -45205,7 +45614,8 @@ AP[3].IN-USE:
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -45410,12 +45820,12 @@ connection.interface-name:              --
 -------------------------------------------------------------------------------
 
 <<<
-size: 7812
+size: 7908
 location: src/tests/client/test-client.py:test_004()/777
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 7639 bytes
+stdout: 7735 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -45487,6 +45897,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -45556,6 +45967,7 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 VPN.TYPE:                               openvpn
@@ -45569,12 +45981,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 7862
+size: 7958
 location: src/tests/client/test-client.py:test_004()/778
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7679 bytes
+stdout: 7775 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -45646,6 +46058,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -45715,6 +46128,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 VPN.TYPE:                               openvpn
@@ -45728,12 +46142,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 7812
+size: 7908
 location: src/tests/client/test-client.py:test_004()/779
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 7639 bytes
+stdout: 7735 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -45805,6 +46219,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -45874,6 +46289,7 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 VPN.TYPE:                               openvpn
@@ -45887,12 +46303,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 7862
+size: 7958
 location: src/tests/client/test-client.py:test_004()/780
 cmd: $NMCLI --mode multiline --pretty --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 7679 bytes
+stdout: 7775 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -45964,6 +46380,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -46033,6 +46450,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 VPN.TYPE:                               openvpn
@@ -46046,12 +46464,12 @@ VPN.CFG[3]:                             key3 = val3
 -------------------------------------------------------------------------------
 
 <<<
-size: 6293
+size: 6346
 location: src/tests/client/test-client.py:test_004()/781
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 6113 bytes
+stdout: 6166 bytes
 >>>
 ===============================================================================
                     Connection profile details (con-vpn-1)
@@ -46123,6 +46541,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -46179,12 +46598,12 @@ proxy.pac-script:                       --
 -------------------------------------------------------------------------------
 
 <<<
-size: 6325
+size: 6378
 location: src/tests/client/test-client.py:test_004()/782
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6135 bytes
+stdout: 6188 bytes
 >>>
 ===============================================================================
                    Szczegóły profilu połączenia (con-vpn-1)
@@ -46256,6 +46675,7 @@ ipv4.required-timeout:                  -1 (default)
 ipv4.dad-timeout:                       -1 (default)
 ipv4.dhcp-vendor-class-identifier:      --
 ipv4.dhcp-ipv6-only-preferred:          -1 (default)
+ipv4.clat:                              -1 (default)
 ipv4.link-local:                        0 (default)
 ipv4.dhcp-reject-servers:               --
 ipv4.auto-route-ext-gw:                 -1 (default)
@@ -46350,12 +46770,12 @@ vpn.timeout:                            0
 -------------------------------------------------------------------------------
 
 <<<
-size: 1209
+size: 1252
 location: src/tests/client/test-client.py:test_004()/785
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 1025 bytes
+stdout: 1068 bytes
 >>>
 ===============================================================================
        Active connection details (UUID-con-vpn-1-REPLACED-REPLACED-REP)
@@ -46372,16 +46792,17 @@ GENERAL.VPN:                            yes
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
 <<<
-size: 1230
+size: 1273
 location: src/tests/client/test-client.py:test_004()/786
 cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1036 bytes
+stdout: 1079 bytes
 >>>
 ===============================================================================
     Szczegóły aktywowania połączenia (UUID-con-vpn-1-REPLACED-REPLACED-REP)
@@ -46398,6 +46819,7 @@ GENERAL.VPN:                            tak
 GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:                           --
+GENERAL.CONTROLLER-PATH:                --
 GENERAL.MASTER-PATH:                    --
 -------------------------------------------------------------------------------
 
@@ -47016,12 +47438,12 @@ IP6.DOMAIN[1]:                          sear6.fo.x.y
 -------------------------------------------------------------------------------
 
 <<<
-size: 28139
+size: 28366
 location: src/tests/client/test-client.py:test_004()/793
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 27965 bytes
+stdout: 28192 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -47082,7 +47504,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -47092,7 +47515,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -47102,7 +47526,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -47370,6 +47795,7 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infra
+AP[1].BAND:                             2.4 GHz
 AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           48
@@ -47512,12 +47938,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 28339
+size: 28566
 location: src/tests/client/test-client.py:test_004()/794
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 28155 bytes
+stdout: 28382 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -47578,7 +48004,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -47588,7 +48015,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -47598,7 +48026,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -47866,6 +48295,7 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            94:2B:E8:F6:D2:86
 AP[1].SSID:                             wlan1-ap-4
 AP[1].MODE:                             Infrastruktura
+AP[1].BAND:                             2.4 GHz
 AP[1].CHAN:                             1
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           48
@@ -48098,12 +48528,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6907
+size: 7077
 location: src/tests/client/test-client.py:test_004()/797
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 6728 bytes
+stdout: 6898 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -48164,7 +48594,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -48174,7 +48605,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -48184,7 +48616,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -48225,12 +48658,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6976
+size: 7146
 location: src/tests/client/test-client.py:test_004()/798
 cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6787 bytes
+stdout: 6957 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -48291,7 +48724,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -48301,7 +48735,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -48311,7 +48746,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -48640,12 +49076,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Dev
 -------------------------------------------------------------------------------
 
 <<<
-size: 5607
+size: 5834
 location: src/tests/client/test-client.py:test_004()/805
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 5426 bytes
+stdout: 5653 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -48655,8 +49091,9 @@ SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+BAND:                                   5 GHz
+FREQ:                                   5220 MHz
 RATE:                                   54 Mbit/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 92
@@ -48674,8 +49111,9 @@ SSID:                                   wlan0-ap-1
 SSID-HEX:                               776C616E302D61702D31
 BSSID:                                  61:95:77:AC:1E:4C
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   6
+BAND:                                   2.4 GHz
+FREQ:                                   2437 MHz
 RATE:                                   54 Mbit/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 81
@@ -48693,8 +49131,9 @@ SSID:                                   wlan0-ap-3
 SSID-HEX:                               776C616E302D61702D33
 BSSID:                                  9B:F6:B7:EC:97:76
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   129
+BAND:                                   6 GHz
+FREQ:                                   6595 MHz
 RATE:                                   54 Mbit/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 55
@@ -48717,6 +49156,7 @@ SSID-HEX:                               776C616E312D61702D34
 BSSID:                                  94:2B:E8:F6:D2:86
 MODE:                                   Infra
 CHAN:                                   1
+BAND:                                   2.4 GHz
 FREQ:                                   2412 MHz
 RATE:                                   54 Mbit/s
 BANDWIDTH:                              40 MHz
@@ -48736,12 +49176,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 ===============================================================================
 
 <<<
-size: 5691
+size: 5918
 location: src/tests/client/test-client.py:test_004()/806
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5500 bytes
+stdout: 5727 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -48751,8 +49191,9 @@ SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+BAND:                                   5 GHz
+FREQ:                                   5220 MHz
 RATE:                                   54 Mb/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 92
@@ -48770,8 +49211,9 @@ SSID:                                   wlan0-ap-1
 SSID-HEX:                               776C616E302D61702D31
 BSSID:                                  61:95:77:AC:1E:4C
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   6
+BAND:                                   2.4 GHz
+FREQ:                                   2437 MHz
 RATE:                                   54 Mb/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 81
@@ -48789,8 +49231,9 @@ SSID:                                   wlan0-ap-3
 SSID-HEX:                               776C616E302D61702D33
 BSSID:                                  9B:F6:B7:EC:97:76
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   129
+BAND:                                   6 GHz
+FREQ:                                   6595 MHz
 RATE:                                   54 Mb/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 55
@@ -48813,6 +49256,7 @@ SSID-HEX:                               776C616E312D61702D34
 BSSID:                                  94:2B:E8:F6:D2:86
 MODE:                                   Infrastruktura
 CHAN:                                   1
+BAND:                                   2.4 GHz
 FREQ:                                   2412 MHz
 RATE:                                   54 Mb/s
 BANDWIDTH:                              40 MHz
@@ -48832,12 +49276,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 ===============================================================================
 
 <<<
-size: 3164
+size: 3391
 location: src/tests/client/test-client.py:test_004()/807
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 2980 bytes
+stdout: 3207 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -48846,7 +49290,8 @@ IN-USE:                                  
 BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infra
-CHAN:                                   1
+BAND:                                   5 GHz
+CHAN:                                   44
 RATE:                                   54 Mbit/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -48856,7 +49301,8 @@ IN-USE:                                  
 BSSID:                                  61:95:77:AC:1E:4C
 SSID:                                   wlan0-ap-1
 MODE:                                   Infra
-CHAN:                                   1
+BAND:                                   2.4 GHz
+CHAN:                                   6
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
@@ -48866,7 +49312,8 @@ IN-USE:                                  
 BSSID:                                  9B:F6:B7:EC:97:76
 SSID:                                   wlan0-ap-3
 MODE:                                   Infra
-CHAN:                                   1
+BAND:                                   6 GHz
+CHAN:                                   129
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
@@ -48880,6 +49327,7 @@ IN-USE:                                  
 BSSID:                                  94:2B:E8:F6:D2:86
 SSID:                                   wlan1-ap-4
 MODE:                                   Infra
+BAND:                                   2.4 GHz
 CHAN:                                   1
 RATE:                                   54 Mbit/s
 SIGNAL:                                 48
@@ -48892,12 +49340,12 @@ SECURITY:                               WPA1 WPA2
 ===============================================================================
 
 <<<
-size: 3228
+size: 3455
 location: src/tests/client/test-client.py:test_004()/808
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3034 bytes
+stdout: 3261 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -48906,7 +49354,8 @@ IN-USE:                                  
 BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infrastruktura
-CHAN:                                   1
+BAND:                                   5 GHz
+CHAN:                                   44
 RATE:                                   54 Mb/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -48916,7 +49365,8 @@ IN-USE:                                  
 BSSID:                                  61:95:77:AC:1E:4C
 SSID:                                   wlan0-ap-1
 MODE:                                   Infrastruktura
-CHAN:                                   1
+BAND:                                   2.4 GHz
+CHAN:                                   6
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
@@ -48926,7 +49376,8 @@ IN-USE:                                  
 BSSID:                                  9B:F6:B7:EC:97:76
 SSID:                                   wlan0-ap-3
 MODE:                                   Infrastruktura
-CHAN:                                   1
+BAND:                                   6 GHz
+CHAN:                                   129
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
@@ -48940,6 +49391,7 @@ IN-USE:                                  
 BSSID:                                  94:2B:E8:F6:D2:86
 SSID:                                   wlan1-ap-4
 MODE:                                   Infrastruktura
+BAND:                                   2.4 GHz
 CHAN:                                   1
 RATE:                                   54 Mb/s
 SIGNAL:                                 48
@@ -48952,12 +49404,12 @@ SECURITY:                               WPA1 WPA2
 ===============================================================================
 
 <<<
-size: 5496
+size: 5499
 location: src/tests/client/test-client.py:test_004()/809
 cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 5202 bytes
+stdout: 5205 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -48967,8 +49419,8 @@ SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+FREQ:                                   5220 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -48985,8 +49437,8 @@ SSID:                                   wlan0-ap-1
 SSID-HEX:                               776C616E302D61702D31
 BSSID:                                  61:95:77:AC:1E:4C
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   6
+FREQ:                                   2437 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 81
 BARS:                                   ****
@@ -49003,8 +49455,8 @@ SSID:                                   wlan0-ap-3
 SSID-HEX:                               776C616E302D61702D33
 BSSID:                                  9B:F6:B7:EC:97:76
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   129
+FREQ:                                   6595 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 55
 BARS:                                   **  
@@ -49044,12 +49496,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 ===============================================================================
 
 <<<
-size: 5572
+size: 5575
 location: src/tests/client/test-client.py:test_004()/810
 cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 5268 bytes
+stdout: 5271 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -49059,8 +49511,8 @@ SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+FREQ:                                   5220 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -49077,8 +49529,8 @@ SSID:                                   wlan0-ap-1
 SSID-HEX:                               776C616E302D61702D31
 BSSID:                                  61:95:77:AC:1E:4C
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   6
+FREQ:                                   2437 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 81
 BARS:                                   ****
@@ -49095,8 +49547,8 @@ SSID:                                   wlan0-ap-3
 SSID-HEX:                               776C616E302D61702D33
 BSSID:                                  9B:F6:B7:EC:97:76
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   129
+FREQ:                                   6595 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 55
 BARS:                                   **  
@@ -49136,12 +49588,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 ===============================================================================
 
 <<<
-size: 1638
+size: 1694
 location: src/tests/client/test-client.py:test_004()/811
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 1433 bytes
+stdout: 1489 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -49151,8 +49603,9 @@ SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+BAND:                                   5 GHz
+FREQ:                                   5220 MHz
 RATE:                                   54 Mbit/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 92
@@ -49169,12 +49622,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 1668
+size: 1724
 location: src/tests/client/test-client.py:test_004()/812
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1453 bytes
+stdout: 1509 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -49184,8 +49637,9 @@ SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+BAND:                                   5 GHz
+FREQ:                                   5220 MHz
 RATE:                                   54 Mb/s
 BANDWIDTH:                              40 MHz
 SIGNAL:                                 92
@@ -49202,12 +49656,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 1009
+size: 1065
 location: src/tests/client/test-client.py:test_004()/813
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 802 bytes
+stdout: 858 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -49216,7 +49670,8 @@ IN-USE:                                  
 BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infra
-CHAN:                                   1
+BAND:                                   5 GHz
+CHAN:                                   44
 RATE:                                   54 Mbit/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -49226,12 +49681,12 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 1034
+size: 1090
 location: src/tests/client/test-client.py:test_004()/814
 cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 817 bytes
+stdout: 873 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -49240,7 +49695,8 @@ IN-USE:                                  
 BSSID:                                  C0:E2:BE:E8:EF:B6
 SSID:                                   wlan0-ap-2
 MODE:                                   Infrastruktura
-CHAN:                                   1
+BAND:                                   5 GHz
+CHAN:                                   44
 RATE:                                   54 Mb/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -49250,12 +49706,12 @@ SECURITY:                               WPA1 WPA2
 
 
 <<<
-size: 1695
+size: 1696
 location: src/tests/client/test-client.py:test_004()/815
 cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 1377 bytes
+stdout: 1378 bytes
 >>>
 ===============================================================================
                             Wi-Fi scan list (wlan0)
@@ -49265,8 +49721,8 @@ SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infra
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+FREQ:                                   5220 MHz
 RATE:                                   54 Mbit/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -49282,12 +49738,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 1723
+size: 1724
 location: src/tests/client/test-client.py:test_004()/816
 cmd: $NMCLI --mode multiline --pretty --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1395 bytes
+stdout: 1396 bytes
 >>>
 ===============================================================================
                      Lista skanowania sieci Wi-Fi (wlan0)
@@ -49297,8 +49753,8 @@ SSID:                                   wlan0-ap-2
 SSID-HEX:                               776C616E302D61702D32
 BSSID:                                  C0:E2:BE:E8:EF:B6
 MODE:                                   Infrastruktura
-CHAN:                                   1
-FREQ:                                   2412 MHz
+CHAN:                                   44
+FREQ:                                   5220 MHz
 RATE:                                   54 Mb/s
 SIGNAL:                                 92
 BARS:                                   ****
@@ -49314,12 +49770,12 @@ DBUS-PATH:                              /org/freedesktop/NetworkManager/Acc
 
 
 <<<
-size: 6910
+size: 7080
 location: src/tests/client/test-client.py:test_004()/817
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 6728 bytes
+stdout: 6898 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -49380,7 +49836,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -49390,7 +49847,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -49400,7 +49858,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -49441,12 +49900,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6979
+size: 7149
 location: src/tests/client/test-client.py:test_004()/818
 cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 6787 bytes
+stdout: 6957 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -49507,7 +49966,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -49517,7 +49977,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -49527,7 +49988,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -49658,12 +50120,12 @@ IP6.DOMAIN[6]:                          sear6.foo4.bar
 -------------------------------------------------------------------------------
 
 <<<
-size: 6794
+size: 6964
 location: src/tests/client/test-client.py:test_004()/821
 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: 6474 bytes
+stdout: 6644 bytes
 >>>
 ===============================================================================
                             Device details (wlan0)
@@ -49719,7 +50181,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infra
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mbit/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -49729,7 +50192,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infra
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mbit/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -49739,7 +50203,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infra
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mbit/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -49780,12 +50245,12 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | c
 -------------------------------------------------------------------------------
 
 <<<
-size: 6861
+size: 7031
 location: src/tests/client/test-client.py:test_004()/822
 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: 6531 bytes
+stdout: 6701 bytes
 >>>
 ===============================================================================
                         Informacje o urządzeniu (wlan0)
@@ -49841,7 +50306,8 @@ AP[1].IN-USE:                            
 AP[1].BSSID:                            C0:E2:BE:E8:EF:B6
 AP[1].SSID:                             wlan0-ap-2
 AP[1].MODE:                             Infrastruktura
-AP[1].CHAN:                             1
+AP[1].BAND:                             5 GHz
+AP[1].CHAN:                             44
 AP[1].RATE:                             54 Mb/s
 AP[1].SIGNAL:                           92
 AP[1].BARS:                             ****
@@ -49851,7 +50317,8 @@ AP[2].IN-USE:                            
 AP[2].BSSID:                            61:95:77:AC:1E:4C
 AP[2].SSID:                             wlan0-ap-1
 AP[2].MODE:                             Infrastruktura
-AP[2].CHAN:                             1
+AP[2].BAND:                             2.4 GHz
+AP[2].CHAN:                             6
 AP[2].RATE:                             54 Mb/s
 AP[2].SIGNAL:                           81
 AP[2].BARS:                             ****
@@ -49861,7 +50328,8 @@ AP[3].IN-USE:                            
 AP[3].BSSID:                            9B:F6:B7:EC:97:76
 AP[3].SSID:                             wlan0-ap-3
 AP[3].MODE:                             Infrastruktura
-AP[3].CHAN:                             1
+AP[3].BAND:                             6 GHz
+AP[3].CHAN:                             129
 AP[3].RATE:                             54 Mb/s
 AP[3].SIGNAL:                           55
 AP[3].BARS:                             **  
@@ -50066,12 +50534,12 @@ connection.interface-name:              --
 -------------------------------------------------------------------------------
 
 <<<
-size: 3466
+size: 3504
 location: src/tests/client/test-client.py:test_004()/827
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3306 bytes
+stdout: 3344 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -50139,6 +50607,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -50201,6 +50670,7 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 VPN.TYPE:openvpn
 VPN.USERNAME:
@@ -50212,12 +50682,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 3476
+size: 3514
 location: src/tests/client/test-client.py:test_004()/828
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3306 bytes
+stdout: 3344 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -50285,6 +50755,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -50347,6 +50818,7 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 VPN.TYPE:openvpn
 VPN.USERNAME:
@@ -50358,12 +50830,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 3466
+size: 3504
 location: src/tests/client/test-client.py:test_004()/829
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3306 bytes
+stdout: 3344 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -50431,6 +50903,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -50493,6 +50966,7 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 VPN.TYPE:openvpn
 VPN.USERNAME:
@@ -50504,12 +50978,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 3476
+size: 3514
 location: src/tests/client/test-client.py:test_004()/830
 cmd: $NMCLI --mode multiline --terse con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3306 bytes
+stdout: 3344 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -50577,6 +51051,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -50639,6 +51114,7 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 VPN.TYPE:openvpn
 VPN.USERNAME:
@@ -50650,12 +51126,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2891
+size: 2904
 location: src/tests/client/test-client.py:test_004()/831
 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2724 bytes
+stdout: 2737 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -50723,6 +51199,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -50775,12 +51252,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 2901
+size: 2914
 location: src/tests/client/test-client.py:test_004()/832
 cmd: $NMCLI --mode multiline --terse -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2724 bytes
+stdout: 2737 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -50848,6 +51325,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -50930,12 +51408,12 @@ vpn.persistent:no
 vpn.timeout:0
 
 <<<
-size: 563
+size: 588
 location: src/tests/client/test-client.py:test_004()/835
 cmd: $NMCLI --mode multiline --terse -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 393 bytes
+stdout: 418 bytes
 >>>
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -50949,15 +51427,16 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 573
+size: 598
 location: src/tests/client/test-client.py:test_004()/836
 cmd: $NMCLI --mode multiline --terse -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 393 bytes
+stdout: 418 bytes
 >>>
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -50971,6 +51450,7 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
@@ -51432,12 +51912,12 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 13229
+size: 13304
 location: src/tests/client/test-client.py:test_004()/843
 cmd: $NMCLI --mode multiline --terse -f all dev show
 lang: C
 returncode: 0
-stdout: 13068 bytes
+stdout: 13143 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -51491,7 +51971,8 @@ AP[1].IN-USE:
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -51500,7 +51981,8 @@ AP[2].IN-USE:
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -51509,7 +51991,8 @@ AP[3].IN-USE:
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -51740,6 +52223,7 @@ AP[1].IN-USE:
 AP[1].BSSID:94:2B:E8:F6:D2:86
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infra
+AP[1].BAND:2.4 GHz
 AP[1].CHAN:1
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:48
@@ -51864,12 +52348,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 13275
+size: 13350
 location: src/tests/client/test-client.py:test_004()/844
 cmd: $NMCLI --mode multiline --terse -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 13104 bytes
+stdout: 13179 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -51923,7 +52407,8 @@ AP[1].IN-USE:
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -51932,7 +52417,8 @@ AP[2].IN-USE:
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -51941,7 +52427,8 @@ AP[3].IN-USE:
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -52172,6 +52659,7 @@ AP[1].IN-USE:
 AP[1].BSSID:94:2B:E8:F6:D2:86
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infrastruktura
+AP[1].BAND:2.4 GHz
 AP[1].CHAN:1
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:48
@@ -52362,12 +52850,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 3063
+size: 3119
 location: src/tests/client/test-client.py:test_004()/847
 cmd: $NMCLI --mode multiline --terse -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 2897 bytes
+stdout: 2953 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -52421,7 +52909,8 @@ AP[1].IN-USE:
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -52430,7 +52919,8 @@ AP[2].IN-USE:
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -52439,7 +52929,8 @@ AP[3].IN-USE:
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -52474,12 +52965,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 3100
+size: 3156
 location: src/tests/client/test-client.py:test_004()/848
 cmd: $NMCLI --mode multiline --terse -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2924 bytes
+stdout: 2980 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -52533,7 +53024,8 @@ AP[1].IN-USE:
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -52542,7 +53034,8 @@ AP[2].IN-USE:
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -52551,7 +53044,8 @@ AP[3].IN-USE:
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -52834,20 +53328,21 @@ TYPE:wifi
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
-size: 1618
+size: 1669
 location: src/tests/client/test-client.py:test_004()/855
 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 1450 bytes
+stdout: 1501 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
 BSSID:C0:E2:BE:E8:EF:B6
 MODE:Infra
-CHAN:1
-FREQ:2412 MHz
+CHAN:44
+BAND:5 GHz
+FREQ:5220 MHz
 RATE:54 Mbit/s
 BANDWIDTH:40 MHz
 SIGNAL:92
@@ -52864,8 +53359,9 @@ SSID:wlan0-ap-1
 SSID-HEX:776C616E302D61702D31
 BSSID:61:95:77:AC:1E:4C
 MODE:Infra
-CHAN:1
-FREQ:2412 MHz
+CHAN:6
+BAND:2.4 GHz
+FREQ:2437 MHz
 RATE:54 Mbit/s
 BANDWIDTH:40 MHz
 SIGNAL:81
@@ -52882,8 +53378,9 @@ SSID:wlan0-ap-3
 SSID-HEX:776C616E302D61702D33
 BSSID:9B:F6:B7:EC:97:76
 MODE:Infra
-CHAN:1
-FREQ:2412 MHz
+CHAN:129
+BAND:6 GHz
+FREQ:6595 MHz
 RATE:54 Mbit/s
 BANDWIDTH:40 MHz
 SIGNAL:55
@@ -52902,6 +53399,7 @@ SSID-HEX:776C616E312D61702D34
 BSSID:94:2B:E8:F6:D2:86
 MODE:Infra
 CHAN:1
+BAND:2.4 GHz
 FREQ:2412 MHz
 RATE:54 Mbit/s
 BANDWIDTH:40 MHz
@@ -52917,20 +53415,21 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 1684
+size: 1735
 location: src/tests/client/test-client.py:test_004()/856
 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1506 bytes
+stdout: 1557 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
 BSSID:C0:E2:BE:E8:EF:B6
 MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
+CHAN:44
+BAND:5 GHz
+FREQ:5220 MHz
 RATE:54 Mb/s
 BANDWIDTH:40 MHz
 SIGNAL:92
@@ -52947,8 +53446,9 @@ SSID:wlan0-ap-1
 SSID-HEX:776C616E302D61702D31
 BSSID:61:95:77:AC:1E:4C
 MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
+CHAN:6
+BAND:2.4 GHz
+FREQ:2437 MHz
 RATE:54 Mb/s
 BANDWIDTH:40 MHz
 SIGNAL:81
@@ -52965,8 +53465,9 @@ SSID:wlan0-ap-3
 SSID-HEX:776C616E302D61702D33
 BSSID:9B:F6:B7:EC:97:76
 MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
+CHAN:129
+BAND:6 GHz
+FREQ:6595 MHz
 RATE:54 Mb/s
 BANDWIDTH:40 MHz
 SIGNAL:55
@@ -52985,6 +53486,7 @@ SSID-HEX:776C616E312D61702D34
 BSSID:94:2B:E8:F6:D2:86
 MODE:Infrastruktura
 CHAN:1
+BAND:2.4 GHz
 FREQ:2412 MHz
 RATE:54 Mb/s
 BANDWIDTH:40 MHz
@@ -53000,18 +53502,19 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 646
+size: 697
 location: src/tests/client/test-client.py:test_004()/857
 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 476 bytes
+stdout: 527 bytes
 >>>
 IN-USE: 
 BSSID:C0:E2:BE:E8:EF:B6
 SSID:wlan0-ap-2
 MODE:Infra
-CHAN:1
+BAND:5 GHz
+CHAN:44
 RATE:54 Mbit/s
 SIGNAL:92
 BARS:****
@@ -53020,7 +53523,8 @@ IN-USE:
 BSSID:61:95:77:AC:1E:4C
 SSID:wlan0-ap-1
 MODE:Infra
-CHAN:1
+BAND:2.4 GHz
+CHAN:6
 RATE:54 Mbit/s
 SIGNAL:81
 BARS:****
@@ -53029,7 +53533,8 @@ IN-USE:
 BSSID:9B:F6:B7:EC:97:76
 SSID:wlan0-ap-3
 MODE:Infra
-CHAN:1
+BAND:6 GHz
+CHAN:129
 RATE:54 Mbit/s
 SIGNAL:55
 BARS:**  
@@ -53039,6 +53544,7 @@ IN-USE:
 BSSID:94:2B:E8:F6:D2:86
 SSID:wlan1-ap-4
 MODE:Infra
+BAND:2.4 GHz
 CHAN:1
 RATE:54 Mbit/s
 SIGNAL:48
@@ -53047,18 +53553,19 @@ SECURITY:WPA1 WPA2
 
 
 <<<
-size: 692
+size: 743
 location: src/tests/client/test-client.py:test_004()/858
 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 512 bytes
+stdout: 563 bytes
 >>>
 IN-USE: 
 BSSID:C0:E2:BE:E8:EF:B6
 SSID:wlan0-ap-2
 MODE:Infrastruktura
-CHAN:1
+BAND:5 GHz
+CHAN:44
 RATE:54 Mb/s
 SIGNAL:92
 BARS:****
@@ -53067,7 +53574,8 @@ IN-USE:
 BSSID:61:95:77:AC:1E:4C
 SSID:wlan0-ap-1
 MODE:Infrastruktura
-CHAN:1
+BAND:2.4 GHz
+CHAN:6
 RATE:54 Mb/s
 SIGNAL:81
 BARS:****
@@ -53076,7 +53584,8 @@ IN-USE:
 BSSID:9B:F6:B7:EC:97:76
 SSID:wlan0-ap-3
 MODE:Infrastruktura
-CHAN:1
+BAND:6 GHz
+CHAN:129
 RATE:54 Mb/s
 SIGNAL:55
 BARS:**  
@@ -53086,6 +53595,7 @@ IN-USE:
 BSSID:94:2B:E8:F6:D2:86
 SSID:wlan1-ap-4
 MODE:Infrastruktura
+BAND:2.4 GHz
 CHAN:1
 RATE:54 Mb/s
 SIGNAL:48
@@ -53094,20 +53604,20 @@ SECURITY:WPA1 WPA2
 
 
 <<<
-size: 1663
+size: 1666
 location: src/tests/client/test-client.py:test_004()/859
 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 1382 bytes
+stdout: 1385 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
 BSSID:C0:E2:BE:E8:EF:B6
 MODE:Infra
-CHAN:1
-FREQ:2412 MHz
+CHAN:44
+FREQ:5220 MHz
 RATE:54 Mbit/s
 SIGNAL:92
 BARS:****
@@ -53123,8 +53633,8 @@ SSID:wlan0-ap-1
 SSID-HEX:776C616E302D61702D31
 BSSID:61:95:77:AC:1E:4C
 MODE:Infra
-CHAN:1
-FREQ:2412 MHz
+CHAN:6
+FREQ:2437 MHz
 RATE:54 Mbit/s
 SIGNAL:81
 BARS:****
@@ -53140,8 +53650,8 @@ SSID:wlan0-ap-3
 SSID-HEX:776C616E302D61702D33
 BSSID:9B:F6:B7:EC:97:76
 MODE:Infra
-CHAN:1
-FREQ:2412 MHz
+CHAN:129
+FREQ:6595 MHz
 RATE:54 Mbit/s
 SIGNAL:55
 BARS:**  
@@ -53173,20 +53683,20 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 1721
+size: 1724
 location: src/tests/client/test-client.py:test_004()/860
 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1430 bytes
+stdout: 1433 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
 BSSID:C0:E2:BE:E8:EF:B6
 MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
+CHAN:44
+FREQ:5220 MHz
 RATE:54 Mb/s
 SIGNAL:92
 BARS:****
@@ -53202,8 +53712,8 @@ SSID:wlan0-ap-1
 SSID-HEX:776C616E302D61702D31
 BSSID:61:95:77:AC:1E:4C
 MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
+CHAN:6
+FREQ:2437 MHz
 RATE:54 Mb/s
 SIGNAL:81
 BARS:****
@@ -53219,8 +53729,8 @@ SSID:wlan0-ap-3
 SSID-HEX:776C616E302D61702D33
 BSSID:9B:F6:B7:EC:97:76
 MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
+CHAN:129
+FREQ:6595 MHz
 RATE:54 Mb/s
 SIGNAL:55
 BARS:**  
@@ -53252,20 +53762,21 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 577
+size: 589
 location: src/tests/client/test-client.py:test_004()/861
 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 386 bytes
+stdout: 398 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
 BSSID:C0:E2:BE:E8:EF:B6
 MODE:Infra
-CHAN:1
-FREQ:2412 MHz
+CHAN:44
+BAND:5 GHz
+FREQ:5220 MHz
 RATE:54 Mbit/s
 BANDWIDTH:40 MHz
 SIGNAL:92
@@ -53281,20 +53792,21 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 <<<
-size: 601
+size: 613
 location: src/tests/client/test-client.py:test_004()/862
 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 400 bytes
+stdout: 412 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
 BSSID:C0:E2:BE:E8:EF:B6
 MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
+CHAN:44
+BAND:5 GHz
+FREQ:5220 MHz
 RATE:54 Mb/s
 BANDWIDTH:40 MHz
 SIGNAL:92
@@ -53310,18 +53822,19 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 <<<
-size: 317
+size: 329
 location: src/tests/client/test-client.py:test_004()/863
 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 123 bytes
+stdout: 135 bytes
 >>>
 IN-USE: 
 BSSID:C0:E2:BE:E8:EF:B6
 SSID:wlan0-ap-2
 MODE:Infra
-CHAN:1
+BAND:5 GHz
+CHAN:44
 RATE:54 Mbit/s
 SIGNAL:92
 BARS:****
@@ -53330,18 +53843,19 @@ SECURITY:WPA1 WPA2
 
 
 <<<
-size: 336
+size: 348
 location: src/tests/client/test-client.py:test_004()/864
 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 132 bytes
+stdout: 144 bytes
 >>>
 IN-USE: 
 BSSID:C0:E2:BE:E8:EF:B6
 SSID:wlan0-ap-2
 MODE:Infrastruktura
-CHAN:1
+BAND:5 GHz
+CHAN:44
 RATE:54 Mb/s
 SIGNAL:92
 BARS:****
@@ -53350,20 +53864,20 @@ SECURITY:WPA1 WPA2
 
 
 <<<
-size: 673
+size: 674
 location: src/tests/client/test-client.py:test_004()/865
 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 369 bytes
+stdout: 370 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
 BSSID:C0:E2:BE:E8:EF:B6
 MODE:Infra
-CHAN:1
-FREQ:2412 MHz
+CHAN:44
+FREQ:5220 MHz
 RATE:54 Mbit/s
 SIGNAL:92
 BARS:****
@@ -53378,20 +53892,20 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 <<<
-size: 695
+size: 696
 location: src/tests/client/test-client.py:test_004()/866
 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 381 bytes
+stdout: 382 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
 BSSID:C0:E2:BE:E8:EF:B6
 MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
+CHAN:44
+FREQ:5220 MHz
 RATE:54 Mb/s
 SIGNAL:92
 BARS:****
@@ -53406,12 +53920,12 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 <<<
-size: 3066
+size: 3122
 location: src/tests/client/test-client.py:test_004()/867
 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 2897 bytes
+stdout: 2953 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -53465,7 +53979,8 @@ AP[1].IN-USE:
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -53474,7 +53989,8 @@ AP[2].IN-USE:
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -53483,7 +53999,8 @@ AP[3].IN-USE:
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -53518,12 +54035,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 3103
+size: 3159
 location: src/tests/client/test-client.py:test_004()/868
 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2924 bytes
+stdout: 2980 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -53577,7 +54094,8 @@ AP[1].IN-USE:
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -53586,7 +54104,8 @@ AP[2].IN-USE:
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -53595,7 +54114,8 @@ AP[3].IN-USE:
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -53696,12 +54216,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 3098
+size: 3154
 location: src/tests/client/test-client.py:test_004()/871
 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: 2791 bytes
+stdout: 2847 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -53751,7 +54271,8 @@ AP[1].IN-USE:
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -53760,7 +54281,8 @@ AP[2].IN-USE:
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -53769,7 +54291,8 @@ AP[3].IN-USE:
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -53804,12 +54327,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 3135
+size: 3191
 location: src/tests/client/test-client.py:test_004()/872
 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: 2818 bytes
+stdout: 2874 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -53859,7 +54382,8 @@ AP[1].IN-USE:
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -53868,7 +54392,8 @@ AP[2].IN-USE:
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -53877,7 +54402,8 @@ AP[3].IN-USE:
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -54020,12 +54546,12 @@ connection.type:802-11-wireless
 connection.interface-name:
 
 <<<
-size: 3478
+size: 3516
 location: src/tests/client/test-client.py:test_004()/877
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3306 bytes
+stdout: 3344 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -54093,6 +54619,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -54155,6 +54682,7 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 VPN.TYPE:openvpn
 VPN.USERNAME:
@@ -54166,12 +54694,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 3488
+size: 3526
 location: src/tests/client/test-client.py:test_004()/878
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3306 bytes
+stdout: 3344 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -54239,6 +54767,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -54301,6 +54830,7 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 VPN.TYPE:openvpn
 VPN.USERNAME:
@@ -54312,12 +54842,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 3478
+size: 3516
 location: src/tests/client/test-client.py:test_004()/879
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 3306 bytes
+stdout: 3344 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -54385,6 +54915,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -54447,6 +54978,7 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 VPN.TYPE:openvpn
 VPN.USERNAME:
@@ -54458,12 +54990,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 3488
+size: 3526
 location: src/tests/client/test-client.py:test_004()/880
 cmd: $NMCLI --mode multiline --terse --color yes con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3306 bytes
+stdout: 3344 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -54531,6 +55063,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -54593,6 +55126,7 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 VPN.TYPE:openvpn
 VPN.USERNAME:
@@ -54604,12 +55138,12 @@ VPN.CFG[2]:key2 = val2
 VPN.CFG[3]:key3 = val3
 
 <<<
-size: 2903
+size: 2916
 location: src/tests/client/test-client.py:test_004()/881
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 2724 bytes
+stdout: 2737 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -54677,6 +55211,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -54729,12 +55264,12 @@ proxy.pac-url:
 proxy.pac-script:
 
 <<<
-size: 2913
+size: 2926
 location: src/tests/client/test-client.py:test_004()/882
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2724 bytes
+stdout: 2737 bytes
 >>>
 connection.id:con-vpn-1
 connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -54802,6 +55337,7 @@ ipv4.required-timeout:-1
 ipv4.dad-timeout:-1
 ipv4.dhcp-vendor-class-identifier:
 ipv4.dhcp-ipv6-only-preferred:-1
+ipv4.clat:-1
 ipv4.link-local:0
 ipv4.dhcp-reject-servers:
 ipv4.auto-route-ext-gw:-1
@@ -54884,12 +55420,12 @@ vpn.persistent:no
 vpn.timeout:0
 
 <<<
-size: 575
+size: 600
 location: src/tests/client/test-client.py:test_004()/885
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
-stdout: 393 bytes
+stdout: 418 bytes
 >>>
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -54903,15 +55439,16 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
-size: 585
+size: 610
 location: src/tests/client/test-client.py:test_004()/886
 cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 393 bytes
+stdout: 418 bytes
 >>>
 GENERAL.NAME:con-vpn-1
 GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP
@@ -54925,6 +55462,7 @@ GENERAL.VPN:yes
 GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2
 GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3
 GENERAL.ZONE:
+GENERAL.CONTROLLER-PATH:
 GENERAL.MASTER-PATH:
 
 <<<
@@ -55386,12 +55924,12 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19
 IP6.DOMAIN[1]:sear6.fo.x.y
 
 <<<
-size: 13565
+size: 13676
 location: src/tests/client/test-client.py:test_004()/893
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show
 lang: C
 returncode: 0
-stdout: 13392 bytes
+stdout: 13503 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -55445,7 +55983,8 @@ AP[1].IN-USE: 
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -55454,7 +55993,8 @@ AP[2].IN-USE: 
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -55463,7 +56003,8 @@ AP[3].IN-USE: 
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -55694,6 +56235,7 @@ AP[1].IN-USE: 
 AP[1].BSSID:94:2B:E8:F6:D2:86
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infra
+AP[1].BAND:2.4 GHz
 AP[1].CHAN:1
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:48
@@ -55818,12 +56360,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 13611
+size: 13722
 location: src/tests/client/test-client.py:test_004()/894
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 13428 bytes
+stdout: 13539 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -55877,7 +56419,8 @@ AP[1].IN-USE: 
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -55886,7 +56429,8 @@ AP[2].IN-USE: 
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -55895,7 +56439,8 @@ AP[3].IN-USE: 
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -56126,6 +56671,7 @@ AP[1].IN-USE: 
 AP[1].BSSID:94:2B:E8:F6:D2:86
 AP[1].SSID:wlan1-ap-4
 AP[1].MODE:Infrastruktura
+AP[1].BAND:2.4 GHz
 AP[1].CHAN:1
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:48
@@ -56316,12 +56862,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 3318
+size: 3401
 location: src/tests/client/test-client.py:test_004()/897
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show wlan0
 lang: C
 returncode: 0
-stdout: 3140 bytes
+stdout: 3223 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -56375,7 +56921,8 @@ AP[1].IN-USE: 
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -56384,7 +56931,8 @@ AP[2].IN-USE: 
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -56393,7 +56941,8 @@ AP[3].IN-USE: 
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -56428,12 +56977,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 3355
+size: 3438
 location: src/tests/client/test-client.py:test_004()/898
 cmd: $NMCLI --mode multiline --terse --color yes -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3167 bytes
+stdout: 3250 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -56487,7 +57036,8 @@ AP[1].IN-USE: 
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -56496,7 +57046,8 @@ AP[2].IN-USE: 
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -56505,7 +57056,8 @@ AP[3].IN-USE: 
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -56788,20 +57340,21 @@ TYPE:wifi
 DBUS-PATH:/org/freedesktop/NetworkManager/Devices/5
 
 <<<
-size: 2278
+size: 2365
 location: src/tests/client/test-client.py:test_004()/905
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list
 lang: C
 returncode: 0
-stdout: 2098 bytes
+stdout: 2185 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
 BSSID:C0:E2:BE:E8:EF:B6
 MODE:Infra
-CHAN:1
-FREQ:2412 MHz
+CHAN:44
+BAND:5 GHz
+FREQ:5220 MHz
 RATE:54 Mbit/s
 BANDWIDTH:40 MHz
 SIGNAL:92
@@ -56818,8 +57371,9 @@ SSID:wlan0-ap-1
 SSID-HEX:776C616E302D61702D31
 BSSID:61:95:77:AC:1E:4C
 MODE:Infra
-CHAN:1
-FREQ:2412 MHz
+CHAN:6
+BAND:2.4 GHz
+FREQ:2437 MHz
 RATE:54 Mbit/s
 BANDWIDTH:40 MHz
 SIGNAL:81
@@ -56836,8 +57390,9 @@ SSID:wlan0-ap-3
 SSID-HEX:776C616E302D61702D33
 BSSID:9B:F6:B7:EC:97:76
 MODE:Infra
-CHAN:1
-FREQ:2412 MHz
+CHAN:129
+BAND:6 GHz
+FREQ:6595 MHz
 RATE:54 Mbit/s
 BANDWIDTH:40 MHz
 SIGNAL:55
@@ -56856,6 +57411,7 @@ SSID-HEX:776C616E312D61702D34
 BSSID:94:2B:E8:F6:D2:86
 MODE:Infra
 CHAN:1
+BAND:2.4 GHz
 FREQ:2412 MHz
 RATE:54 Mbit/s
 BANDWIDTH:40 MHz
@@ -56871,20 +57427,21 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 2344
+size: 2431
 location: src/tests/client/test-client.py:test_004()/906
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2154 bytes
+stdout: 2241 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
 BSSID:C0:E2:BE:E8:EF:B6
 MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
+CHAN:44
+BAND:5 GHz
+FREQ:5220 MHz
 RATE:54 Mb/s
 BANDWIDTH:40 MHz
 SIGNAL:92
@@ -56901,8 +57458,9 @@ SSID:wlan0-ap-1
 SSID-HEX:776C616E302D61702D31
 BSSID:61:95:77:AC:1E:4C
 MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
+CHAN:6
+BAND:2.4 GHz
+FREQ:2437 MHz
 RATE:54 Mb/s
 BANDWIDTH:40 MHz
 SIGNAL:81
@@ -56919,8 +57477,9 @@ SSID:wlan0-ap-3
 SSID-HEX:776C616E302D61702D33
 BSSID:9B:F6:B7:EC:97:76
 MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
+CHAN:129
+BAND:6 GHz
+FREQ:6595 MHz
 RATE:54 Mb/s
 BANDWIDTH:40 MHz
 SIGNAL:55
@@ -56939,6 +57498,7 @@ SSID-HEX:776C616E312D61702D34
 BSSID:94:2B:E8:F6:D2:86
 MODE:Infrastruktura
 CHAN:1
+BAND:2.4 GHz
 FREQ:2412 MHz
 RATE:54 Mb/s
 BANDWIDTH:40 MHz
@@ -56954,18 +57514,19 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 982
+size: 1069
 location: src/tests/client/test-client.py:test_004()/907
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list
 lang: C
 returncode: 0
-stdout: 800 bytes
+stdout: 887 bytes
 >>>
 IN-USE: 
 BSSID:C0:E2:BE:E8:EF:B6
 SSID:wlan0-ap-2
 MODE:Infra
-CHAN:1
+BAND:5 GHz
+CHAN:44
 RATE:54 Mbit/s
 SIGNAL:92
 BARS:****
@@ -56974,7 +57535,8 @@ IN-USE: 
 BSSID:61:95:77:AC:1E:4C
 SSID:wlan0-ap-1
 MODE:Infra
-CHAN:1
+BAND:2.4 GHz
+CHAN:6
 RATE:54 Mbit/s
 SIGNAL:81
 BARS:****
@@ -56983,7 +57545,8 @@ IN-USE: 
 BSSID:9B:F6:B7:EC:97:76
 SSID:wlan0-ap-3
 MODE:Infra
-CHAN:1
+BAND:6 GHz
+CHAN:129
 RATE:54 Mbit/s
 SIGNAL:55
 BARS:**  
@@ -56993,6 +57556,7 @@ IN-USE: 
 BSSID:94:2B:E8:F6:D2:86
 SSID:wlan1-ap-4
 MODE:Infra
+BAND:2.4 GHz
 CHAN:1
 RATE:54 Mbit/s
 SIGNAL:48
@@ -57001,18 +57565,19 @@ SECURITY:WPA1 WPA2
 
 
 <<<
-size: 1028
+size: 1115
 location: src/tests/client/test-client.py:test_004()/908
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 836 bytes
+stdout: 923 bytes
 >>>
 IN-USE: 
 BSSID:C0:E2:BE:E8:EF:B6
 SSID:wlan0-ap-2
 MODE:Infrastruktura
-CHAN:1
+BAND:5 GHz
+CHAN:44
 RATE:54 Mb/s
 SIGNAL:92
 BARS:****
@@ -57021,7 +57586,8 @@ IN-USE: 
 BSSID:61:95:77:AC:1E:4C
 SSID:wlan0-ap-1
 MODE:Infrastruktura
-CHAN:1
+BAND:2.4 GHz
+CHAN:6
 RATE:54 Mb/s
 SIGNAL:81
 BARS:****
@@ -57030,7 +57596,8 @@ IN-USE: 
 BSSID:9B:F6:B7:EC:97:76
 SSID:wlan0-ap-3
 MODE:Infrastruktura
-CHAN:1
+BAND:6 GHz
+CHAN:129
 RATE:54 Mb/s
 SIGNAL:55
 BARS:**  
@@ -57040,6 +57607,7 @@ IN-USE: 
 BSSID:94:2B:E8:F6:D2:86
 SSID:wlan1-ap-4
 MODE:Infrastruktura
+BAND:2.4 GHz
 CHAN:1
 RATE:54 Mb/s
 SIGNAL:48
@@ -57048,20 +57616,20 @@ SECURITY:WPA1 WPA2
 
 
 <<<
-size: 2287
+size: 2290
 location: src/tests/client/test-client.py:test_004()/909
 cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
-stdout: 1994 bytes
+stdout: 1997 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
 BSSID:C0:E2:BE:E8:EF:B6
 MODE:Infra
-CHAN:1
-FREQ:2412 MHz
+CHAN:44
+FREQ:5220 MHz
 RATE:54 Mbit/s
 SIGNAL:92
 BARS:****
@@ -57077,8 +57645,8 @@ SSID:wlan0-ap-1
 SSID-HEX:776C616E302D61702D31
 BSSID:61:95:77:AC:1E:4C
 MODE:Infra
-CHAN:1
-FREQ:2412 MHz
+CHAN:6
+FREQ:2437 MHz
 RATE:54 Mbit/s
 SIGNAL:81
 BARS:****
@@ -57094,8 +57662,8 @@ SSID:wlan0-ap-3
 SSID-HEX:776C616E302D61702D33
 BSSID:9B:F6:B7:EC:97:76
 MODE:Infra
-CHAN:1
-FREQ:2412 MHz
+CHAN:129
+FREQ:6595 MHz
 RATE:54 Mbit/s
 SIGNAL:55
 BARS:**  
@@ -57127,20 +57695,20 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 2345
+size: 2348
 location: src/tests/client/test-client.py:test_004()/910
 cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 2042 bytes
+stdout: 2045 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
 BSSID:C0:E2:BE:E8:EF:B6
 MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
+CHAN:44
+FREQ:5220 MHz
 RATE:54 Mb/s
 SIGNAL:92
 BARS:****
@@ -57156,8 +57724,8 @@ SSID:wlan0-ap-1
 SSID-HEX:776C616E302D61702D31
 BSSID:61:95:77:AC:1E:4C
 MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
+CHAN:6
+FREQ:2437 MHz
 RATE:54 Mb/s
 SIGNAL:81
 BARS:****
@@ -57173,8 +57741,8 @@ SSID:wlan0-ap-3
 SSID-HEX:776C616E302D61702D33
 BSSID:9B:F6:B7:EC:97:76
 MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
+CHAN:129
+FREQ:6595 MHz
 RATE:54 Mb/s
 SIGNAL:55
 BARS:**  
@@ -57206,20 +57774,21 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4
 
 
 <<<
-size: 751
+size: 772
 location: src/tests/client/test-client.py:test_004()/911
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 548 bytes
+stdout: 569 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
 BSSID:C0:E2:BE:E8:EF:B6
 MODE:Infra
-CHAN:1
-FREQ:2412 MHz
+CHAN:44
+BAND:5 GHz
+FREQ:5220 MHz
 RATE:54 Mbit/s
 BANDWIDTH:40 MHz
 SIGNAL:92
@@ -57235,20 +57804,21 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 <<<
-size: 775
+size: 796
 location: src/tests/client/test-client.py:test_004()/912
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 562 bytes
+stdout: 583 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
 BSSID:C0:E2:BE:E8:EF:B6
 MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
+CHAN:44
+BAND:5 GHz
+FREQ:5220 MHz
 RATE:54 Mb/s
 BANDWIDTH:40 MHz
 SIGNAL:92
@@ -57264,18 +57834,19 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 <<<
-size: 410
+size: 431
 location: src/tests/client/test-client.py:test_004()/913
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 204 bytes
+stdout: 225 bytes
 >>>
 IN-USE: 
 BSSID:C0:E2:BE:E8:EF:B6
 SSID:wlan0-ap-2
 MODE:Infra
-CHAN:1
+BAND:5 GHz
+CHAN:44
 RATE:54 Mbit/s
 SIGNAL:92
 BARS:****
@@ -57284,18 +57855,19 @@ SECURITY:WPA1 WPA2
 
 
 <<<
-size: 429
+size: 450
 location: src/tests/client/test-client.py:test_004()/914
 cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 213 bytes
+stdout: 234 bytes
 >>>
 IN-USE: 
 BSSID:C0:E2:BE:E8:EF:B6
 SSID:wlan0-ap-2
 MODE:Infrastruktura
-CHAN:1
+BAND:5 GHz
+CHAN:44
 RATE:54 Mb/s
 SIGNAL:92
 BARS:****
@@ -57304,20 +57876,20 @@ SECURITY:WPA1 WPA2
 
 
 <<<
-size: 838
+size: 839
 location: src/tests/client/test-client.py:test_004()/915
 cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
-stdout: 522 bytes
+stdout: 523 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
 BSSID:C0:E2:BE:E8:EF:B6
 MODE:Infra
-CHAN:1
-FREQ:2412 MHz
+CHAN:44
+FREQ:5220 MHz
 RATE:54 Mbit/s
 SIGNAL:92
 BARS:****
@@ -57332,20 +57904,20 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 <<<
-size: 860
+size: 861
 location: src/tests/client/test-client.py:test_004()/916
 cmd: $NMCLI --mode multiline --terse --color yes -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 534 bytes
+stdout: 535 bytes
 >>>
 NAME:AP[1]
 SSID:wlan0-ap-2
 SSID-HEX:776C616E302D61702D32
 BSSID:C0:E2:BE:E8:EF:B6
 MODE:Infrastruktura
-CHAN:1
-FREQ:2412 MHz
+CHAN:44
+FREQ:5220 MHz
 RATE:54 Mb/s
 SIGNAL:92
 BARS:****
@@ -57360,12 +57932,12 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2
 
 
 <<<
-size: 3321
+size: 3404
 location: src/tests/client/test-client.py:test_004()/917
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0
 lang: C
 returncode: 0
-stdout: 3140 bytes
+stdout: 3223 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -57419,7 +57991,8 @@ AP[1].IN-USE: 
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -57428,7 +58001,8 @@ AP[2].IN-USE: 
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -57437,7 +58011,8 @@ AP[3].IN-USE: 
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -57472,12 +58047,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 3358
+size: 3441
 location: src/tests/client/test-client.py:test_004()/918
 cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 3167 bytes
+stdout: 3250 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -57531,7 +58106,8 @@ AP[1].IN-USE: 
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -57540,7 +58116,8 @@ AP[2].IN-USE: 
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -57549,7 +58126,8 @@ AP[3].IN-USE: 
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -57650,12 +58228,12 @@ IP6.DOMAIN[5]:sear6.foo3.bar
 IP6.DOMAIN[6]:sear6.foo4.bar
 
 <<<
-size: 3353
+size: 3436
 location: src/tests/client/test-client.py:test_004()/921
 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: 3034 bytes
+stdout: 3117 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -57705,7 +58283,8 @@ AP[1].IN-USE: 
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infra
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mbit/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -57714,7 +58293,8 @@ AP[2].IN-USE: 
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infra
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mbit/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -57723,7 +58303,8 @@ AP[3].IN-USE: 
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infra
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mbit/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -57758,12 +58339,12 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/
 CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
 
 <<<
-size: 3390
+size: 3473
 location: src/tests/client/test-client.py:test_004()/922
 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: 3061 bytes
+stdout: 3144 bytes
 >>>
 GENERAL.DEVICE:wlan0
 GENERAL.TYPE:wifi
@@ -57813,7 +58394,8 @@ AP[1].IN-USE: 
 AP[1].BSSID:C0:E2:BE:E8:EF:B6
 AP[1].SSID:wlan0-ap-2
 AP[1].MODE:Infrastruktura
-AP[1].CHAN:1
+AP[1].BAND:5 GHz
+AP[1].CHAN:44
 AP[1].RATE:54 Mb/s
 AP[1].SIGNAL:92
 AP[1].BARS:****
@@ -57822,7 +58404,8 @@ AP[2].IN-USE: 
 AP[2].BSSID:61:95:77:AC:1E:4C
 AP[2].SSID:wlan0-ap-1
 AP[2].MODE:Infrastruktura
-AP[2].CHAN:1
+AP[2].BAND:2.4 GHz
+AP[2].CHAN:6
 AP[2].RATE:54 Mb/s
 AP[2].SIGNAL:81
 AP[2].BARS:****
@@ -57831,7 +58414,8 @@ AP[3].IN-USE: 
 AP[3].BSSID:9B:F6:B7:EC:97:76
 AP[3].SSID:wlan0-ap-3
 AP[3].MODE:Infrastruktura
-AP[3].CHAN:1
+AP[3].BAND:6 GHz
+AP[3].CHAN:129
 AP[3].RATE:54 Mb/s
 AP[3].SIGNAL:55
 AP[3].BARS:**  
@@ -58029,34 +58613,34 @@ wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedes
 wlan1   wifi      rozłączono  nieznane          nieznane          /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
 
 <<<
-size: 2074
+size: 2068
 location: src/tests/client/test-client.py:test_004()/932
 cmd: $NMCLI -f all connection show
 lang: C
 returncode: 0
-stdout: 1932 bytes
+stdout: 1926 bytes
 >>>
-NAME       UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE      ACTIVE-PATH                                         SLAVE  FILENAME                                         
-con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  vpn       0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  yes     wlan0   activated  /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/con-vpn-1 
-con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  yes     wlan0   activated  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/con-xx1   
-con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  yes     wlan0   activated  /org/freedesktop/NetworkManager/ActiveConnection/4  --     /etc/NetworkManager/system-connections/con-xx1   
-con-xx2    UUID-con-xx2-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth0    activated  /org/freedesktop/NetworkManager/ActiveConnection/3  --     /etc/NetworkManager/system-connections/con-xx2   
-con-1      5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --         --                                                  --     /etc/NetworkManager/system-connections/con-1     
+NAME       UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE      ACTIVE-PATH                                         PORT  FILENAME                                         
+con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  vpn       0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  yes     wlan0   activated  /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/con-vpn-1 
+con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  yes     wlan0   activated  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/con-xx1   
+con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  yes     wlan0   activated  /org/freedesktop/NetworkManager/ActiveConnection/4  --    /etc/NetworkManager/system-connections/con-xx1   
+con-xx2    UUID-con-xx2-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/4  yes     eth0    activated  /org/freedesktop/NetworkManager/ActiveConnection/3  --    /etc/NetworkManager/system-connections/con-xx2   
+con-1      5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --         --                                                  --    /etc/NetworkManager/system-connections/con-1     
 
 <<<
-size: 2090
+size: 2084
 location: src/tests/client/test-client.py:test_004()/933
 cmd: $NMCLI -f all connection show
 lang: pl_PL.UTF-8
 returncode: 0
-stdout: 1938 bytes
+stdout: 1932 bytes
 >>>
-NAME       UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE       ACTIVE-PATH                                         SLAVE  FILENAME                                         
-con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  vpn       0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  tak     wlan0   aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/2  --     /etc/NetworkManager/system-connections/con-vpn-1 
-con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  tak     wlan0   aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/1  --     /etc/NetworkManager/system-connections/con-xx1   
-con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  tak     wlan0   aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/4  --     /etc/NetworkManager/system-connections/con-xx1   
-con-xx2    UUID-con-xx2-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth0    aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/3  --     /etc/NetworkManager/system-connections/con-xx2   
-con-1      5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --          --                                                  --     /etc/NetworkManager/system-connections/con-1     
+NAME       UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE       ACTIVE-PATH                                         PORT  FILENAME                                         
+con-vpn-1  UUID-con-vpn-1-REPLACED-REPLACED-REP  vpn       0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  tak     wlan0   aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/2  --    /etc/NetworkManager/system-connections/con-vpn-1 
+con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  tak     wlan0   aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/1  --    /etc/NetworkManager/system-connections/con-xx1   
+con-xx1    UUID-con-xx1-REPLACED-REPLACED-REPLA  wifi      0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  tak     wlan0   aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/4  --    /etc/NetworkManager/system-connections/con-xx1   
+con-xx2    UUID-con-xx2-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/4  tak     eth0    aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/3  --    /etc/NetworkManager/system-connections/con-xx2   
+con-1      5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --          --                                                  --    /etc/NetworkManager/system-connections/con-1     
 
 <<<
 size: 359
diff --git a/src/tests/client/test-client.check-on-disk/test_005.expected b/src/tests/client/test-client.check-on-disk/test_005.expected
new file mode 100644
index 00000000..04f2f8ad
--- /dev/null
+++ b/src/tests/client/test-client.check-on-disk/test_005.expected
@@ -0,0 +1,15 @@
+size: 683
+location: src/tests/client/test-client.py:test_005()/1
+cmd: $NMCLI c add type ethernet ifname eth0 con-name con-xx1 ipv4.method manual ipv4.addresses 192.168.1.1/24 ipv4.gateway 192.168.2.1 ipv4.routes '192.168.4.4 192.168.4.1'
+lang: C
+returncode: 0
+stdout: 80 bytes
+>>>
+Connection 'con-xx1' (UUID-con-xx1-REPLACED-REPLACED-REPLA) successfully added.
+
+<<<
+stderr: 300 bytes
+>>>
+Warning: the following gateways are not directly reachable from any configured address or route: 192.168.2.1, 192.168.4.1. NetworkManager currently adds on-link routes for them automatically, but this will change in the future. Consider adding addresses or routes whose subnets cover these gateways.
+
+<<<
diff --git a/src/tests/client/test-client.py b/src/tests/client/test-client.py
index 6cf1924c..3d618e35 100755
--- a/src/tests/client/test-client.py
+++ b/src/tests/client/test-client.py
@@ -1557,9 +1557,9 @@ class TestNmcli(unittest.TestCase):
         # does not enforce the ifnames are unique.
         self.ctx.srv.op_AddObj("WifiDevice", ident="wlan1/x", iface="wlan1")
 
-        self.ctx.srv.op_AddObj("WifiAp", device="wlan0", rsnf=0x0)
+        self.ctx.srv.op_AddObj("WifiAp", device="wlan0", rsnf=0x0, freq=2437)
 
-        self.ctx.srv.op_AddObj("WifiAp", device="wlan0")
+        self.ctx.srv.op_AddObj("WifiAp", device="wlan0", freq=5220)
 
         NM_AP_FLAGS = getattr(NM, "80211ApSecurityFlags")
         rsnf = 0x0
@@ -1568,7 +1568,7 @@ class TestNmcli(unittest.TestCase):
         rsnf = rsnf | NM_AP_FLAGS.GROUP_TKIP
         rsnf = rsnf | NM_AP_FLAGS.GROUP_CCMP
         rsnf = rsnf | NM_AP_FLAGS.KEY_MGMT_SAE
-        self.ctx.srv.op_AddObj("WifiAp", device="wlan0", wpaf=0x0, rsnf=rsnf)
+        self.ctx.srv.op_AddObj("WifiAp", device="wlan0", wpaf=0x0, rsnf=rsnf, freq=6595)
 
         self.ctx.srv.op_AddObj("WifiAp", device="wlan1")
 
@@ -2222,6 +2222,41 @@ class TestNmcli(unittest.TestCase):
             replace_stdout=replace_uuids,
         )
 
+    @nm_test
+    def test_005(self):
+        self.init_001()
+
+        replace_uuids = []
+
+        replace_uuids.append(
+            self.ctx.srv.ReplaceTextConUuid(
+                "con-xx1", "UUID-con-xx1-REPLACED-REPLACED-REPLA"
+            )
+        )
+
+        # Check the warning about unreachable gateways
+        self.call_nmcli(
+            [
+                "c",
+                "add",
+                "type",
+                "ethernet",
+                "ifname",
+                "eth0",
+                "con-name",
+                "con-xx1",
+                "ipv4.method",
+                "manual",
+                "ipv4.addresses",
+                "192.168.1.1/24",
+                "ipv4.gateway",
+                "192.168.2.1",
+                "ipv4.routes",
+                "192.168.4.4 192.168.4.1",
+            ],
+            replace_stdout=replace_uuids,
+        )
+
     @nm_test_no_dbus
     def test_offline(self):
         # Make sure we're not using D-Bus