Added to address SPARK-1603