- Update upstream and remove hopper patch for #1270