Merge commit '140c534fb81d0e165b7d674e869c646455ed19d1' into thread-next

diff --cc .gitlab-ci.yml
index 0a758cff48a3ca8b64470929fdf293845084b79a,dae59c75078505e0e0d197ffaf1e60fc510f05e5..02d0a66a9ab203ed8521a7983d86a1f756022409
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -516,7 -543,7 +518,7 @@@ build-birdlab
    script:
      - cd $TOOLS_DIR/netlab
      - sudo ./stop
-     - sudo ./runtest -m check $TEST_NAME
 -    - sudo ./runtest -s v2 -m check $TEST_NAME
++    - sudo ./runtest -s v3 -m check $TEST_NAME
  
  test-ospf-base:
    <<: *test-base

diff --cc conf/conf.c
Simple merge

diff --cc conf/conf.h
Simple merge

diff --cc configure.ac
Simple merge

diff --cc doc/bird.sgml
Simple merge

diff --cc sysdep/unix/main.c
Simple merge