Move to g2-common