Merge "Open final merge window for EE" into eel