diff --git a/dac/ui-lib/icons/dremio/sources/VAST-Data.svg b/dac/ui-lib/icons/dremio/sources/VAST-Data.svg
new file mode 100644
index 0000000000..6a3c62f571
--- /dev/null
+++ b/dac/ui-lib/icons/dremio/sources/VAST-Data.svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2017-2019 Dremio Corporation
+
+    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.
+
+-->
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="1000.000000pt" height="1000.000000pt" viewBox="0 0 1000.000000 1000.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+</metadata>
+<g transform="translate(0.000000,1000.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M2532 5600 c-28 -26 -38 -66 -25 -101 10 -25 305 -515 345 -571 29
+-42 80 -36 136 15 41 38 43 34 -116 296 -62 101 -112 188 -112 192 0 5 45 9
+100 9 95 0 100 1 116 25 12 18 15 39 12 75 -8 82 -3 80 -232 80 -189 0 -204
+-1 -224 -20z"/>
+<path d="M4253 5290 c-23 -13 -33 -27 -33 -44 0 -13 52 -132 115 -266 63 -133
+115 -245 115 -249 0 -5 9 -20 21 -35 25 -32 86 -37 112 -8 10 10 17 21 17 24
+0 3 54 119 120 258 66 139 120 263 120 276 0 29 -38 55 -82 58 -32 1 -34 -1
+-88 -109 -31 -60 -74 -150 -98 -199 l-42 -90 -80 167 c-44 92 -80 170 -80 173
+0 3 -9 19 -21 35 -24 34 -51 37 -96 9z"/>
+<path d="M5413 5288 c-25 -28 -263 -532 -263 -558 0 -27 47 -60 87 -60 l34 0
+83 173 c46 94 86 182 90 195 4 12 11 22 15 22 5 0 23 -33 41 -72 18 -40 60
+-128 92 -195 56 -117 60 -123 89 -123 53 0 89 27 89 66 0 28 -246 546 -267
+562 -26 19 -67 14 -90 -10z"/>
+<path d="M6194 5285 c-67 -34 -94 -76 -94 -147 0 -128 53 -178 230 -219 98
+-23 128 -45 109 -81 -9 -16 -24 -18 -162 -18 -181 0 -197 -6 -197 -73 0 -73
+-3 -72 203 -72 l184 0 41 29 c48 33 82 96 82 152 0 44 -28 111 -56 136 -30 27
+-101 54 -187 73 -82 18 -107 34 -107 66 0 31 40 39 205 39 172 0 175 1 175 74
+0 62 -11 66 -204 66 -163 0 -175 -1 -222 -25z"/>
+<path d="M6942 5298 c-16 -16 -15 -103 1 -116 7 -6 53 -12 103 -14 l89 -3 5
+-233 c5 -217 6 -235 24 -248 24 -17 76 -18 99 -1 15 10 17 40 19 247 l3 235
+95 3 c108 3 120 11 120 73 0 69 -1 69 -289 69 -186 0 -260 -3 -269 -12z"/>
+<path d="M3502 5103 c-6 -2 -71 -103 -143 -224 -72 -120 -134 -219 -138 -219
+-3 1 -26 36 -51 78 -57 98 -78 107 -146 65 -73 -44 -71 -55 36 -235 51 -84
+101 -161 112 -170 28 -25 72 -22 102 5 36 33 350 556 362 604 8 29 -15 57 -68
+84 -39 20 -45 21 -66 12z"/>
+</g>
+</svg>
diff --git a/dac/ui/src/art/sources/VAST-Data.svg b/dac/ui/src/art/sources/VAST-Data.svg
new file mode 100644
index 0000000000..8243eb5717
--- /dev/null
+++ b/dac/ui/src/art/sources/VAST-Data.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2017-2019 Dremio Corporation
+
+    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.
+
+-->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="1000.000000pt" height="1000.000000pt" viewBox="0 0 1000.000000 1000.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+</metadata>
+<g transform="translate(0.000000,1000.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M2532 5600 c-28 -26 -38 -66 -25 -101 10 -25 305 -515 345 -571 29
+-42 80 -36 136 15 41 38 43 34 -116 296 -62 101 -112 188 -112 192 0 5 45 9
+100 9 95 0 100 1 116 25 12 18 15 39 12 75 -8 82 -3 80 -232 80 -189 0 -204
+-1 -224 -20z"/>
+<path d="M4253 5290 c-23 -13 -33 -27 -33 -44 0 -13 52 -132 115 -266 63 -133
+115 -245 115 -249 0 -5 9 -20 21 -35 25 -32 86 -37 112 -8 10 10 17 21 17 24
+0 3 54 119 120 258 66 139 120 263 120 276 0 29 -38 55 -82 58 -32 1 -34 -1
+-88 -109 -31 -60 -74 -150 -98 -199 l-42 -90 -80 167 c-44 92 -80 170 -80 173
+0 3 -9 19 -21 35 -24 34 -51 37 -96 9z"/>
+<path d="M5413 5288 c-25 -28 -263 -532 -263 -558 0 -27 47 -60 87 -60 l34 0
+83 173 c46 94 86 182 90 195 4 12 11 22 15 22 5 0 23 -33 41 -72 18 -40 60
+-128 92 -195 56 -117 60 -123 89 -123 53 0 89 27 89 66 0 28 -246 546 -267
+562 -26 19 -67 14 -90 -10z"/>
+<path d="M6194 5285 c-67 -34 -94 -76 -94 -147 0 -128 53 -178 230 -219 98
+-23 128 -45 109 -81 -9 -16 -24 -18 -162 -18 -181 0 -197 -6 -197 -73 0 -73
+-3 -72 203 -72 l184 0 41 29 c48 33 82 96 82 152 0 44 -28 111 -56 136 -30 27
+-101 54 -187 73 -82 18 -107 34 -107 66 0 31 40 39 205 39 172 0 175 1 175 74
+0 62 -11 66 -204 66 -163 0 -175 -1 -222 -25z"/>
+<path d="M6942 5298 c-16 -16 -15 -103 1 -116 7 -6 53 -12 103 -14 l89 -3 5
+-233 c5 -217 6 -235 24 -248 24 -17 76 -18 99 -1 15 10 17 40 19 247 l3 235
+95 3 c108 3 120 11 120 73 0 69 -1 69 -289 69 -186 0 -260 -3 -269 -12z"/>
+<path d="M3502 5103 c-6 -2 -71 -103 -143 -224 -72 -120 -134 -219 -138 -219
+-3 1 -26 36 -51 78 -57 98 -78 107 -146 65 -73 -44 -71 -55 36 -235 51 -84
+101 -161 112 -170 28 -25 72 -22 102 5 36 33 350 556 362 604 8 29 -15 57 -68
+84 -39 20 -45 21 -66 12z"/>
+</g>
+</svg>
diff --git a/dac/ui/src/constants/sourceTypes.js b/dac/ui/src/constants/sourceTypes.js
index 2a93db9461..293a755a88 100644
--- a/dac/ui/src/constants/sourceTypes.js
+++ b/dac/ui/src/constants/sourceTypes.js
@@ -19,6 +19,7 @@ export const REDSHIFT = "REDSHIFT";
 export const S3 = "S3";
 export const ELASTIC = "ELASTIC";
 export const HBASE = "HBASE";
+export const VASTDATA = "VASTDATA";
 export const HDFS = "HDFS";
 export const HIVE = "HIVE";
 export const HIVE3 = "HIVE3";
@@ -59,6 +60,7 @@ export const sourceProperties = [
   { label: "Amazon OpenSearch Service", sourceType: AMAZONELASTIC },
   { label: "Elasticsearch", sourceType: ELASTIC },
   { label: "HBase", sourceType: HBASE, beta: true },
+  { label: "VASTDATA", sourceType: VASTDATA, beta: true },
   { label: "HDFS", sourceType: HDFS },
   { label: "Hive 2.x", sourceType: HIVE },
   { label: "Hive 3.x", sourceType: HIVE3 },
diff --git a/dac/ui/src/customData/vlhfList.json b/dac/ui/src/customData/vlhfList.json
index 9dfd050e9c..f7bab4dac0 100644
--- a/dac/ui/src/customData/vlhfList.json
+++ b/dac/ui/src/customData/vlhfList.json
@@ -1,5 +1,6 @@
 [
   { "sourceType": "HBASE", "tags": ["community"] },
+  { "sourceType": "VASTDATA", "tags": ["community"] },
   { "sourceType": "TERADATA" },
   { "sourceType": "CASSANDRA", "disabled": true },
   { "sourceType": "SALESFORCE", "disabled": true },
diff --git a/dac/ui/src/mocks/sourceFormConfig.json b/dac/ui/src/mocks/sourceFormConfig.json
index 6f9a111a25..1e84d920c0 100644
--- a/dac/ui/src/mocks/sourceFormConfig.json
+++ b/dac/ui/src/mocks/sourceFormConfig.json
@@ -180,6 +180,22 @@
         }
       ]
     },
+    {
+      "label": "VASTDATA",
+      "sourceType": "VASTDATA",
+      "elements": [
+        {
+          "type": "number",
+          "propertyName": "port",
+          "label": "Port",
+          "value": 2181
+        },
+        {
+          "type": "property_list",
+          "propertyName": "propertyList"
+        }
+      ]
+    },
     {
       "label": "HDFS",
       "sourceType": "HDFS",
diff --git a/dac/ui/src/mocks/sourceFormListConfig.json b/dac/ui/src/mocks/sourceFormListConfig.json
index ef979f216d..aa87bd5ec6 100644
--- a/dac/ui/src/mocks/sourceFormListConfig.json
+++ b/dac/ui/src/mocks/sourceFormListConfig.json
@@ -16,5 +16,6 @@
   { "label": "Sample Source", "sourceType": "SampleSource" },
   { "label": "AWS Glue Catalog", "sourceType": "AWSGLUE" },
   { "label": "Google Cloud Storage", "sourceType": "GCS" },
-  { "label": "Sample", "sourceType": "SAMPLE_SOURCE" }
+  { "label": "Sample", "sourceType": "SAMPLE_SOURCE" },
+  { "label":  "VASTDATA", "sourceType":  "VASTDATA"}
 ]
diff --git a/sabot/kernel/src/main/java/com/dremio/exec/exception/MissingSourceTypeException.java b/sabot/kernel/src/main/java/com/dremio/exec/exception/MissingSourceTypeException.java
index d70c338554..7fbbf7182a 100644
--- a/sabot/kernel/src/main/java/com/dremio/exec/exception/MissingSourceTypeException.java
+++ b/sabot/kernel/src/main/java/com/dremio/exec/exception/MissingSourceTypeException.java
@@ -43,6 +43,9 @@ public String getMessage() {
       case "HBASE":
         return "HBase source type is not installed. Please download it from Dremio Hub: https://github.com/dremio-hub.";
 
+      case "VASTDATA":
+        return "VASTDATA source type is not installed.";
+
       case "ADL":
         if ("true".equals(ResourceBundle.getBundle("mapr-distribution").getString("maprDistribution"))) {
           return "The Azure Data Lake source type is not available in the MapR edition of Dremio.";