Merge branch '1907_filename_in_copy'