diff --git a/package-lock.json b/package-lock.json
index e867f1295c9d..217d7e65fbad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "Rocket.Chat",
-	"version": "0.69.0-develop",
+	"version": "0.70.0-develop",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -444,6 +444,7 @@
 			"resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
 			"integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
 			"dev": true,
+			"optional": true,
 			"requires": {
 				"kind-of": "3.2.2",
 				"longest": "1.0.1",
@@ -455,6 +456,7 @@
 					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
 					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"is-buffer": "1.1.6"
 					}
@@ -783,9 +785,12 @@
 			"integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio="
 		},
 		"autolinker": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/autolinker/-/autolinker-1.6.2.tgz",
-			"integrity": "sha512-IKLGtYFb3jzGTtgCpb4bm//1sXmmmgmr0msKshhYoc7EsWmLCFvuyxLcEIfcZ5gbCgZGXrnXkOkcBblOFEnlog=="
+			"version": "3.16.1",
+			"resolved": "https://registry.npmjs.org/autolinker/-/autolinker-3.16.1.tgz",
+			"integrity": "sha512-DaCB8hJAVC7gfCMeh+rJ2iJEIMpbvCWzY5Bm3/i7Am7ZDrvpy4tZxMTYoc3iuvZqABrogfRgqPyxfA9ExATWaQ==",
+			"requires": {
+				"tslib": "^2.3.0"
+			}
 		},
 		"autoprefixer": {
 			"version": "8.6.0",
@@ -2972,13 +2977,13 @@
 				"chromedriver": "2.38.3",
 				"colors": "1.1.2",
 				"commander": "2.15.1",
-				"cucumber": "github:xolvio/cucumber-js#cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
+				"cucumber": "cucumber@github:xolvio/cucumber-js#cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
 				"deep-extend": "0.4.2",
 				"exit": "0.1.2",
 				"fibers": "1.0.15",
 				"freeport": "1.0.5",
 				"fs-extra": "1.0.0",
-				"glob": "github:lucetius/node-glob#51c7ca6e69bfbd17db5f1ea710e3f2a7a457d9ce",
+				"glob": "glob@github:lucetius/node-glob#51c7ca6e69bfbd17db5f1ea710e3f2a7a457d9ce",
 				"hapi": "8.8.0",
 				"jasmine": "2.99.0",
 				"loglevel": "1.4.1",
@@ -3019,6 +3024,7 @@
 				},
 				"glob": {
 					"version": "github:lucetius/node-glob#51c7ca6e69bfbd17db5f1ea710e3f2a7a457d9ce",
+					"from": "glob@github:lucetius/node-glob#51c7ca6e69bfbd17db5f1ea710e3f2a7a457d9ce",
 					"dev": true,
 					"requires": {
 						"fs.realpath": "1.0.0",
@@ -4014,6 +4020,7 @@
 		},
 		"cucumber": {
 			"version": "github:xolvio/cucumber-js#cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
+			"from": "cucumber@github:xolvio/cucumber-js#cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
 			"dev": true,
 			"requires": {
 				"camel-case": "3.0.0",
@@ -5613,7 +5620,8 @@
 				"ansi-regex": {
 					"version": "2.1.1",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"aproba": {
 					"version": "1.2.0",
@@ -5634,12 +5642,14 @@
 				"balanced-match": {
 					"version": "1.0.0",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"brace-expansion": {
 					"version": "1.1.11",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"balanced-match": "1.0.0",
 						"concat-map": "0.0.1"
@@ -5654,17 +5664,20 @@
 				"code-point-at": {
 					"version": "1.1.0",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"concat-map": {
 					"version": "0.0.1",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"console-control-strings": {
 					"version": "1.1.0",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"core-util-is": {
 					"version": "1.0.2",
@@ -5781,7 +5794,8 @@
 				"inherits": {
 					"version": "2.0.3",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"ini": {
 					"version": "1.3.5",
@@ -5793,6 +5807,7 @@
 					"version": "1.0.0",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"number-is-nan": "1.0.1"
 					}
@@ -5807,6 +5822,7 @@
 					"version": "3.0.4",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"brace-expansion": "1.1.11"
 					}
@@ -5814,12 +5830,14 @@
 				"minimist": {
 					"version": "0.0.8",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"minipass": {
 					"version": "2.2.4",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"safe-buffer": "5.1.1",
 						"yallist": "3.0.2"
@@ -5838,6 +5856,7 @@
 					"version": "0.5.1",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"minimist": "0.0.8"
 					}
@@ -5918,7 +5937,8 @@
 				"number-is-nan": {
 					"version": "1.0.1",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"object-assign": {
 					"version": "4.1.1",
@@ -5930,6 +5950,7 @@
 					"version": "1.4.0",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"wrappy": "1.0.2"
 					}
@@ -6015,7 +6036,8 @@
 				"safe-buffer": {
 					"version": "5.1.1",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"safer-buffer": {
 					"version": "2.1.2",
@@ -6051,6 +6073,7 @@
 					"version": "1.0.2",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"code-point-at": "1.1.0",
 						"is-fullwidth-code-point": "1.0.0",
@@ -6070,6 +6093,7 @@
 					"version": "3.0.1",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"ansi-regex": "2.1.1"
 					}
@@ -6113,12 +6137,14 @@
 				"wrappy": {
 					"version": "1.0.2",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"yallist": {
 					"version": "3.0.2",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				}
 			}
 		},
@@ -9107,7 +9133,8 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
 			"integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
 		"longest-streak": {
 			"version": "2.0.2",
@@ -9712,7 +9739,8 @@
 		"natives": {
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/natives/-/natives-1.1.4.tgz",
-			"integrity": "sha512-Q29yeg9aFKwhLVdkTAejM/HvYG0Y1Am1+HUkFQGn5k2j8GS+v60TVmZh6nujpEAj/qql+wGUrlryO8bF+b1jEg=="
+			"integrity": "sha512-Q29yeg9aFKwhLVdkTAejM/HvYG0Y1Am1+HUkFQGn5k2j8GS+v60TVmZh6nujpEAj/qql+wGUrlryO8bF+b1jEg==",
+			"optional": true
 		},
 		"natural-compare": {
 			"version": "1.4.0",
@@ -13824,6 +13852,11 @@
 			"integrity": "sha512-FHkoUZvG6Egrv9XZAyYGKEyb1JMsFphgPjoczkZC2y6W93U1jswcVURB8MUvtsahEPEVACyxD47JAL63vF4JsQ==",
 			"dev": true
 		},
+		"tslib": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+			"integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
+		},
 		"tsscmp": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz",
diff --git a/package.json b/package.json
index f30d1e56f461..ec36bd2c5324 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
 		"archiver": "^2.1.1",
 		"arraybuffer-to-string": "^1.0.2",
 		"atlassian-crowd": "^0.5.0",
-		"autolinker": "^1.6.2",
+		"autolinker": "^3.16.1",
 		"aws-sdk": "^2.250.1",
 		"bad-words": "^1.6.1",
 		"bcrypt": "^2.0.1",