Merge branch 'main' into bug6170

Axel Uhl commited 2025-10-24 11:12:47 +0200 commit 67212b334f0a404e1249f9d863e33e93769f93dc