Sync up with latest g2 changes.