Finished SPARK-4431