Adapt tree to updated g3-common