Merge branch '2761_editor_save_as_dir' into 4.8.1-stable