Merging fix from Spark team.