Rebase and merge patches and resolve conflicts with upstream code
Fix any runtime errors for all our supported platforms