Merge branch 'main' into bug6236

Axel Uhl commited 2026-04-15 16:32:55 +0200 commit 003cf0c016e2eaefd7941c9bc367defbb2bf85a4