sync with latest mojoz (generics)