Merge branch '2585_mcedit_input_fname_before_edit'