(G-GT-00389): Unify g2-KU+4EA4 and g2-GT-00389 instead of G-KU+4EA4