Update upstream to v18
Update patches for v18.0