diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95b499c7179e..73dab8b3f1f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,7 @@ workflow: !reference [.workflow]
   variables:
     srpm_make_target: dist-srpm
     native_tools: 'true'
+    disttag_override: '.el10_3'
 
 .trigger_trusted_pipeline:
   extends: [.trusted, .10_common]
@@ -25,7 +26,7 @@ workflow: !reference [.workflow]
   trigger:
     branch: rhel10
   variables:
-    kcidb_tree_name: rhel-10
+    kcidb_tree_name: rhel-10.3
     builder_image: quay.io/cki/builder-rhel10
 
 .trigger_internal_compat_build_pipeline:
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index 8d63422715cf..9e084f347e34 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -52,7 +52,7 @@ DERIVATIVE_TAG ?=
 
 # This is the dist release suffix used in the package release, eg. .fc34,
 # .el8 etc. In a different branch this may be set to a fixed value.
-DIST ?= .el10
+DIST ?= .el10_3
 
 # This is a human readable distribution variable that is used to determine the
 # OS version (fedora, centos, or rhel).
@@ -205,4 +205,4 @@ UPSTREAMBUILD_GIT_ONLY ?=
 #  (when you give RHDISTGIT_BRANCH on the command line, in which case the Z
 #  number will be incremented instead of the Y).
 #
-ZSTREAM ?= no
+ZSTREAM ?= yes
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7
index ecbcb2c669af..5e6cd8bd45b2 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-0.rc5.6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=-p stream
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16-rc5
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
index c255c200a509..02a0be99848a 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
@@ -17,4 +17,5 @@
 %define specrelease 0.rc5.6%{?buildid}%{?dist}
 %define kabiversion 5.16.0-0.rc5.6.test.el7
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-0.rc5.6.test]
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25
index 96b4308461b4..d3c541f20d81 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-0.rc5.6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=-p stream
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16-rc5
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
index 20e1e7324e0d..42f0da33b885 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
@@ -17,4 +17,5 @@
 %define specrelease 0.rc5.6%{?buildid}%{?dist}
 %define kabiversion 5.16.0-0.rc5.6.test.fc25
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-0.rc5.6.test]
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7
index 704b1839e1c4..25aac28c0922 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=-p stream
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
index ba0aae6174be..4e32bdc43795 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
@@ -17,4 +17,5 @@
 %define specrelease 6%{?buildid}%{?dist}
 %define kabiversion 5.16.0-6.test.el7
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-6.test]
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25
index 0ace42a9282c..f7d50fba444f 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=-p stream
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
index 1e839aeb6a90..1eb35d503218 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
@@ -17,4 +17,5 @@
 %define specrelease 6%{?buildid}%{?dist}
 %define kabiversion 5.16.0-6.test.fc25
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-6.test]
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7
index 42634f19f86a..d63a0d0b161b 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.el7
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=-p stream
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7.spec b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
index ba0aae6174be..4e32bdc43795 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
@@ -17,4 +17,5 @@
 %define specrelease 6%{?buildid}%{?dist}
 %define kabiversion 5.16.0-6.test.el7
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-6.test]
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25 b/redhat/self-test/data/centos-df0cc57e057f.fc25
index 2d53a0a6d7f4..db0b00d4255e 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=-p stream
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
index 1e839aeb6a90..1eb35d503218 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
@@ -17,4 +17,5 @@
 %define specrelease 6%{?buildid}%{?dist}
 %define kabiversion 5.16.0-6.test.fc25
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-6.test]
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7 b/redhat/self-test/data/centos-fce15c45d3fb.el7
index 8adfc8797358..88d553749e19 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-0.rc5.6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=-p stream
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16-rc5
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
index c255c200a509..02a0be99848a 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
@@ -17,4 +17,5 @@
 %define specrelease 0.rc5.6%{?buildid}%{?dist}
 %define kabiversion 5.16.0-0.rc5.6.test.el7
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-0.rc5.6.test]
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25 b/redhat/self-test/data/centos-fce15c45d3fb.fc25
index 75b9dd0b3a75..50114c34eae3 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-0.rc5.6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=-p stream
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16-rc5
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
index 20e1e7324e0d..42f0da33b885 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
@@ -17,4 +17,5 @@
 %define specrelease 0.rc5.6%{?buildid}%{?dist}
 %define kabiversion 5.16.0-0.rc5.6.test.fc25
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-0.rc5.6.test]
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7 b/redhat/self-test/data/fedora-2585cf9dfaad.el7
index 5f287ff117e2..68f4dcc57933 100644
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-0.rc5.6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16-rc5
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
index d158c4879288..5443fd573707 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7.spec
@@ -17,4 +17,5 @@
 %define specrelease 0.rc5.6%{?buildid}%{?dist}
 %define kabiversion 5.16.0
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-0.rc5.6.test]
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25 b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
index fbda1e66af92..a3e42af257f8 100644
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-0.rc5.6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16-rc5
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
index d158c4879288..5443fd573707 100755
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec
@@ -17,4 +17,5 @@
 %define specrelease 0.rc5.6%{?buildid}%{?dist}
 %define kabiversion 5.16.0
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-0.rc5.6.test]
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7 b/redhat/self-test/data/fedora-78e36f3b0dae.el7
index e2e55568f3c4..399611f3ee92 100644
--- a/redhat/self-test/data/fedora-78e36f3b0dae.el7
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
index 85abba4cdf06..5212f2466aa1 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7.spec
@@ -17,4 +17,5 @@
 %define specrelease 6%{?buildid}%{?dist}
 %define kabiversion 5.16.0
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-6.test]
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25 b/redhat/self-test/data/fedora-78e36f3b0dae.fc25
index 714f9f36b9ed..11f23d4012c6 100644
--- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
index 85abba4cdf06..5212f2466aa1 100755
--- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec
@@ -17,4 +17,5 @@
 %define specrelease 6%{?buildid}%{?dist}
 %define kabiversion 5.16.0
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-6.test]
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7 b/redhat/self-test/data/fedora-df0cc57e057f.el7
index a2962bbb8556..efe2c7a254dc 100644
--- a/redhat/self-test/data/fedora-df0cc57e057f.el7
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
index 85abba4cdf06..5212f2466aa1 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7.spec
@@ -17,4 +17,5 @@
 %define specrelease 6%{?buildid}%{?dist}
 %define kabiversion 5.16.0
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-6.test]
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25 b/redhat/self-test/data/fedora-df0cc57e057f.fc25
index e15fae3c1b0d..7fb31e110f39 100644
--- a/redhat/self-test/data/fedora-df0cc57e057f.fc25
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
index 85abba4cdf06..5212f2466aa1 100755
--- a/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25.spec
@@ -17,4 +17,5 @@
 %define specrelease 6%{?buildid}%{?dist}
 %define kabiversion 5.16.0
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-6.test]
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7 b/redhat/self-test/data/fedora-fce15c45d3fb.el7
index c57a118ba23d..aae6c60f21d1 100644
--- a/redhat/self-test/data/fedora-fce15c45d3fb.el7
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-0.rc5.6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16-rc5
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
index d158c4879288..5443fd573707 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7.spec
@@ -17,4 +17,5 @@
 %define specrelease 0.rc5.6%{?buildid}%{?dist}
 %define kabiversion 5.16.0
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-0.rc5.6.test]
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25 b/redhat/self-test/data/fedora-fce15c45d3fb.fc25
index 1ef4065a6aae..61313832eeb3 100644
--- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-0.rc5.6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16-rc5
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
index d158c4879288..5443fd573707 100755
--- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec
@@ -17,4 +17,5 @@
 %define specrelease 0.rc5.6%{?buildid}%{?dist}
 %define kabiversion 5.16.0
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-0.rc5.6.test]
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7 b/redhat/self-test/data/rhel-2585cf9dfaad.el7
index 759ae6498d47..52db23ba451b 100644
--- a/redhat/self-test/data/rhel-2585cf9dfaad.el7
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-0.rc5.6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16-rc5
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
index c255c200a509..02a0be99848a 100755
--- a/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7.spec
@@ -17,4 +17,5 @@
 %define specrelease 0.rc5.6%{?buildid}%{?dist}
 %define kabiversion 5.16.0-0.rc5.6.test.el7
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-0.rc5.6.test]
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25 b/redhat/self-test/data/rhel-2585cf9dfaad.fc25
index 086833efb3e9..1e4dd746305f 100644
--- a/redhat/self-test/data/rhel-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-0.rc5.6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16-rc5
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
index 20e1e7324e0d..42f0da33b885 100755
--- a/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec
@@ -17,4 +17,5 @@
 %define specrelease 0.rc5.6%{?buildid}%{?dist}
 %define kabiversion 5.16.0-0.rc5.6.test.fc25
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-0.rc5.6.test]
diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.el7 b/redhat/self-test/data/rhel-78e36f3b0dae.el7
index be7fc4cb5da4..215c6582f72a 100644
--- a/redhat/self-test/data/rhel-78e36f3b0dae.el7
+++ b/redhat/self-test/data/rhel-78e36f3b0dae.el7
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec b/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
index ba0aae6174be..4e32bdc43795 100755
--- a/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/rhel-78e36f3b0dae.el7.spec
@@ -17,4 +17,5 @@
 %define specrelease 6%{?buildid}%{?dist}
 %define kabiversion 5.16.0-6.test.el7
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-6.test]
diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.fc25 b/redhat/self-test/data/rhel-78e36f3b0dae.fc25
index 71a96315304a..c31f901b6cda 100644
--- a/redhat/self-test/data/rhel-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/rhel-78e36f3b0dae.fc25
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec b/redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec
index 1e839aeb6a90..1eb35d503218 100755
--- a/redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec
@@ -17,4 +17,5 @@
 %define specrelease 6%{?buildid}%{?dist}
 %define kabiversion 5.16.0-6.test.fc25
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-6.test]
diff --git a/redhat/self-test/data/rhel-df0cc57e057f.el7 b/redhat/self-test/data/rhel-df0cc57e057f.el7
index 6f94b01dea45..96f58a7f0c9e 100644
--- a/redhat/self-test/data/rhel-df0cc57e057f.el7
+++ b/redhat/self-test/data/rhel-df0cc57e057f.el7
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/rhel-df0cc57e057f.el7.spec b/redhat/self-test/data/rhel-df0cc57e057f.el7.spec
index ba0aae6174be..4e32bdc43795 100755
--- a/redhat/self-test/data/rhel-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/rhel-df0cc57e057f.el7.spec
@@ -17,4 +17,5 @@
 %define specrelease 6%{?buildid}%{?dist}
 %define kabiversion 5.16.0-6.test.el7
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-6.test]
diff --git a/redhat/self-test/data/rhel-df0cc57e057f.fc25 b/redhat/self-test/data/rhel-df0cc57e057f.fc25
index 1ca77aac260c..5b3fa3c5b9f8 100644
--- a/redhat/self-test/data/rhel-df0cc57e057f.fc25
+++ b/redhat/self-test/data/rhel-df0cc57e057f.fc25
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/rhel-df0cc57e057f.fc25.spec b/redhat/self-test/data/rhel-df0cc57e057f.fc25.spec
index 1e839aeb6a90..1eb35d503218 100755
--- a/redhat/self-test/data/rhel-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/rhel-df0cc57e057f.fc25.spec
@@ -17,4 +17,5 @@
 %define specrelease 6%{?buildid}%{?dist}
 %define kabiversion 5.16.0-6.test.fc25
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-6.test]
diff --git a/redhat/self-test/data/rhel-fce15c45d3fb.el7 b/redhat/self-test/data/rhel-fce15c45d3fb.el7
index 040f06c0cc79..8e24bcaa9b17 100644
--- a/redhat/self-test/data/rhel-fce15c45d3fb.el7
+++ b/redhat/self-test/data/rhel-fce15c45d3fb.el7
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-0.rc5.6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16-rc5
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/rhel-fce15c45d3fb.el7.spec b/redhat/self-test/data/rhel-fce15c45d3fb.el7.spec
index c255c200a509..02a0be99848a 100755
--- a/redhat/self-test/data/rhel-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/rhel-fce15c45d3fb.el7.spec
@@ -17,4 +17,5 @@
 %define specrelease 0.rc5.6%{?buildid}%{?dist}
 %define kabiversion 5.16.0-0.rc5.6.test.el7
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-0.rc5.6.test]
diff --git a/redhat/self-test/data/rhel-fce15c45d3fb.fc25 b/redhat/self-test/data/rhel-fce15c45d3fb.fc25
index 2f659544ffff..078e9840a8c1 100644
--- a/redhat/self-test/data/rhel-fce15c45d3fb.fc25
+++ b/redhat/self-test/data/rhel-fce15c45d3fb.fc25
@@ -9,7 +9,7 @@ AUTOMOTIVE_PKG_DIST=.el10iv
 AUTOMOTIVE_PKG_NAME=kernel-automotive
 BASEVERSION=5.16.0-0.rc5.6.test
 BUILD=6
-BUILDOPTS=
+BUILDOPTS=+kabidupchk
 BUILD_FLAGS=
 BUILD_PROFILE=
 BUILD_PROFILE_USERDEF=
@@ -110,7 +110,7 @@ UPSTREAMBUILD_GIT_ONLY=
 UPSTREAM_BRANCH=v6.12
 UPSTREAM_TARBALL_NAME=5.16-rc5
 VERSION_ON_UPSTREAM=0
-YSTREAM_FLAG=yes
-ZSTREAM=no
-ZSTREAM_FLAG=no
+YSTREAM_FLAG=no
+ZSTREAM=yes
+ZSTREAM_FLAG=yes
 _OUTPUT=..
diff --git a/redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec b/redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec
index 20e1e7324e0d..42f0da33b885 100755
--- a/redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec
@@ -17,4 +17,5 @@
 %define specrelease 0.rc5.6%{?buildid}%{?dist}
 %define kabiversion 5.16.0-0.rc5.6.test.fc25
 %define selftests_must_build 0
+%define _with_kabidupchk 1
 Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16.0-0.rc5.6.test]