Changes for SPARK-1853