diff --git a/.files b/.files
index b819312..4cd7c21 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index fdd234e..ed937ea 100644
--- a/.rev
+++ b/.rev
@@ -18542,4 +18542,11 @@
     <user>staging-bot</user>
     <comment>Automatic update</comment>
   </revision>
+  <revision rev="2650" vrev="2650">
+    <srcmd5>92cc416d4bbbf5c9e488ffc279829998</srcmd5>
+    <version>unknown</version>
+    <time>1617786873</time>
+    <user>staging-bot</user>
+    <comment>Automatic update</comment>
+  </revision>
 </revisionlist>
diff --git a/MicroOS-dvd5-dvd-x86_64.kiwi b/MicroOS-dvd5-dvd-x86_64.kiwi
index 90c4dc4..06c5abe 100644
--- a/MicroOS-dvd5-dvd-x86_64.kiwi
+++ b/MicroOS-dvd5-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__MicroOS___20210401" schemaversion="4.1">
+<image name="OBS__MicroOS___20210406" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -35,11 +35,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20210401</productvar>
+      <productvar name="VERSION">20210406</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20210401,openSUSE MicroOS</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20210406,openSUSE MicroOS</productinfo>
       <productinfo name="LINGUAS">en_US </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20210401/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20210406/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
diff --git a/MicroOS-dvd5-kubic-dvd-x86_64.kiwi b/MicroOS-dvd5-kubic-dvd-x86_64.kiwi
index 2a12602..ff16095 100644
--- a/MicroOS-dvd5-kubic-dvd-x86_64.kiwi
+++ b/MicroOS-dvd5-kubic-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__MicroOS___20210401" schemaversion="4.1">
+<image name="OBS__MicroOS___20210406" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -35,11 +35,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20210401</productvar>
+      <productvar name="VERSION">20210406</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20210401,openSUSE MicroOS</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20210406,openSUSE MicroOS</productinfo>
       <productinfo name="LINGUAS">en_US </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20210401/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20210406/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
@@ -326,6 +326,7 @@
       <repopackage name="libmpath0" arch="x86_64"/>
       <repopackage name="libmspack0" arch="x86_64"/>
       <repopackage name="libncurses6"/>
+      <repopackage name="libndctl6" arch="x86_64"/>
       <repopackage name="libnetfilter_conntrack3" arch="x86_64"/>
       <repopackage name="libnetfilter_cthelper0" arch="x86_64"/>
       <repopackage name="libnetfilter_cttimeout1" arch="x86_64"/>
@@ -353,6 +354,8 @@
       <repopackage name="libpeas-1_0-0" arch="x86_64"/>
       <repopackage name="libpgm-5_2-0" arch="x86_64"/>
       <repopackage name="libpkgconf3"/>
+      <repopackage name="libpmem1" arch="x86_64"/>
+      <repopackage name="libpmemobj1" arch="x86_64"/>
       <repopackage name="libpng16-16" arch="x86_64"/>
       <repopackage name="libpolkit0" arch="x86_64"/>
       <repopackage name="libpopt0"/>
diff --git a/MicroOS.product b/MicroOS.product
index 7af89ab..cb5363f 100644
--- a/MicroOS.product
+++ b/MicroOS.product
@@ -6,7 +6,7 @@
       <name>MicroOS</name>
       <releasepkgname>MicroOS-release</releasepkgname>
       <endoflife/>
-      <version>20210401</version>
+      <version>20210406</version>
       <!-- release is no longer optional -->
       <release>0</release>
       <productline>MicroOS</productline>
diff --git a/defaults-conditionals.include b/defaults-conditionals.include
index 663cb60..e24da1f 100644
--- a/defaults-conditionals.include
+++ b/defaults-conditionals.include
@@ -18,6 +18,9 @@
         <conditional name="only_aarch64">
                 <platform arch="aarch64" />
         </conditional>
+        <conditional name="only_armv7l">
+                <platform arch="armv7l" />
+        </conditional>
         <conditional name="only_ppc64">
                 <platform arch="ppc64" />
         </conditional>
diff --git a/dvd.group b/dvd.group
index dd35f6c..42d29cc 100644
--- a/dvd.group
+++ b/dvd.group
@@ -197,7 +197,7 @@
     <package name="bind" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-dhcp_dns_server -->
     <package name="bind-doc" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-dhcp_dns_server -->
     <package name="bind-utils" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="binutils" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
+    <package name="binutils" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="biosdevname" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="bitstream-vera-fonts" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="blinken" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_edutainment -->
@@ -229,7 +229,7 @@
     <package name="breeze5-style" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="breeze5-style-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="breeze5-wallpapers" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
-    <package name="breezy" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="breezy" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="brltty" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="brltty-driver-at-spi2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="brltty-driver-brlapi" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -242,17 +242,19 @@
     <package name="btrfsprogs-udev-rules" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="bubblewrap" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="busybox" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
+    <package name="busybox-bzip2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="busybox-coreutils" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-sw_management -->
     <package name="busybox-findutils" supportstatus="unsupported"/> <!-- reason: dvd:arabic-fonts -->
     <package name="busybox-gawk" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
     <package name="busybox-grep" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="busybox-gzip" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="busybox-patch" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="busybox-patch" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="busybox-psmisc" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="busybox-sed" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="busybox-sendmail" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="busybox-static" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="busybox-tar" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
+    <package name="busybox-unzip" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="busybox-xz" supportstatus="unsupported"/> <!-- reason: dvd:openSUSE-release -->
     <package name="bzip2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="ca-certificates" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -334,8 +336,8 @@
     <package name="cups-pk-helper" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="cups-pk-helper-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="curl" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="cvs" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="cvsps" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="cvs" supportstatus="unsupported"/> <!-- reason: dvd:git -->
+    <package name="cvsps" supportstatus="unsupported"/> <!-- reason: dvd:git -->
     <package name="cyreal-lobster-cyrillic-fonts" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="cyrus-sasl" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="cyrus-sasl-crammd5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
@@ -520,7 +522,7 @@
     <package name="firewalld-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="flac" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="flatpak" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="flatpak-builder" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="flatpak-builder" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="flute" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="folks-data" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="folks-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -603,11 +605,11 @@
     <package name="gio-branding-openSUSE" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="girepository-1_0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="git" supportstatus="unsupported"/> <!-- reason: dvd:git -->
-    <package name="git-core" supportstatus="unsupported"/> <!-- reason: dvd:git -->
-    <package name="git-cvs" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="git-core" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
+    <package name="git-cvs" supportstatus="unsupported"/> <!-- reason: dvd:git -->
     <package name="git-email" supportstatus="unsupported"/> <!-- reason: dvd:git -->
     <package name="git-gui" supportstatus="unsupported"/> <!-- reason: dvd:git -->
-    <package name="git-svn" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="git-svn" supportstatus="unsupported"/> <!-- reason: dvd:git -->
     <package name="git-web" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="gitg" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="gitg-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
@@ -1346,7 +1348,7 @@
     <package name="lame" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="ldns" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="lensfun-data" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="less" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
+    <package name="less" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="lftp" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="lhasa" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="libAnalitza5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_edutainment -->
@@ -1743,9 +1745,9 @@
     <package name="libcanberra0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libcap-ng0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libcap2" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="libcares2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
+    <package name="libcares2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="libcblas3" supportstatus="unsupported"/> <!-- reason: dvd:salt-master -->
-    <package name="libcbor0_8" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
+    <package name="libcbor0_8" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="libccolamd2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libcdda_interface0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libcdda_paranoia0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -1800,8 +1802,8 @@
     <package name="libcryptui-data" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libcryptui-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libcryptui0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="libctf-nobfd0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
-    <package name="libctf0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
+    <package name="libctf-nobfd0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
+    <package name="libctf0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="libcue2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libcups2" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libcupsimage2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -1880,7 +1882,7 @@
     <package name="libespeak-ng1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libestr0" supportstatus="unsupported"/> <!-- reason: dvd:rsyslog -->
     <package name="libetonyek-0_1-1" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="libev4" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="libev4" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="libevdev-tools" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libevdev2" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libevdocument3-4" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -1906,8 +1908,8 @@
     <package name="libffi8" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libfftw3-3" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libfftw3_threads3" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="libfido2-1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
-    <package name="libfido2-udev" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
+    <package name="libfido2-1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
+    <package name="libfido2-udev" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="libfile1_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libfind4_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libfl2" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -2620,7 +2622,7 @@
     <package name="libserf-1-1" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libserializer" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libsgutils2-1_45-2" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="libsha1detectcoll1" supportstatus="unsupported"/> <!-- reason: dvd:git -->
+    <package name="libsha1detectcoll1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="libshaderc_shared1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="libshout3" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="libsigc-2_0-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -2997,8 +2999,6 @@
     <package name="mdadm" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="mdevctl" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-xen_server -->
     <package name="media-player-info" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
-    <package name="meld" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="meld-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="memcached" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="memtest86+" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="menulibre" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
@@ -3200,8 +3200,8 @@
     <package name="openslp-server" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="openssh" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="openssh-askpass-gnome" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
-    <package name="openssh-clients" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
-    <package name="openssh-common" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
+    <package name="openssh-clients" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
+    <package name="openssh-common" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="openssh-server" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="openssl-1_1" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="opensuse-welcome" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
@@ -3242,7 +3242,6 @@
     <package name="parole-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
     <package name="parted" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="parted-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
-    <package name="patch" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="patterns-base-apparmor" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-apparmor -->
     <package name="patterns-base-base" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="patterns-base-basesystem" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -3345,9 +3344,9 @@
     <package name="perl-Crypt-OpenSSL-Random" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="perl-Crypt-Rijndael" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="perl-Crypt-SmbHash" supportstatus="unsupported"/> <!-- reason: dvd:patterns-yast-yast2_server -->
-    <package name="perl-DBD-SQLite" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="perl-DBD-SQLite" supportstatus="unsupported"/> <!-- reason: dvd:git -->
     <package name="perl-DBD-mysql" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="perl-DBI" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="perl-DBI" supportstatus="unsupported"/> <!-- reason: dvd:git -->
     <package name="perl-Data-Validate-IP" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="perl-Date-Manip" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="perl-Digest-HMAC" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
@@ -3356,7 +3355,7 @@
     <package name="perl-Encode" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="perl-Encode-Detect" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="perl-Encode-Locale" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="perl-Error" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
+    <package name="perl-Error" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="perl-Expect" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="perl-Exporter-Tiny" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="perl-File-Listing" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -3650,10 +3649,10 @@
     <package name="python38-appdirs" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="python38-argon2-cffi" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="python38-asn1crypto" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="python38-async_generator" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
+    <package name="python38-async_generator" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python38-atpublic" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="python38-atspi" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="python38-attrs" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
+    <package name="python38-attrs" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python38-authheaders" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="python38-authres" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="python38-base" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -3665,7 +3664,7 @@
     <package name="python38-chardet" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python38-click" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="python38-cmdln" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="python38-configobj" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
+    <package name="python38-configobj" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python38-constantly" supportstatus="unsupported"/> <!-- reason: dvd:salt-master -->
     <package name="python38-cryptography" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python38-cssselect" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
@@ -3675,24 +3674,24 @@
     <package name="python38-decorator" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="python38-distro" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
     <package name="python38-dkimpy" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
-    <package name="python38-dnspython" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
-    <package name="python38-dulwich" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="python38-ecdsa" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
+    <package name="python38-dnspython" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
+    <package name="python38-dulwich" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
+    <package name="python38-ecdsa" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python38-falcon" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
-    <package name="python38-fastimport" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="python38-fastimport" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python38-flufl.bounce" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="python38-flufl.i18n" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="python38-flufl.lock" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="python38-future" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="python38-gevent" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="python38-geventhttpclient" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="python38-gevent" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
+    <package name="python38-geventhttpclient" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python38-gmpy" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="python38-gmpy2" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="python38-gobject" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="python38-gobject-Gdk" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="python38-gobject-cairo" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="python38-gpg" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="python38-greenlet" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="python38-gpg" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
+    <package name="python38-greenlet" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python38-gst" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="python38-gunicorn" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="python38-h2" supportstatus="unsupported"/> <!-- reason: dvd:salt-master -->
@@ -3730,17 +3729,17 @@
     <package name="python38-numpy" supportstatus="unsupported"/> <!-- reason: dvd:salt-master -->
     <package name="python38-olefile" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="python38-ordered-set" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="python38-outcome" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
+    <package name="python38-outcome" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python38-packaging" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="python38-pandas" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="python38-parso" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python38-passlib" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
-    <package name="python38-patiencediff" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="python38-patiencediff" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python38-pexpect" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
     <package name="python38-pip" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="python38-ply" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python38-protobuf" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="python38-psutil" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-apparmor -->
+    <package name="python38-psutil" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python38-ptyprocess" supportstatus="unsupported"/> <!-- reason: dvd:patterns-xfce-xfce -->
     <package name="python38-publicsuffix2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="python38-py" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -3751,7 +3750,7 @@
     <package name="python38-pycairo" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python38-pycares" supportstatus="unsupported"/> <!-- reason: dvd:salt-master -->
     <package name="python38-pycparser" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="python38-pycryptodome" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
+    <package name="python38-pycryptodome" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python38-pycups" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python38-pycurl" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python38-pydot" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
@@ -3776,7 +3775,7 @@
     <package name="python38-redis" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="python38-reportlab" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="python38-requests" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="python38-requests-toolbelt" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
+    <package name="python38-requests-toolbelt" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python38-rpm" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="python38-scipy" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="python38-scour" supportstatus="unsupported"/> <!-- reason: dvd:inkscape -->
@@ -3790,11 +3789,11 @@
     <package name="python38-six" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="python38-slip" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="python38-slip-dbus" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
-    <package name="python38-sniffio" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
-    <package name="python38-sortedcontainers" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
+    <package name="python38-sniffio" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
+    <package name="python38-sortedcontainers" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python38-tk" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="python38-tornado6" supportstatus="unsupported"/> <!-- reason: dvd:salt-master -->
-    <package name="python38-trio" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
+    <package name="python38-trio" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python38-typing_extensions" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="python38-urllib3" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="python38-urwid" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -3803,10 +3802,10 @@
     <package name="python38-zope.configuration" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="python38-zope.deferredimport" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="python38-zope.deprecation" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
-    <package name="python38-zope.event" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
+    <package name="python38-zope.event" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python38-zope.hookable" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="python38-zope.i18nmessageid" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
-    <package name="python38-zope.interface" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
+    <package name="python38-zope.interface" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="python38-zope.proxy" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="python38-zope.schema" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-mail_server -->
     <package name="python38-zypp-plugin" supportstatus="unsupported"/> <!-- reason: dvd:salt-master -->
@@ -4055,7 +4054,6 @@
     <package name="ruby2.7-rubygem-kramdown" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="ruby2.7-rubygem-kramdown-parser-gfm" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="ruby2.7-rubygem-launchy" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="ruby2.7-rubygem-libyui-rake" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="ruby2.7-rubygem-lightbox2" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="ruby2.7-rubygem-liquid" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="ruby2.7-rubygem-liquid-4" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
@@ -4440,7 +4438,7 @@
     <package name="subversion" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
     <package name="subversion-bash-completion" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
     <package name="subversion-doc" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="subversion-perl" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="subversion-perl" supportstatus="unsupported"/> <!-- reason: dvd:git -->
     <package name="subversion-server" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="subversion-tools" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="sudo" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
@@ -4520,8 +4518,8 @@
     <package name="tar-rmt" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome_ide -->
     <package name="tcl" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="tcpdump" supportstatus="unsupported"/> <!-- reason: dvd:patterns-network-network_admin -->
-    <package name="tcsh" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="tcsh-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="tcsh" supportstatus="unsupported"/> <!-- reason: dvd:git -->
+    <package name="tcsh-lang" supportstatus="unsupported"/> <!-- reason: dvd:git -->
     <package name="technisat-usb2-firmware" supportstatus="unsupported"/> <!-- reason: dvd:technisat-usb2-firmware -->
     <package name="telepathy-idle" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="telepathy-logger" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -4654,7 +4652,6 @@
     <package name="typelib-1_0-GstVideo-1_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-Gtk-3_0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="typelib-1_0-GtkClutter-1_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="typelib-1_0-GtkSource-3_0" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="typelib-1_0-GtkSource-4" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-Handy-1_0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="typelib-1_0-HarfBuzz-0_0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -5309,6 +5306,7 @@
     <package name="libpixman-1-0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libpixman-1-0-devel" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libpmem1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
+    <package name="libpmemobj1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-kvm_server -->
     <package name="libpng12-0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libpng16-16-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libpopt0-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
@@ -5399,6 +5397,7 @@
     <package name="pam_mount-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="pam_pwquality-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="pam_ssh-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="patch" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="patterns-server-xen_server" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-xen_server -->
     <package name="pcfclock-kmp-default" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="perl-Class-Inspector" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
diff --git a/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi b/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi
index c02f278..c9dfa24 100644
--- a/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi
+++ b/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE-Addon-NonOss___20210401" schemaversion="4.1">
+<image name="OBS__openSUSE-Addon-NonOss___20210406" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -36,11 +36,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20210401</productvar>
+      <productvar name="VERSION">20210406</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20210401,openSUSE NonOSS Addon</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20210406,openSUSE NonOSS Addon</productinfo>
       <productinfo name="LINGUAS">af ar be_BY bg br ca cy el et ga gl gu_IN he hi_IN hr ka km ko lt mk nn pa_IN rw sk sl sr_CS ss st tg th tr uk ve vi xh zu </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20210401/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20210401/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20210406/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20210406/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
diff --git a/openSUSE-Addon-NonOss.product b/openSUSE-Addon-NonOss.product
index 1eb2197..e23282a 100644
--- a/openSUSE-Addon-NonOss.product
+++ b/openSUSE-Addon-NonOss.product
@@ -4,7 +4,7 @@
  <product>
         <vendor>openSUSE</vendor>
         <name>openSUSE-Addon-NonOss</name>
-        <version>20210401</version>
+        <version>20210406</version>
         <release>0</release> 
         <summary>openSUSE NonOSS Addon</summary>
         <shortsummary>non oss addon</shortsummary>
diff --git a/openSUSE-cd-mini-i586.kiwi b/openSUSE-cd-mini-i586.kiwi
index 3df887d..72a71cf 100644
--- a/openSUSE-cd-mini-i586.kiwi
+++ b/openSUSE-cd-mini-i586.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20210401" schemaversion="4.1">
+<image name="OBS__openSUSE___20210406" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -32,11 +32,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20210401</productvar>
+      <productvar name="VERSION">20210406</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210401,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210406,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210401/i586</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210406/i586</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
diff --git a/openSUSE-cd-mini-x86_64.kiwi b/openSUSE-cd-mini-x86_64.kiwi
index f367869..fc31841 100644
--- a/openSUSE-cd-mini-x86_64.kiwi
+++ b/openSUSE-cd-mini-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20210401" schemaversion="4.1">
+<image name="OBS__openSUSE___20210406" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -35,11 +35,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20210401</productvar>
+      <productvar name="VERSION">20210406</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210401,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210406,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210401/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210406/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index 072a35c..976f2f4 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20210401" schemaversion="4.1">
+<image name="OBS__openSUSE___20210406" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -32,11 +32,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20210401</productvar>
+      <productvar name="VERSION">20210406</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210401,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210406,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210401/i586</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210406/i586</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
@@ -242,6 +242,7 @@
       <repopackage name="btrfsprogs-udev-rules"/>
       <repopackage name="bubblewrap"/>
       <repopackage name="busybox"/>
+      <repopackage name="busybox-bzip2"/>
       <repopackage name="busybox-coreutils"/>
       <repopackage name="busybox-findutils"/>
       <repopackage name="busybox-gawk"/>
@@ -253,6 +254,7 @@
       <repopackage name="busybox-sendmail"/>
       <repopackage name="busybox-static"/>
       <repopackage name="busybox-tar"/>
+      <repopackage name="busybox-unzip"/>
       <repopackage name="busybox-xz"/>
       <repopackage name="bzip2"/>
       <repopackage name="ca-certificates"/>
@@ -3003,8 +3005,6 @@
       <repopackage name="mdadm"/>
       <repopackage name="mdevctl"/>
       <repopackage name="media-player-info"/>
-      <repopackage name="meld"/>
-      <repopackage name="meld-lang"/>
       <repopackage name="memcached"/>
       <repopackage name="memtest86+"/>
       <repopackage name="menulibre"/>
@@ -3295,7 +3295,6 @@
       <repopackage name="parole-lang"/>
       <repopackage name="parted"/>
       <repopackage name="parted-lang"/>
-      <repopackage name="patch"/>
       <repopackage name="patterns-base-apparmor"/>
       <repopackage name="patterns-base-base"/>
       <repopackage name="patterns-base-basesystem"/>
@@ -4107,7 +4106,6 @@
       <repopackage name="ruby2.7-rubygem-kramdown"/>
       <repopackage name="ruby2.7-rubygem-kramdown-parser-gfm"/>
       <repopackage name="ruby2.7-rubygem-launchy"/>
-      <repopackage name="ruby2.7-rubygem-libyui-rake"/>
       <repopackage name="ruby2.7-rubygem-lightbox2"/>
       <repopackage name="ruby2.7-rubygem-liquid"/>
       <repopackage name="ruby2.7-rubygem-liquid-4"/>
@@ -4705,7 +4703,6 @@
       <repopackage name="typelib-1_0-GstVideo-1_0"/>
       <repopackage name="typelib-1_0-Gtk-3_0"/>
       <repopackage name="typelib-1_0-GtkClutter-1_0"/>
-      <repopackage name="typelib-1_0-GtkSource-3_0"/>
       <repopackage name="typelib-1_0-GtkSource-4"/>
       <repopackage name="typelib-1_0-GWeather-3_0"/>
       <repopackage name="typelib-1_0-Handy-1_0"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index cf7dd09..3d690c6 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20210401" schemaversion="4.1">
+<image name="OBS__openSUSE___20210406" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -35,11 +35,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20210401</productvar>
+      <productvar name="VERSION">20210406</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210401,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210406,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210401/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210406/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
@@ -260,6 +260,7 @@
       <repopackage name="btrfsprogs-udev-rules"/>
       <repopackage name="bubblewrap"/>
       <repopackage name="busybox"/>
+      <repopackage name="busybox-bzip2"/>
       <repopackage name="busybox-coreutils"/>
       <repopackage name="busybox-findutils"/>
       <repopackage name="busybox-gawk"/>
@@ -271,6 +272,7 @@
       <repopackage name="busybox-sendmail"/>
       <repopackage name="busybox-static"/>
       <repopackage name="busybox-tar"/>
+      <repopackage name="busybox-unzip"/>
       <repopackage name="busybox-xz"/>
       <repopackage name="bzip2"/>
       <repopackage name="ca-certificates"/>
@@ -2534,6 +2536,7 @@
       <repopackage name="libply-splash-graphics5"/>
       <repopackage name="libply5"/>
       <repopackage name="libpmem1" arch="x86_64"/>
+      <repopackage name="libpmemobj1" arch="x86_64"/>
       <repopackage name="libpng12-0-32bit" arch="x86_64"/>
       <repopackage name="libpng16-16"/>
       <repopackage name="libpng16-16-32bit" arch="x86_64"/>
@@ -3282,8 +3285,6 @@
       <repopackage name="mdadm"/>
       <repopackage name="mdevctl"/>
       <repopackage name="media-player-info"/>
-      <repopackage name="meld"/>
-      <repopackage name="meld-lang"/>
       <repopackage name="memcached"/>
       <repopackage name="memtest86+"/>
       <repopackage name="menulibre"/>
@@ -3594,7 +3595,7 @@
       <repopackage name="parole-lang"/>
       <repopackage name="parted"/>
       <repopackage name="parted-lang"/>
-      <repopackage name="patch"/>
+      <repopackage name="patch" arch="x86_64"/>
       <repopackage name="patterns-base-apparmor"/>
       <repopackage name="patterns-base-base"/>
       <repopackage name="patterns-base-basesystem"/>
@@ -4431,7 +4432,6 @@
       <repopackage name="ruby2.7-rubygem-kramdown"/>
       <repopackage name="ruby2.7-rubygem-kramdown-parser-gfm"/>
       <repopackage name="ruby2.7-rubygem-launchy"/>
-      <repopackage name="ruby2.7-rubygem-libyui-rake"/>
       <repopackage name="ruby2.7-rubygem-lightbox2"/>
       <repopackage name="ruby2.7-rubygem-liquid"/>
       <repopackage name="ruby2.7-rubygem-liquid-4"/>
@@ -5039,7 +5039,6 @@
       <repopackage name="typelib-1_0-GstVideo-1_0"/>
       <repopackage name="typelib-1_0-Gtk-3_0"/>
       <repopackage name="typelib-1_0-GtkClutter-1_0"/>
-      <repopackage name="typelib-1_0-GtkSource-3_0"/>
       <repopackage name="typelib-1_0-GtkSource-4"/>
       <repopackage name="typelib-1_0-GWeather-3_0"/>
       <repopackage name="typelib-1_0-Handy-1_0"/>
diff --git a/openSUSE-ftp-ftp-i586_x86_64.kiwi b/openSUSE-ftp-ftp-i586_x86_64.kiwi
index a2f608a..7b6d321 100644
--- a/openSUSE-ftp-ftp-i586_x86_64.kiwi
+++ b/openSUSE-ftp-ftp-i586_x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20210401" schemaversion="4.1">
+<image name="OBS__openSUSE___20210406" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -24,7 +24,7 @@
       <productvar name="DISTNAME">openSUSE</productvar>
       <productvar name="FLAVOR">ftp</productvar>
       <productvar name="MAKE_LISTINGS">true</productvar>
-      <productvar name="MEDIUM_NAME">openSUSE-20210401-i586-x86_64</productvar>
+      <productvar name="MEDIUM_NAME">openSUSE-20210406-i586-x86_64</productvar>
       <productvar name="MULTIPLE_MEDIA">true</productvar>
       <productvar name="PRODUCT_DIR">/</productvar>
       <productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar>
@@ -36,11 +36,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20210401</productvar>
+      <productvar name="VERSION">20210406</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210401,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210406,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210401/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210401/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210406/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210406/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="DEBUGMEDIUM">2</productoption>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
diff --git a/openSUSE.product b/openSUSE.product
index bde653d..9942b3c 100644
--- a/openSUSE.product
+++ b/openSUSE.product
@@ -4,7 +4,7 @@
     <product>
       <vendor>openSUSE</vendor>
       <name>openSUSE</name>
-      <version>20210401</version>
+      <version>20210406</version>
       <release>0</release>
 
       <productline>openSUSE</productline>
diff --git a/opensuse_kubic.group b/opensuse_kubic.group
index 1024847..a53b572 100644
--- a/opensuse_kubic.group
+++ b/opensuse_kubic.group
@@ -329,8 +329,8 @@
     <package name="libhugetlbfs" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-onlyDVD -->
     <package name="libibverbs" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="libibverbs1" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
-    <package name="libicu68" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-base-packagekit -->
-    <package name="libicu68-ledata" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-base-packagekit -->
+    <package name="libicu68" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
+    <package name="libicu68-ledata" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="libimaevm2" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-ima_evm -->
     <package name="libini_config5" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-sssd_ldap -->
     <package name="libinih0" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-onlyDVD -->
@@ -354,6 +354,7 @@
     <package name="libmozjs-78-0" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-base-packagekit -->
     <package name="libmpath0" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-onlyDVD -->
     <package name="libmspack0" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-onlyDVD -->
+    <package name="libndctl6" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="libnetfilter_conntrack3" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="libnetfilter_cthelper0" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="libnetfilter_cttimeout1" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
@@ -375,6 +376,8 @@
     <package name="libpciaccess0" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-hardware -->
     <package name="libpeas-1_0-0" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-base-microdnf -->
     <package name="libpgm-5_2-0" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubic_worker -->
+    <package name="libpmem1" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
+    <package name="libpmemobj1" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="libpng16-16" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="libpolkit0" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-base-packagekit -->
     <package name="libprocps8" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
diff --git a/unsorted.yml b/unsorted.yml
index 72d1e27..fd8e327 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -1540,7 +1540,6 @@ unsorted:
   - busybox-attr 
   - busybox-bc 
   - busybox-bind-utils 
-  - busybox-bzip2 
   - busybox-cpio 
   - busybox-diffutils 
   - busybox-dos2unix 
@@ -1571,7 +1570,6 @@ unsorted:
   - busybox-time 
   - busybox-traceroute 
   - busybox-tunctl 
-  - busybox-unzip 
   - busybox-util-linux 
   - busybox-vi 
   - busybox-vlan 
@@ -7541,6 +7539,7 @@ unsorted:
   - kamoso-lang 
   - kanidm: [x86_64] 
   - kanidm-clients: [x86_64] 
+  - kanidm-docs: [x86_64] 
   - kanidm-server: [x86_64] 
   - kanidm-unixd-clients: [x86_64] 
   - kanjipad 
@@ -8678,10 +8677,8 @@ unsorted:
   - libOpenColorIO1 
   - libOpenIPMI0 
   - libOpenImageDenoise0: [x86_64] 
-  - libOpenImageIO2_1: [i586] 
-  - libOpenImageIO2_2: [x86_64] 
-  - libOpenImageIO_Util2_1: [i586] 
-  - libOpenImageIO_Util2_2: [x86_64] 
+  - libOpenImageIO2_2 
+  - libOpenImageIO_Util2_2 
   - libOpenSceneGraph-devel 
   - libOpenSceneGraph131 
   - libOpenSceneGraph131-devel 
@@ -9124,7 +9121,7 @@ unsorted:
   - libXxf86vm-devel 
   - libXxf86vm-devel-32bit: [x86_64] 
   - libXxf86vm1-32bit: [x86_64] 
-  - libYODA-1_8_5 
+  - libYODA-1_9_0 
   - libZXing1-32bit: [x86_64] 
   - liba2ps1 
   - liba52-0-32bit: [x86_64] 
@@ -9237,7 +9234,7 @@ unsorted:
   - libantlr3c3 
   - libantlr3c3-32bit: [x86_64] 
   - libantlr4-runtime-devel 
-  - libantlr4-runtime4_9_1 
+  - libantlr4-runtime4_9_2 
   - libao-devel 
   - libao-plugins4-32bit: [x86_64] 
   - libao4-32bit: [x86_64] 
@@ -9740,7 +9737,9 @@ unsorted:
   - libcelt-devel-32bit: [x86_64] 
   - libcelt0-2-32bit: [x86_64] 
   - libcelt051-0 
-  - libcephfs-devel: [x86_64] # devel package of dvd:librbd1 
+  - libcephfs-devel: [x86_64] # devel package of dvd:librados2 
+  - libcephsqlite: [x86_64] 
+  - libcephsqlite-devel: [x86_64] # devel package of dvd:librados2 
   - libceres-devel 
   - libceres2 
   - libcerf-devel 
@@ -9933,6 +9932,7 @@ unsorted:
   - libcrystalhd3 
   - libcrystalhd3-32bit: [x86_64] 
   - libcsirocsa0 
+  - libcsironn0 
   - libcsnd6-6_0 
   - libcsound64-6_0 
   - libcsparse3 
@@ -10101,7 +10101,7 @@ unsorted:
   - libdnf-plugin-txnupd: [i586] 
   - libdnf-repo-config-zypp: [i586] 
   - libdnf2: [i586] 
-  - libdnnl1: [x86_64] 
+  - libdnnl2: [x86_64] 
   - libdns1611-32bit: [x86_64] 
   - libdns_sd 
   - libdns_sd-32bit: [x86_64] 
@@ -10644,6 +10644,7 @@ unsorted:
   - libglfw-devel 
   - libglfw2 
   - libglfw3 
+  - libglfw3-wayland 
   - libglib-testing-0-0 
   - libglib-testing-devel 
   - libglibmm-2_4-1-32bit: [x86_64] 
@@ -12494,18 +12495,17 @@ unsorted:
   - libplplotfortran0 
   - libplplotqt2 
   - libplplotwxwidgets1 
-  - libpmem-devel: [x86_64] # devel package of dvd:pmdk 
-  - libpmemblk-devel: [x86_64] # devel package of dvd:pmdk 
+  - libpmem-devel: [x86_64] # devel package of dvd:libpmemobj1 
+  - libpmemblk-devel: [x86_64] # devel package of dvd:libpmemobj1 
   - libpmemblk1: [x86_64] 
   - libpmemkv1: [x86_64] 
   - libpmemkv_json_config1: [x86_64] 
-  - libpmemlog-devel: [x86_64] # devel package of dvd:pmdk 
+  - libpmemlog-devel: [x86_64] # devel package of dvd:libpmemobj1 
   - libpmemlog1: [x86_64] 
   - libpmemobj-cpp-devel: [x86_64] 
   - libpmemobj-cpp-devel-doc: [x86_64] 
-  - libpmemobj-devel: [x86_64] # devel package of dvd:pmdk 
-  - libpmemobj1: [x86_64] 
-  - libpmempool-devel: [x86_64] # devel package of dvd:pmdk 
+  - libpmemobj-devel: [x86_64] # devel package of dvd:libpmemobj1 
+  - libpmempool-devel: [x86_64] # devel package of dvd:libpmemobj1 
   - libpmempool1: [x86_64] 
   - libpmi0: [x86_64] 
   - libpmix2: [x86_64] 
@@ -12896,8 +12896,8 @@ unsorted:
   - librabbitmq-devel 
   - librabbitmq4 
   - libradcli5 
-  - librados-devel: [x86_64] # devel package of dvd:librbd1 
-  - libradospp-devel: [x86_64] # devel package of dvd:librbd1 
+  - librados-devel: [x86_64] # devel package of dvd:librados2 
+  - libradospp-devel: [x86_64] # devel package of dvd:librados2 
   - libraft0 
   - libragel0 
   - libraptor-devel 
@@ -12921,7 +12921,7 @@ unsorted:
   - libraw1394-tools 
   - libraw20-32bit: [x86_64] 
   - libraylib351 
-  - librbd-devel: [x86_64] # devel package of dvd:librbd1 
+  - librbd-devel: [x86_64] # devel package of dvd:librados2 
   - librbio2 
   - librbl1 
   - librcc-devel 
@@ -13149,7 +13149,7 @@ unsorted:
   - librevenge-doc 
   - librevenge-generators-0_0-0 
   - librfxencode0 
-  - librgw-devel: [x86_64] # devel package of dvd:librbd1 
+  - librgw-devel: [x86_64] # devel package of dvd:librados2 
   - librhash0 
   - librime-devel 
   - librime-private-devel 
@@ -13162,12 +13162,12 @@ unsorted:
   - librnp-0-0 
   - librocsgraphtheory0 
   - librpma0: [x86_64] 
-  - librpmem-devel: [x86_64] # devel package of dvd:pmdk 
+  - librpmem-devel: [x86_64] # devel package of dvd:libpmemobj1 
   - librpmem1: [x86_64] 
   - librrd8 
   - librsb-devel 
   - librsb0 
-  - librssguard-3_9_0 
+  - librssguard-3_9_1 
   - librssguard-devel 
   - librsvg-2-2-32bit: [x86_64] 
   - librsvg-devel 
@@ -13780,7 +13780,7 @@ unsorted:
   - libtrilinos_13_0_1-gnu-openmpi2-hpc: [x86_64] 
   - libtrilinos_13_0_1-gnu-openmpi3-hpc: [x86_64] 
   - libtrilinos_13_0_1-gnu-openmpi4-hpc: [x86_64] 
-  - libtrng4-22 
+  - libtrng4-24 
   - libts0-32bit: [x86_64] 
   - libtsan0-gcc10: [x86_64] 
   - libtsan0-gcc7: [x86_64] 
@@ -15541,6 +15541,8 @@ unsorted:
   - megaglest 
   - megaglest-data 
   - megatools 
+  - meld 
+  - meld-lang 
   - melody 
   - melody-lang 
   - melt 
@@ -15828,8 +15830,8 @@ unsorted:
   - molsketch-devel 
   - molsketch-doc 
   - monero-devel 
-  - monero-devel-static 
-  - monero-doc 
+  - monero-devel-static: [i586] 
+  - monero-doc: [i586] 
   - monero-utils 
   - monerod 
   - mongolian-fonts 
@@ -16033,14 +16035,14 @@ unsorted:
   - mpich-ofi-gnu-hpc-devel 
   - mpich-ofi-gnu-hpc-devel-static 
   - mpich-ofi-gnu-hpc-macros-devel 
-  - mpich-ofi_3_3_2-gnu-hpc 
-  - mpich-ofi_3_3_2-gnu-hpc-devel 
-  - mpich-ofi_3_3_2-gnu-hpc-devel-static 
-  - mpich-ofi_3_3_2-gnu-hpc-macros-devel 
-  - mpich_3_3_2-gnu-hpc 
-  - mpich_3_3_2-gnu-hpc-devel 
-  - mpich_3_3_2-gnu-hpc-devel-static 
-  - mpich_3_3_2-gnu-hpc-macros-devel 
+  - mpich-ofi_3_4_1-gnu-hpc 
+  - mpich-ofi_3_4_1-gnu-hpc-devel 
+  - mpich-ofi_3_4_1-gnu-hpc-devel-static 
+  - mpich-ofi_3_4_1-gnu-hpc-macros-devel 
+  - mpich_3_4_1-gnu-hpc 
+  - mpich_3_4_1-gnu-hpc-devel 
+  - mpich_3_4_1-gnu-hpc-devel-static 
+  - mpich_3_4_1-gnu-hpc-macros-devel 
   - mpitests 
   - mpitests-mpich 
   - mpitests-mpich-gnu-hpc 
@@ -16101,7 +16103,7 @@ unsorted:
   - msv-xmlgen 
   - msv-xsdlib 
   - mt-st 
-  - mt32emu 
+  - mt32emu-qt 
   - mtd-utils 
   - mtdev 
   - mtdev-devel: [i586] # devel package of dvd:libmtdev1 
@@ -18076,6 +18078,7 @@ unsorted:
   - password-store 
   - password-store-dmenu 
   - pasystray 
+  - patch: [i586] 
   - patch2mail 
   - patchelf 
   - patchutils 
@@ -20841,7 +20844,6 @@ unsorted:
   - python3-deltarpm 
   - python3-designateclient 
   - python3-dfVFS 
-  - python3-django-attachments 
   - python3-django-storages 
   - python3-dnf 
   - python3-dnf-plugin-kickstart 
@@ -21161,7 +21163,6 @@ unsorted:
   - python36-Cycler 
   - python36-Cython 
   - python36-DataProperty 
-  - python36-DataShape 
   - python36-DateTime 
   - python36-Delorean 
   - python36-Deprecated 
@@ -21748,7 +21749,6 @@ unsorted:
   - python36-blurb 
   - python36-bobo 
   - python36-bobodoctestumentation 
-  - python36-bokcolmaps 
   - python36-boltons 
   - python36-boolean.py 
   - python36-booleanOperations 
@@ -21943,12 +21943,6 @@ unsorted:
   - python36-dash-html-components 
   - python36-dash-renderer 
   - python36-dash-table 
-  - python36-dask 
-  - python36-dask-all 
-  - python36-dask-bag 
-  - python36-dask-distributed 
-  - python36-dask-dot 
-  - python36-dask-multiprocessing 
   - python36-databases 
   - python36-dataclasses 
   - python36-datadiff 
@@ -21966,7 +21960,6 @@ unsorted:
   - python36-deap 
   - python36-debian 
   - python36-decorator 
-  - python36-deepdiff 
   - python36-deepmerge 
   - python36-defusedxml 
   - python36-delegator 
@@ -22010,7 +22003,6 @@ unsorted:
   - python36-distlib 
   - python36-distob 
   - python36-distorm3 
-  - python36-distributed 
   - python36-distro 
   - python36-distroinfo 
   - python36-distutils-extra 
@@ -22020,6 +22012,7 @@ unsorted:
   - python36-django-appconf 
   - python36-django-args 
   - python36-django-assets 
+  - python36-django-attachments 
   - python36-django-auth-ldap 
   - python36-django-avatar 
   - python36-django-axes 
@@ -23026,6 +23019,7 @@ unsorted:
   - python36-pybugz 
   - python36-pycairo 
   - python36-pycairo-devel 
+  - python36-pycapnp 
   - python36-pycares 
   - python36-pycdio 
   - python36-pycha 
@@ -24777,9 +24771,10 @@ unsorted:
   - python38-dask-array 
   - python38-dask-bag 
   - python38-dask-dataframe 
+  - python38-dask-delayed 
+  - python38-dask-diagnostics 
   - python38-dask-distributed 
   - python38-dask-dot 
-  - python38-dask-multiprocessing 
   - python38-databases 
   - python38-datadiff 
   - python38-datashader 
@@ -24848,6 +24843,7 @@ unsorted:
   - python38-django-appconf 
   - python38-django-args 
   - python38-django-assets 
+  - python38-django-attachments 
   - python38-django-auth-ldap 
   - python38-django-avatar 
   - python38-django-axes 
@@ -25889,6 +25885,7 @@ unsorted:
   - python38-pybtex 
   - python38-pybugz 
   - python38-pycairo-devel 
+  - python38-pycapnp 
   - python38-pycdio 
   - python38-pycha 
   - python38-pychm 
@@ -27252,7 +27249,7 @@ unsorted:
   - radcli-devel 
   - radeontop 
   - radeontop-lang 
-  - rados-objclass-devel: [x86_64] # devel package of dvd:librbd1 
+  - rados-objclass-devel: [x86_64] # devel package of dvd:librados2 
   - raft-devel 
   - rage 
   - ragel 
@@ -27449,6 +27446,7 @@ unsorted:
   - ripgrep-fish-completion 
   - ripgrep-zsh-completion 
   - rk-devel 
+  - rke 
   - rkhunter 
   - rkward 
   - rls 
@@ -27582,6 +27580,7 @@ unsorted:
   - ruby2.7-doc 
   - ruby2.7-doc-ri 
   - ruby2.7-rubygem-gettext-setup 
+  - ruby2.7-rubygem-libyui-rake 
   - ruby2.7-rubygem-listen-doc-3_1 
   - ruby2.7-rubygem-rspec-rails-3.9 
   - ruby2.7-rubygem-ruby_dep-doc 
@@ -36976,7 +36975,6 @@ unsorted:
   - totem-pl-parser-devel 
   - totem-plugin-gnome-dvb-daemon 
   - touchegg 
-  - touchegg-gui 
   - tpm-quote-tools 
   - tpm-tools 
   - tpm-tools-devel 
@@ -37287,6 +37285,7 @@ unsorted:
   - typelib-1_0-Gtk-4_0 
   - typelib-1_0-GtkFrdp-0_1 
   - typelib-1_0-GtkLayerShell-0_1 
+  - typelib-1_0-GtkSource-3_0 
   - typelib-1_0-GtkSpell-3_0 
   - typelib-1_0-GtkVnc-2_0 
   - typelib-1_0-Gucharmap-2_90