[DF-4152] Merge fix for xcode projects.