Integrated latest fixes for the editor.