diff --git a/dvd.group b/dvd.group
index 007b2d69..b58e92e4 100644
--- a/dvd.group
+++ b/dvd.group
@@ -76,7 +76,6 @@
     <package name="adobe-sourcesanspro-fonts" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="adobe-sourceserifpro-fonts" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="adwaita-icon-theme" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="adwaita-qt4" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="adwaita-qt5" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="agrep" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="akonadi-calendar-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
@@ -623,7 +622,6 @@
     <package name="gcin-branding-openSUSE" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="gcin-gtk2" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="gcin-gtk3" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="gcin-qt4" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="gcin-qt5" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="gcolor2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-lxde-lxde -->
     <package name="gconf-polkit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
@@ -664,7 +662,6 @@
     <package name="geoclue2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="geocode-glib" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="geronimo-jms-1_1-api" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-technical_writing -->
-    <package name="geronimo-specs-pom" supportstatus="unsupported"/> <!-- reason: dvd:patterns-desktop-technical_writing -->
     <package name="gettext-runtime" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="gettext-tools" supportstatus="unsupported"/> <!-- reason: dvd:patterns-devel-C-C++-devel_C_C++ -->
     <package name="ghex" 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 9417eea1..42d876e8 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___20190417" schemaversion="4.1">
+<image name="OBS__openSUSE-Addon-NonOss___20190418" 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">20190417</productvar>
+      <productvar name="VERSION">20190418</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20190417,openSUSE NonOSS Addon</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20190418,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/20190417/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20190417/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20190418/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20190418/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
diff --git a/openSUSE-MicroOS-dvd5-dvd-x86_64.kiwi b/openSUSE-MicroOS-dvd5-dvd-x86_64.kiwi
index 477892f7..bb1ff10b 100644
--- a/openSUSE-MicroOS-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-MicroOS-dvd5-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE-MicroOS___20190417" schemaversion="4.1">
+<image name="OBS__openSUSE-MicroOS___20190418" 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">20190417</productvar>
+      <productvar name="VERSION">20190418</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-microos:20190417,openSUSE MicroOS</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-microos:20190418,openSUSE MicroOS</productinfo>
       <productinfo name="LINGUAS">en_US </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-MicroOS/20190417/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-MicroOS/20190418/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
diff --git a/openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi b/openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi
index 12493d07..7c12e549 100644
--- a/openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi
+++ b/openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE-MicroOS___20190417" schemaversion="4.1">
+<image name="OBS__openSUSE-MicroOS___20190418" 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">20190417</productvar>
+      <productvar name="VERSION">20190418</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-microos:20190417,openSUSE MicroOS</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-microos:20190418,openSUSE MicroOS</productinfo>
       <productinfo name="LINGUAS">en_US </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-MicroOS/20190417/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-MicroOS/20190418/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
diff --git a/openSUSE-cd-mini-i586.kiwi b/openSUSE-cd-mini-i586.kiwi
index ef15409d..3838dfa2 100644
--- a/openSUSE-cd-mini-i586.kiwi
+++ b/openSUSE-cd-mini-i586.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20190417" schemaversion="4.1">
+<image name="OBS__openSUSE___20190418" 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">20190417</productvar>
+      <productvar name="VERSION">20190418</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190417,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190418,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/20190417/i586</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190418/i586</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
diff --git a/openSUSE-cd-mini-x86_64.kiwi b/openSUSE-cd-mini-x86_64.kiwi
index 262569cf..b01ed86f 100644
--- a/openSUSE-cd-mini-x86_64.kiwi
+++ b/openSUSE-cd-mini-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20190417" schemaversion="4.1">
+<image name="OBS__openSUSE___20190418" 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">20190417</productvar>
+      <productvar name="VERSION">20190418</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190417,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190418,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/20190417/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190418/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index b1356986..52ade08e 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20190417" schemaversion="4.1">
+<image name="OBS__openSUSE___20190418" 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">20190417</productvar>
+      <productvar name="VERSION">20190418</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190417,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190418,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/20190417/i586</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190418/i586</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
@@ -72,7 +72,6 @@
       <repopackage name="adobe-sourcesanspro-fonts"/>
       <repopackage name="adobe-sourceserifpro-fonts"/>
       <repopackage name="adwaita-icon-theme"/>
-      <repopackage name="adwaita-qt4"/>
       <repopackage name="adwaita-qt5"/>
       <repopackage name="agrep"/>
       <repopackage name="akonadi-calendar-lang"/>
@@ -623,7 +622,6 @@
       <repopackage name="gcin-branding-openSUSE"/>
       <repopackage name="gcin-gtk2"/>
       <repopackage name="gcin-gtk3"/>
-      <repopackage name="gcin-qt4"/>
       <repopackage name="gcin-qt5"/>
       <repopackage name="gcolor2"/>
       <repopackage name="gconf-polkit"/>
@@ -666,7 +664,6 @@
       <repopackage name="GeoIP"/>
       <repopackage name="GeoIP-data"/>
       <repopackage name="geronimo-jms-1_1-api"/>
-      <repopackage name="geronimo-specs-pom"/>
       <repopackage name="gettext-runtime"/>
       <repopackage name="gettext-tools"/>
       <repopackage name="ghex"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index d04fa3b0..7d60f4bb 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20190417" schemaversion="4.1">
+<image name="OBS__openSUSE___20190418" 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">20190417</productvar>
+      <productvar name="VERSION">20190418</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190417,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190418,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/20190417/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190418/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
@@ -76,7 +76,6 @@
       <repopackage name="adobe-sourcesanspro-fonts"/>
       <repopackage name="adobe-sourceserifpro-fonts"/>
       <repopackage name="adwaita-icon-theme"/>
-      <repopackage name="adwaita-qt4"/>
       <repopackage name="adwaita-qt5"/>
       <repopackage name="agrep"/>
       <repopackage name="akonadi-calendar-lang"/>
@@ -642,7 +641,6 @@
       <repopackage name="gcin-branding-openSUSE"/>
       <repopackage name="gcin-gtk2"/>
       <repopackage name="gcin-gtk3"/>
-      <repopackage name="gcin-qt4"/>
       <repopackage name="gcin-qt5"/>
       <repopackage name="gcolor2"/>
       <repopackage name="gconf-polkit"/>
@@ -686,7 +684,6 @@
       <repopackage name="GeoIP"/>
       <repopackage name="GeoIP-data"/>
       <repopackage name="geronimo-jms-1_1-api"/>
-      <repopackage name="geronimo-specs-pom"/>
       <repopackage name="gettext-runtime"/>
       <repopackage name="gettext-tools"/>
       <repopackage name="ghex"/>
diff --git a/openSUSE-ftp-ftp-i586_x86_64.kiwi b/openSUSE-ftp-ftp-i586_x86_64.kiwi
index bf3153c7..1bcaa2c4 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___20190417" schemaversion="4.1">
+<image name="OBS__openSUSE___20190418" 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-20190417-i586-x86_64</productvar>
+      <productvar name="MEDIUM_NAME">openSUSE-20190418-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">20190417</productvar>
+      <productvar name="VERSION">20190418</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190417,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190418,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/20190417/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190417/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190418/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190418/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="DEBUGMEDIUM">2</productoption>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
diff --git a/unsorted.yml b/unsorted.yml
index aa9ab13c..e22c9bdc 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -1372,6 +1372,7 @@ unsorted:
   - cerbere 
   - cereal-devel 
   - certbot-systemd-timer 
+  - certstrap 
   - cetcd-devel 
   - cf-cli 
   - cf-cli-test 
@@ -1435,7 +1436,9 @@ unsorted:
   - cilium-devel: [x86_64] 
   - cilium-docker: [x86_64] 
   - cilium-etcd-operator 
+  - cilium-init: [x86_64] 
   - cilium-microscope 
+  - cilium-operator: [x86_64] 
   - cilium-proxy: [x86_64] 
   - cimple 
   - cimple-cmpi-adapter 
@@ -3115,7 +3118,6 @@ unsorted:
   - gcin-branding-upstream 
   - gcin-gtk2-32bit: [x86_64] 
   - gcin-gtk3-32bit: [x86_64] 
-  - gcin-qt4-32bit: [x86_64] 
   - gcin-qt5-32bit: [x86_64] 
   - gcolor3 
   - gcompris 
@@ -3285,7 +3287,6 @@ unsorted:
   - geronimo-saaj-1_1-api 
   - geronimo-servlet-2_4-api 
   - geronimo-servlet-2_5-api 
-  - geronimo-specs 
   - geronimo-stax-1_0-api 
   - geronimo-ws-metadata-2_0-api 
   - getdata 
@@ -5678,6 +5679,7 @@ unsorted:
   - kernel-debug: [i586] # suggested by dvd:suggested:patterns-devel-base-devel_kernel 
   - kernel-debug-devel 
   - kernel-default-base: [i586] 
+  - kernel-default-base-rebuild 
   - kernel-docs-html 
   - kernel-kvmsmall: [x86_64] 
   - kernel-kvmsmall-devel: [x86_64] 
@@ -6050,6 +6052,8 @@ unsorted:
   - kubic-dex-branding: [x86_64] 
   - kubic-locale-archive: [i586] 
   - kubic-pause 
+  - kubicctl 
+  - kubicd 
   - kuiviewer 
   - kuiviewer-lang 
   - kunitconversion-devel 
@@ -13421,6 +13425,7 @@ unsorted:
   - notify-sharp3-devel 
   - notmuch 
   - notmuch-devel 
+  - notmuch-doc 
   - notmuch-emacs 
   - noto-emoji-fonts 
   - noto-kufiarabic-fonts 
@@ -18293,6 +18298,7 @@ unsorted:
   - python2-python-snappy 
   - python2-python-sql 
   - python2-python-stdnum 
+  - python2-python-subunit 
   - python2-python-twitter 
   - python2-python-utils 
   - python2-python-vlc 
@@ -18535,7 +18541,6 @@ unsorted:
   - python2-subgrab 
   - python2-subliminal 
   - python2-subprocess32 
-  - python2-subunit 
   - python2-suds-jurko 
   - python2-sure 
   - python2-sushy 
@@ -20483,6 +20488,7 @@ unsorted:
   - python3-python-snappy 
   - python3-python-sql 
   - python3-python-stdnum 
+  - python3-python-subunit 
   - python3-python-twitter 
   - python3-python-utils 
   - python3-python-vlc 
@@ -20724,7 +20730,6 @@ unsorted:
   - python3-subgrab 
   - python3-subliminal 
   - python3-subscene-api 
-  - python3-subunit 
   - python3-suds-jurko 
   - python3-sunpy 
   - python3-sure