Merge remote-tracking branch 'origin/bug5959' into bug5959

Axel Uhl commited 2025-10-25 01:39:18 +0200 commit 51d6b819ce194a7c2e3da3489a1a8a895111b648