SPARK-850

https://spark-project.atlassian.net/browse/SPARK-850