Merge remote-tracking branch 'origin/fix-2026' into fix-2026