Fix for SPARK-1816
Fix for SPARK-1816

guusdk/Spark,speedy01/Spark,vipinraj/Spark,BittyByte/Spark,BittyByte/Spark,wrooot/Spark,speedy01/Spark,vipinraj/Spark,igniterealtime/Spark,igniterealtime/Spark,wrooot/Spark,vipinraj/Spark,speedy01/Spark,igniterealtime/Spark,guusdk/Spark,wrooot/Spark,guusdk/Spark,BittyByte/Spark,igniterealtime/Spark,BittyByte/Spark,speedy01/Spark,vipinraj/Spark,guusdk/Spark,wrooot/Spark