Update based on latest spark commits.