SPARK-1478

Initial Version