Sync with latest g2 changes.