Synced with orig.
