SPARK-1642: first draft