diff --git a/package-lock.json b/package-lock.json
index b9c440fbad..ac19bca7bd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -105,17 +105,17 @@
         "backbone": "1.2.3",
         "backbone-poller": "^1.1.3",
         "camshaft-reference": "0.34.0",
-        "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
+        "carto": "github:cartodb/carto#master",
         "clip-path-polygon": "0.1.12",
         "d3-array": "1.2.1",
         "d3-format": "1.2.0",
         "d3-time-format": "2.1.0",
         "jquery": "2.1.4",
         "mustache": "1.1.0",
-        "perfect-scrollbar": "git://github.com/CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d",
+        "perfect-scrollbar": "git://github.com/CartoDB/perfect-scrollbar.git#master",
         "postcss": "5.0.19",
         "promise-polyfill": "^6.1.0",
-        "torque.js": "github:CartoDB/torque#11b73bbc9a55b7c67c1ab72759a58eb417b88555",
+        "torque.js": "github:CartoDB/torque#master",
         "underscore": "1.8.3",
         "whatwg-fetch": "^2.0.3"
       },
@@ -157,25 +157,25 @@
       }
     },
     "@carto/toolkit-core": {
-      "version": "0.0.1-rc.17",
-      "resolved": "https://registry.npmjs.org/@carto/toolkit-core/-/toolkit-core-0.0.1-rc.17.tgz",
-      "integrity": "sha512-Jhrho595Ztg+k897Aao8eKUHFzAfNJAb77VRjL4HMz2fmBpukC91XdSjkdw33vKSuXIpmeOhTSSHaFwZereKNQ=="
+      "version": "0.0.1-rc.18",
+      "resolved": "https://registry.npmjs.org/@carto/toolkit-core/-/toolkit-core-0.0.1-rc.18.tgz",
+      "integrity": "sha512-a7cxefv9f7V6Rysh74zHBHd1K9oVhhA9Tvim3nv8ts0wX0cOymmCj7iJjZsYYPS8hEGlmt7E2D4kQoKZ8cW6Cg=="
     },
     "@carto/toolkit-custom-storage": {
-      "version": "0.0.1-rc.17",
-      "resolved": "https://registry.npmjs.org/@carto/toolkit-custom-storage/-/toolkit-custom-storage-0.0.1-rc.17.tgz",
-      "integrity": "sha512-gg3Ae+tXCnZqImaYnKJ+ARg7EgjzQaTYP6LuoSbDhFAHS4u84eXAXLhjCl1bDbBKnllKUDkSRY6P10cExvMPjA==",
+      "version": "0.0.1-rc.18",
+      "resolved": "https://registry.npmjs.org/@carto/toolkit-custom-storage/-/toolkit-custom-storage-0.0.1-rc.18.tgz",
+      "integrity": "sha512-U84FO79TeBqx9eruxq1Zslgk760PnShueEKWQaAEsZrK00oAUor1bcf1Mju0iCflgYk+RVOwtywyPQt0noFemA==",
       "requires": {
-        "@carto/toolkit-core": "^0.0.1-rc.17",
-        "@carto/toolkit-sql": "^0.0.1-rc.17"
+        "@carto/toolkit-core": "^0.0.1-rc.18",
+        "@carto/toolkit-sql": "^0.0.1-rc.18"
       }
     },
     "@carto/toolkit-sql": {
-      "version": "0.0.1-rc.17",
-      "resolved": "https://registry.npmjs.org/@carto/toolkit-sql/-/toolkit-sql-0.0.1-rc.17.tgz",
-      "integrity": "sha512-HdOv22v6lDgZV2APlhtjKVeL32UUQrM9PSelDs0JkKgsvGbUXn/BHzxoI0YnP5Ol3i0EE2IiPtDU6nKvXdB98w==",
+      "version": "0.0.1-rc.18",
+      "resolved": "https://registry.npmjs.org/@carto/toolkit-sql/-/toolkit-sql-0.0.1-rc.18.tgz",
+      "integrity": "sha512-ftrctuIx1Slnyrwp16Neh2R1vat4Y/wEC5An4xR4GE1eYxDQ2+wE8MMkSpF60VQAduHXV1AXteCmYjblWnVJVQ==",
       "requires": {
-        "@carto/toolkit-core": "^0.0.1-rc.17"
+        "@carto/toolkit-core": "^0.0.1-rc.18"
       }
     },
     "@carto/zera": {
@@ -6727,7 +6727,8 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -6745,11 +6746,13 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -6762,15 +6765,18 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -6873,7 +6879,8 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -6883,6 +6890,7 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -6895,17 +6903,20 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -6922,6 +6933,7 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -6994,7 +7006,8 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -7004,6 +7017,7 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -7079,7 +7093,8 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -7109,6 +7124,7 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -7126,6 +7142,7 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -7164,11 +7181,13 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         }
       }
     },
@@ -8871,17 +8890,17 @@
         "backbone": "1.2.3",
         "backbone-poller": "^1.1.3",
         "camshaft-reference": "0.34.0",
-        "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
+        "carto": "github:cartodb/carto#master",
         "clip-path-polygon": "0.1.12",
         "d3-array": "1.2.1",
         "d3-format": "1.2.0",
         "d3-time-format": "2.1.0",
         "jquery": "2.1.4",
         "mustache": "1.1.0",
-        "perfect-scrollbar": "git://github.com/CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d",
+        "perfect-scrollbar": "git://github.com/CartoDB/perfect-scrollbar.git#master",
         "postcss": "5.0.19",
         "promise-polyfill": "^6.1.0",
-        "torque.js": "github:CartoDB/torque#11b73bbc9a55b7c67c1ab72759a58eb417b88555",
+        "torque.js": "github:CartoDB/torque#master",
         "underscore": "1.8.3",
         "whatwg-fetch": "^2.0.3"
       },
@@ -18166,7 +18185,7 @@
       "version": "github:CartoDB/torque#23101417f2774217b42ac4088119ccb80798b088",
       "from": "github:CartoDB/torque#master",
       "requires": {
-        "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
+        "carto": "github:cartodb/carto#master",
         "d3": "3.5.17",
         "turbo-carto": "^0.21.1",
         "turf-jenks": "~1.0.1"
diff --git a/package.json b/package.json
index f6fde17c52..cc034b49d3 100644
--- a/package.json
+++ b/package.json
@@ -16,8 +16,8 @@
   "dependencies": {
     "@babel/polyfill": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.0.0.tgz",
     "@carto/carto.js": "^4.1.10",
-    "@carto/toolkit-core": "0.0.1-rc.17",
-    "@carto/toolkit-custom-storage": "0.0.1-rc.17",
+    "@carto/toolkit-core": "0.0.1-rc.18",
+    "@carto/toolkit-custom-storage": "0.0.1-rc.18",
     "@carto/zera": "1.0.7",
     "backbone": "1.2.3",
     "backbone-forms": "0.14.0",