Sync w/ g3 changes.