g2: Include common vendor
g2: Update