Merged with latest EL client code