Based on 2026.08-rc branch