efl-assist: merged