[Hs-Generics] patch applied (generics): GMap for EMGM updated