0024774: Convertation of the generic classes to the non-generic. Part 8