Sync with g2 changes.