merge J5lxs smarty plugins