Added SPARK-968 implementation for review

Added SPARK-968 implementation for review