Merge "Clean copy_directory_recursive"