merged with branch develop-spark-1.0