Integrated the latest changes to the editor.