Merge branch 'bug6209' into bug5959

Axel Uhl commited 2026-02-20 21:49:23 +0100 commit b8e73a2f2cbe01d11f1cd723efae8d8e79093771