Merge branch 'maint-0.4.7'

diff --cc .gitlab-ci.yml
index 6839f76a6be012fcd2502a3a2f17752b4aafd288,3bb2a9a40f2e5aa7d585e8e8c60db579bf9efb73..17ce0af43b700aaaf631a8bce2881de0f2b3b205
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -113,10 -114,10 +116,10 @@@ debian-minimal
    script:
      - ./scripts/ci/ci-driver.sh
  
 -# Minmal check on debian/i386: just make, make check.
 +# Minimal check on debian/i386: just make, make check.
  #
  debian-i386-minimal:
-   image: i386/debian:buster
+   image: i386/debian:bullseye
    <<: *debian-template
    script:
      - ./scripts/ci/ci-driver.sh

diff --cc src/lib/sandbox/sandbox.c
Simple merge