Sync w/ latest g2 changes.