Merge eidanch patch for Features