Merge branch '2761_editor_save_as_dir'