Initial commit of EFL 1.8.1