Merge "Split merge_target_files function"