Integrated the latest editor changes.