Merge remote-tracking branch 'github/bug6170' into bug6170

Axel Uhl commited 2025-11-03 17:48:51 +0100 commit 32363d8cc7219d3b72a09f915bfdeed01cd524b9