Merge branch 'main' into bug6170

Axel Uhl commited 2025-11-03 17:58:48 +0100 commit 6894fac9051e76f2a44b5b40373b3f9b45211dc3