Version of SPARK-3697 for this branch.