Lets keep this in g2-common for now