CYKLO-948: generics / simplification
release 1.0.16.4