r9138: add generics