Include plugin patch for Havana