Merge commit '1e5a7113b' into thread-next

diff --cc .gitlab-ci.yml
index e684e095bad915acf77b7f34d700da875ed7d719,fd7582770a2ef1de661a92e59c8a5f188fa3836e..32302179934f6b664080e705610d045741d80106
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -337,15 -330,24 +337,17 @@@ pkg-fedora-34-amd64
    needs: [build-fedora-34-amd64]
    image: registry.nic.cz/labs/bird:fedora-34-amd64
  
- pkg-centos-8-amd64:
-   <<: *pkg-rpm-wa
-   needs: [build-centos-8-amd64]
-   image: registry.nic.cz/labs/bird:centos-8-amd64
 -#pkg-centos-7-amd64:
 -#  <<: *pkg-rpm-wa
 -#  variables:
 -#    LC_ALL: en_US.UTF-8
 -#  needs: [build-centos-7-amd64]
 -#  image: registry.nic.cz/labs/bird:centos-7-amd64
--
- pkg-ubuntu-18.04-amd64:
-   <<: *pkg-deb
-   needs: [build-ubuntu-18_04-amd64]
-   image: registry.nic.cz/labs/bird:ubuntu-18.04-amd64
+ # Removed due to apkg breakage
+ #pkg-centos-8-amd64:
+ #  <<: *pkg-rpm-wa
+ #  needs: [build-centos-8-amd64]
+ #  image: registry.nic.cz/labs/bird:centos-8-amd64
+ 
+ # Removed due to apkg breakage
+ #pkg-ubuntu-18.04-amd64:
+ #  <<: *pkg-deb
+ #  needs: [build-ubuntu-18_04-amd64]
+ #  image: registry.nic.cz/labs/bird:ubuntu-18.04-amd64
  
  pkg-ubuntu-20.04-amd64:
    <<: *pkg-deb