Sync with new stem changes.