Merge branch '2695_editor_segfault'