diff --git a/cluster/src/dunit/scala/io/snappydata/externalstore/JDBCPreparedStatementDUnitTest.scala b/cluster/src/dunit/scala/io/snappydata/externalstore/JDBCPreparedStatementDUnitTest.scala
index ffd41ffc30..40f7c32d24 100644
--- a/cluster/src/dunit/scala/io/snappydata/externalstore/JDBCPreparedStatementDUnitTest.scala
+++ b/cluster/src/dunit/scala/io/snappydata/externalstore/JDBCPreparedStatementDUnitTest.scala
@@ -497,4 +497,29 @@ class JDBCPreparedStatementDUnitTest(s: String) extends ClusterManagerTestBase(s
       conn.close()
     }
   }
+
+  def testFailFastCast(): Unit = {
+    vm2.invoke(classOf[ClusterManagerTestBase], "startNetServer", netPort1)
+    val conn = getANetConnection(netPort1)
+
+    val stmt = conn.createStatement()
+    val table = "t5"
+    try {
+      stmt.execute("set snappydata.failOnCastError=true")
+      stmt.execute(s"drop table if exists $table")
+      stmt.execute(s"create table $table (col1 int, col2  string)")
+      stmt.execute(s"insert into $table values(1, 'abc')")
+      try {
+        stmt.execute(s"select cast(col2 as int) from $table")
+      } catch {
+        case ex: SQLException =>
+          assert(ex.getMessage.contains("Can not cast string type value 'abc' to int."))
+      }
+    } finally {
+      Try(stmt.execute("set snappydata.failOnCastError=false"))
+      Try(stmt.execute(s"drop table if exists $table"))
+      Try(stmt.close())
+      conn.close()
+    }
+  }
 }
diff --git a/cluster/src/test/scala/org/apache/spark/sql/catalyst/expressions/FailFastCastSuite.scala b/cluster/src/test/scala/org/apache/spark/sql/catalyst/expressions/FailFastCastSuite.scala
new file mode 100644
index 0000000000..a1047bbc7e
--- /dev/null
+++ b/cluster/src/test/scala/org/apache/spark/sql/catalyst/expressions/FailFastCastSuite.scala
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2017-2019 TIBCO Software Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you
+ * may not use this file except in compliance with the License. You
+ * may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License. See accompanying
+ * LICENSE file.
+ */
+package org.apache.spark.sql.catalyst.expressions
+
+import java.sql.{Date, Timestamp}
+
+import scala.util.Try
+
+import io.snappydata.SnappyFunSuite
+import org.scalatest.BeforeAndAfter
+
+import org.apache.spark.SparkException
+import org.apache.spark.sql.{DataFrame, Row}
+import org.apache.spark.sql.types._
+
+class FailFastCastSuite extends SnappyFunSuite with BeforeAndAfter {
+
+  protected val tableName = "table1"
+
+  override def beforeAll(): Unit = {
+    snc.sql("set snappydata.failOnCastError=true")
+    snc.sql(s"drop table if exists $tableName")
+    snc.sql(s"create table $tableName (int_col int, string_col string, date_col date," +
+        s" decimal_col decimal(5,3), float_col float, double_col double, timestamp_col timestamp)")
+    snc.sql(s"truncate table $tableName")
+    snc.sql(s"insert into $tableName values(1, 'abc', '01/02/1970', 12.345, 12.345, 12.345," +
+        s" '1970-01-02 00:00:00')")
+  }
+
+  override def afterAll(): Unit = {
+    Try(snc.sql(s"drop table if exists $tableName"))
+    Try(snc.sql("set snappydata.failOnCastError=false"))
+  }
+
+  test("string to other types cast") {
+    Seq(ByteType, ShortType, IntegerType, LongType, FloatType, DoubleType, BooleanType, DateType,
+      TimestampType, DecimalType.SYSTEM_DEFAULT).foreach(numericType =>
+      try {
+        snc.sql(s"select cast(string_col as ${numericType.simpleString}) from $tableName").show()
+        fail("Should have failed due to cast failure.")
+      } catch {
+        case ex: SparkException if (ex.getCause.isInstanceOf[TypeCastException]) =>
+          val expectedMessage = s"Can not cast ${StringType.simpleString} type value 'abc' to" +
+              s" ${numericType.simpleString}."
+          assertResult(expectedMessage)(ex.getCause.getMessage)
+      }
+    )
+  }
+
+  test("NaN fractional type cast to timestamp") {
+    val tableName = "table2"
+    val snappy = snc.snappySession
+    import snappy.implicits._
+    val doubleDf: DataFrame = Seq(Double.NaN).toDF
+    snc.sql(s"create table $tableName(value double) using column")
+    doubleDf.write.insertInto(tableName)
+    try {
+      snc.sql(s"select cast(value as timestamp) from $tableName").show()
+      fail("Should have failed due to cast failure.")
+    } catch {
+      case ex: TypeCastException =>
+        val expectedMessage = "Can not cast double type value 'NaN' to timestamp."
+        assertResult(expectedMessage)(ex.getMessage)
+    } finally {
+      snc.sql(s"drop table if exists $tableName")
+    }
+  }
+
+  // Testing this using spark temp table instead of snappy table as at gemfire layer we
+  // don't allow storing Float#PosititiveInfinity value.
+  test("Infinity fractional type cast to timestamp") {
+    val tmpTableName = "tmp_table"
+    val snappy = snc.snappySession
+    import snappy.implicits._
+    val doubleDf: DataFrame = Seq(Float.PositiveInfinity).toDF
+    doubleDf.createOrReplaceTempView(tmpTableName)
+    try {
+      snc.sql(s"select cast(value as timestamp) from $tmpTableName").show()
+      fail("Should have failed due to cast failure.")
+    } catch {
+      case ex: TypeCastException =>
+        val expectedMessage = "Can not cast double type value 'Infinity' to timestamp."
+        assertResult(expectedMessage)(ex.getMessage)
+    }
+  }
+
+  test("test decimal precision overflow") {
+    try {
+      snc.sql(s"select cast(decimal_col as decimal(4,3)) from $tableName").show()
+      fail("Should have failed due to decimal precision loss.")
+    } catch {
+      case ex: SparkException if ex.getCause.isInstanceOf[TypeCastException] =>
+        val expectedMessage = "Can not cast decimal(5,3) type value '12.345' to decimal(4,3)."
+        assertResult(expectedMessage)(ex.getCause.getMessage)
+    }
+  }
+
+  test("casting date type to decimal type") {
+    try {
+      snc.sql(s"select cast(date_col as decimal) from $tableName").show()
+      fail("Should have failed due to cast failure.")
+    } catch {
+      case ex: SparkException if ex.getCause.isInstanceOf[TypeCastException] =>
+        val expectedMessage = "Can not cast date type value '1' to decimal(38,18)."
+        assertResult(expectedMessage)(ex.getCause.getMessage)
+    }
+  }
+
+  test("casting timestamp type to a narrower decimal type") {
+    try {
+      snc.sql(s"select cast(timestamp_col as decimal(2,1)) from $tableName").show()
+      fail("Should have failed due to cast failure.")
+    } catch {
+      case ex: SparkException if ex.getCause.isInstanceOf[TypeCastException] =>
+        val expectedMessage = "Can not cast decimal(6,1) type value '66600.0' to decimal(2,1)."
+        assertResult(expectedMessage)(ex.getCause.getMessage)
+    }
+  }
+
+  test("casting float type to decimal type") {
+    try {
+      snc.sql(s"select cast(float_col as decimal(2,1)) from $tableName").show()
+      fail("Should have failed due to cast failure.")
+    } catch {
+      case ex: SparkException if ex.getCause.isInstanceOf[TypeCastException] =>
+        // float value is cast to double in the code hence it gets converted to decimal(17,15)
+        val expectedMessage = "Can not cast decimal(17,15) type value '12.345000267028809' to" +
+            " decimal(2,1)."
+        assertResult(expectedMessage)(ex.getCause.getMessage)
+    }
+  }
+
+  test("casting double type to decimal type") {
+    try {
+      snc.sql(s"select cast(double_col as decimal(2,1)) from $tableName").show()
+      fail("Should have failed due to cast failure.")
+    } catch {
+      case ex: SparkException if ex.getCause.isInstanceOf[TypeCastException] =>
+        val expectedMessage = "Can not cast decimal(5,3) type value '12.345' to decimal(2,1)."
+        assertResult(expectedMessage)(ex.getCause.getMessage)
+    }
+  }
+}
\ No newline at end of file
diff --git a/cluster/src/test/scala/org/apache/spark/sql/catalyst/expressions/FailFastCastWithOutCodeGenSuite.scala b/cluster/src/test/scala/org/apache/spark/sql/catalyst/expressions/FailFastCastWithOutCodeGenSuite.scala
new file mode 100644
index 0000000000..c9f71d39e1
--- /dev/null
+++ b/cluster/src/test/scala/org/apache/spark/sql/catalyst/expressions/FailFastCastWithOutCodeGenSuite.scala
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2017-2019 TIBCO Software Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you
+ * may not use this file except in compliance with the License. You
+ * may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License. See accompanying
+ * LICENSE file.
+ */
+package org.apache.spark.sql.catalyst.expressions
+
+import java.sql.{Date, Timestamp}
+
+import org.scalatest.Tag
+
+import org.apache.spark.sql.Row
+import org.apache.spark.sql.types._
+
+/**
+ * Runs the tests from `FailFastCastSuite` with code generation disabled.
+ */
+class FailFastCastWithOutCodeGenSuite extends FailFastCastSuite {
+
+  override def beforeAll(): Unit = {
+    snc.sql("set snappydata.failOnCastError=true")
+    snc.sql("set spark.sql.codegen.wholeStage=false")
+    snc.snappySession.conf.set("spark.sql.codegen.wholeStage", "false")
+    val snappy = snc.snappySession
+    val data = Seq(Row(8, "abc", new Date(86400000), new java.math.BigDecimal("12.345"),
+      12.345.toFloat, 12.345, new Timestamp(66600000)))
+
+    val schema = StructType(Seq(StructField("int_col", IntegerType),
+      StructField("string_col", StringType), StructField("date_col", DateType),
+      StructField("decimal_col", DecimalType(5, 3)), StructField("float_col", FloatType),
+      StructField("double_col", DoubleType), StructField("timestamp_col", TimestampType)
+    ))
+
+    val df = snappy.createDataFrame(
+      snappy.sparkContext.parallelize(data),
+      StructType(schema)
+    )
+
+    df.createOrReplaceTempView(tableName)
+  }
+
+  override protected def test(testName: String, testTags: Tag*)(testFun: => Unit): Unit = {
+    // Ignoring this test as this test uses snappy table and non-codegen flow is not working with
+    // snappy table. Also the same code path will be covered by
+    // "Infinity fractional type cast to timestamp" so we won't be loosing much on test coverage.
+    if (testName.equalsIgnoreCase("NaN fractional type cast to timestamp")) {
+      super.registerIgnoredTest(testName, testTags: _*)(testFun)
+    } else {
+      super.test(testName, testTags: _*)(testFun)
+    }
+  }
+}
\ No newline at end of file
diff --git a/core/src/main/scala/io/snappydata/Literals.scala b/core/src/main/scala/io/snappydata/Literals.scala
index 9e2d5b8351..952645e108 100644
--- a/core/src/main/scala/io/snappydata/Literals.scala
+++ b/core/src/main/scala/io/snappydata/Literals.scala
@@ -330,6 +330,10 @@ object Property extends Enumeration {
   val MaxRetryAttemptsForWrite: SQLValue[Int] = SQLVal[Int](
     s"${Constant.PROPERTY_PREFIX}maxRetryAttemptsForWrite",
     s"The number of times a write task should be retried before all tasks failing." , Some(4))
+
+  val FailOnCastError: SQLValue[Boolean] = SQLVal[Boolean](
+    s"${Constant.PROPERTY_PREFIX}failOnCastError",
+    "Property to enable/disable fail fast type casting", Some(false))
 }
 
 // extractors for properties
diff --git a/spark b/spark
index d2c20865c2..5bef40282a 160000
--- a/spark
+++ b/spark
@@ -1 +1 @@
-Subproject commit d2c20865c2ea9a059ea9391d114911bb07b19a66
+Subproject commit 5bef40282a090042b726efe4e13a757affc99af8
diff --git a/store b/store
index 6b4e216285..aeae20a13c 160000
--- a/store
+++ b/store
@@ -1 +1 @@
-Subproject commit 6b4e2162857db3fb8806e27f3504a5a7f9124e81
+Subproject commit aeae20a13cf01549117d234aa567da8ddf737313