AGOVA-27 Align Generics on solder last updates