Eel branch open for final merge window before v5.0.0