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

Axel Uhl commited 2025-10-28 09:59:05 +0100 commit ab09faec27c680fdf5ece329a2c1353a79d472a0