Update upstream
Update patches