Updated with E18/EFL 1.8.0 scripts