Merge latest Spark changes