Merge branch 'fix-2026' of https