diff --git a/package-lock.json b/package-lock.json
index 539cd76d3f14..1b9385bcbb00 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3862,6 +3862,16 @@
 			"integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
 			"dev": true
 		},
+		"camel-case": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+			"integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+			"dev": true,
+			"requires": {
+				"no-case": "^2.2.0",
+				"upper-case": "^1.1.1"
+			}
+		},
 		"camelcase": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
@@ -4179,11 +4189,13 @@
 				"chromedriver": "^2.35",
 				"colors": "1.1.2",
 				"commander": "^2.9.0",
+				"cucumber": "github:xolvio/cucumber-js#cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
 				"deep-extend": "^0.4.1",
 				"exit": "^0.1.2",
 				"fibers": "^1.0.14",
 				"freeport": "~1.0.5",
 				"fs-extra": "^1.0.0",
+				"glob": "github:lucetius/node-glob#51c7ca6e69bfbd17db5f1ea710e3f2a7a457d9ce",
 				"hapi": "8.8.0",
 				"jasmine": "^2.4.1",
 				"loglevel": "~1.4.0",
@@ -4221,27 +4233,6 @@
 						"type-detect": "^4.0.0"
 					}
 				},
-				"cucumber": {
-					"version": "github:xolvio/cucumber-js#cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
-					"from": "github:xolvio/cucumber-js#cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
-					"requires": {
-						"camel-case": "^3.0.0",
-						"cli-table": "^0.3.1",
-						"co": "^4.6.0",
-						"colors": "^1.1.2",
-						"commander": "^2.9.0",
-						"duration": "^0.2.0",
-						"fibers": "^1.0.7",
-						"figures": "1.7.0",
-						"gherkin": "4.0.0",
-						"glob": "^7.0.0",
-						"is-generator": "^1.0.2",
-						"lodash": "^4.0.0",
-						"meteor-promise": "^0.8.0",
-						"stack-chain": "^1.3.5",
-						"stacktrace-js": "^1.3.0"
-					}
-				},
 				"debug": {
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
@@ -4260,11 +4251,13 @@
 				"fibers": {
 					"version": "1.0.15",
 					"resolved": "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz",
-					"integrity": "sha1-IvA5yPGLhWGQ+75N7PBWFUwerpw="
+					"integrity": "sha1-IvA5yPGLhWGQ+75N7PBWFUwerpw=",
+					"dev": true
 				},
 				"glob": {
-					"version": "7.1.1",
-					"resolved": "github:lucetius/node-glob#51c7ca6e69bfbd17db5f1ea710e3f2a7a457d9ce",
+					"version": "github:lucetius/node-glob#51c7ca6e69bfbd17db5f1ea710e3f2a7a457d9ce",
+					"from": "github:lucetius/node-glob#chimp",
+					"dev": true,
 					"requires": {
 						"fs.realpath": "^1.0.0",
 						"inflight": "^1.0.4",
@@ -4341,7 +4334,8 @@
 				"once": {
 					"version": "1.3.0",
 					"resolved": "https://registry.npmjs.org/once/-/once-1.3.0.tgz",
-					"integrity": "sha1-FRr4a/wfCMS58H0GqyUP/L61ZYE="
+					"integrity": "sha1-FRr4a/wfCMS58H0GqyUP/L61ZYE=",
+					"dev": true
 				},
 				"progress": {
 					"version": "1.1.8",
@@ -4487,6 +4481,23 @@
 				"restore-cursor": "^2.0.0"
 			}
 		},
+		"cli-table": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
+			"integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=",
+			"dev": true,
+			"requires": {
+				"colors": "1.0.3"
+			},
+			"dependencies": {
+				"colors": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+					"integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+					"dev": true
+				}
+			}
+		},
 		"cli-width": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
@@ -5027,6 +5038,36 @@
 			"integrity": "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8=",
 			"dev": true
 		},
+		"cucumber": {
+			"version": "github:xolvio/cucumber-js#cf953cb5b5de30dbcc279f59e4ebff3aa040071c",
+			"from": "github:xolvio/cucumber-js#v1.3.0-chimp.6",
+			"dev": true,
+			"requires": {
+				"camel-case": "^3.0.0",
+				"cli-table": "^0.3.1",
+				"co": "^4.6.0",
+				"colors": "^1.1.2",
+				"commander": "^2.9.0",
+				"duration": "^0.2.0",
+				"fibers": "^1.0.7",
+				"figures": "1.7.0",
+				"gherkin": "4.0.0",
+				"glob": "^7.0.0",
+				"is-generator": "^1.0.2",
+				"lodash": "^4.0.0",
+				"meteor-promise": "^0.8.0",
+				"stack-chain": "^1.3.5",
+				"stacktrace-js": "^1.3.0"
+			},
+			"dependencies": {
+				"fibers": {
+					"version": "1.0.15",
+					"resolved": "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz",
+					"integrity": "sha1-IvA5yPGLhWGQ+75N7PBWFUwerpw=",
+					"dev": true
+				}
+			}
+		},
 		"cuid": {
 			"version": "1.3.8",
 			"resolved": "https://registry.npmjs.org/cuid/-/cuid-1.3.8.tgz",
@@ -5064,6 +5105,15 @@
 			"integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
 			"dev": true
 		},
+		"d": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+			"integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+			"dev": true,
+			"requires": {
+				"es5-ext": "^0.10.9"
+			}
+		},
 		"dashdash": {
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -5501,6 +5551,16 @@
 				"stream-shift": "^1.0.0"
 			}
 		},
+		"duration": {
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/duration/-/duration-0.2.2.tgz",
+			"integrity": "sha512-06kgtea+bGreF5eKYgI/36A6pLXggY7oR4p1pq4SmdFBn1ReOL5D8RhG64VrqfTTKNucqqtBAwEj8aB88mcqrg==",
+			"dev": true,
+			"requires": {
+				"d": "1",
+				"es5-ext": "~0.10.46"
+			}
+		},
 		"eastasianwidth": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@@ -5675,6 +5735,15 @@
 				}
 			}
 		},
+		"error-stack-parser": {
+			"version": "1.3.6",
+			"resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-1.3.6.tgz",
+			"integrity": "sha1-4Oc7k+QXE40c18C3RrGkoUhUwpI=",
+			"dev": true,
+			"requires": {
+				"stackframe": "^0.3.1"
+			}
+		},
 		"es-abstract": {
 			"version": "1.12.0",
 			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
@@ -5697,6 +5766,28 @@
 				"is-symbol": "^1.0.2"
 			}
 		},
+		"es5-ext": {
+			"version": "0.10.48",
+			"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.48.tgz",
+			"integrity": "sha512-CdRvPlX/24Mj5L4NVxTs4804sxiS2CjVprgCmrgoDkdmjdY4D+ySHa7K3jJf8R40dFg0tIm3z/dk326LrnuSGw==",
+			"dev": true,
+			"requires": {
+				"es6-iterator": "~2.0.3",
+				"es6-symbol": "~3.1.1",
+				"next-tick": "1"
+			}
+		},
+		"es6-iterator": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+			"integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+			"dev": true,
+			"requires": {
+				"d": "1",
+				"es5-ext": "^0.10.35",
+				"es6-symbol": "^3.1.1"
+			}
+		},
 		"es6-promise": {
 			"version": "4.2.5",
 			"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz",
@@ -5710,6 +5801,16 @@
 				"es6-promise": "^4.0.3"
 			}
 		},
+		"es6-symbol": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+			"integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+			"dev": true,
+			"requires": {
+				"d": "1",
+				"es5-ext": "~0.10.14"
+			}
+		},
 		"escape-html": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -6658,6 +6759,16 @@
 			"integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
 			"dev": true
 		},
+		"figures": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+			"integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
+			"dev": true,
+			"requires": {
+				"escape-string-regexp": "^1.0.5",
+				"object-assign": "^4.1.0"
+			}
+		},
 		"file-entry-cache": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
@@ -6990,14 +7101,12 @@
 				"balanced-match": {
 					"version": "1.0.0",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"brace-expansion": {
 					"version": "1.1.11",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"balanced-match": "^1.0.0",
 						"concat-map": "0.0.1"
@@ -7012,20 +7121,17 @@
 				"code-point-at": {
 					"version": "1.1.0",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"concat-map": {
 					"version": "0.0.1",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"console-control-strings": {
 					"version": "1.1.0",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"core-util-is": {
 					"version": "1.0.2",
@@ -7142,8 +7248,7 @@
 				"inherits": {
 					"version": "2.0.3",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"ini": {
 					"version": "1.3.5",
@@ -7155,7 +7260,6 @@
 					"version": "1.0.0",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"number-is-nan": "^1.0.0"
 					}
@@ -7170,7 +7274,6 @@
 					"version": "3.0.4",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"brace-expansion": "^1.1.7"
 					}
@@ -7178,14 +7281,12 @@
 				"minimist": {
 					"version": "0.0.8",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"minipass": {
 					"version": "2.2.4",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"safe-buffer": "^5.1.1",
 						"yallist": "^3.0.0"
@@ -7204,7 +7305,6 @@
 					"version": "0.5.1",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"minimist": "0.0.8"
 					}
@@ -7285,8 +7385,7 @@
 				"number-is-nan": {
 					"version": "1.0.1",
 					"bundled": true,
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"object-assign": {
 					"version": "4.1.1",
@@ -7298,7 +7397,6 @@
 					"version": "1.4.0",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"wrappy": "1"
 					}
@@ -7420,7 +7518,6 @@
 					"version": "1.0.2",
 					"bundled": true,
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"code-point-at": "^1.0.0",
 						"is-fullwidth-code-point": "^1.0.0",
@@ -7569,7 +7666,7 @@
 		},
 		"get-stream": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+			"resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
 			"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
 		},
 		"get-value": {
@@ -7585,6 +7682,12 @@
 				"assert-plus": "^1.0.0"
 			}
 		},
+		"gherkin": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/gherkin/-/gherkin-4.0.0.tgz",
+			"integrity": "sha1-edzgTRIj6kO0hip2vlzo+JwSwyw=",
+			"dev": true
+		},
 		"github-from-package": {
 			"version": "0.0.0",
 			"resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
@@ -8625,18 +8728,6 @@
 						"hoek": "2.x.x",
 						"joi": "6.x.x",
 						"wreck": "5.x.x"
-					},
-					"dependencies": {
-						"wreck": {
-							"version": "5.6.1",
-							"resolved": "https://registry.npmjs.org/wreck/-/wreck-5.6.1.tgz",
-							"integrity": "sha1-r/ADBAATiJ11YZtccYcN0qjdBpo=",
-							"dev": true,
-							"requires": {
-								"boom": "2.x.x",
-								"hoek": "2.x.x"
-							}
-						}
 					}
 				},
 				"heavy": {
@@ -8648,20 +8739,6 @@
 						"boom": "2.x.x",
 						"hoek": "2.x.x",
 						"joi": "5.x.x"
-					},
-					"dependencies": {
-						"joi": {
-							"version": "5.1.0",
-							"resolved": "https://registry.npmjs.org/joi/-/joi-5.1.0.tgz",
-							"integrity": "sha1-FSrQfbjunGQBmX/1/SwSiWBwv1g=",
-							"dev": true,
-							"requires": {
-								"hoek": "^2.2.x",
-								"isemail": "1.x.x",
-								"moment": "2.x.x",
-								"topo": "1.x.x"
-							}
-						}
 					}
 				},
 				"hoek": {
@@ -9799,6 +9876,12 @@
 				"number-is-nan": "^1.0.0"
 			}
 		},
+		"is-generator": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/is-generator/-/is-generator-1.0.3.tgz",
+			"integrity": "sha1-wUwhBX7TbjKNuANHlmxpP4hjifM=",
+			"dev": true
+		},
 		"is-glob": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
@@ -10919,6 +11002,12 @@
 				"signal-exit": "^3.0.0"
 			}
 		},
+		"lower-case": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+			"integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
+			"dev": true
+		},
 		"lru-cache": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -11408,7 +11497,8 @@
 		"meteor-promise": {
 			"version": "0.8.6",
 			"resolved": "https://registry.npmjs.org/meteor-promise/-/meteor-promise-0.8.6.tgz",
-			"integrity": "sha512-HP6tOr67z/9XU2Dr0F2SSr8WRTuE23AG9Dj578DCJPEYHs67OLKBviU8A8rwvbwMD7Lu2+Of+yAMz2Wd8r4yxg=="
+			"integrity": "sha512-HP6tOr67z/9XU2Dr0F2SSr8WRTuE23AG9Dj578DCJPEYHs67OLKBviU8A8rwvbwMD7Lu2+Of+yAMz2Wd8r4yxg==",
+			"dev": true
 		},
 		"methods": {
 			"version": "1.1.2",
@@ -11517,7 +11607,7 @@
 		"minimatch": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
 			"requires": {
 				"brace-expansion": "^1.1.7"
 			}
@@ -11908,11 +11998,26 @@
 			"integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==",
 			"dev": true
 		},
+		"next-tick": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+			"integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+			"dev": true
+		},
 		"nice-try": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
 			"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
 		},
+		"no-case": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+			"integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+			"dev": true,
+			"requires": {
+				"lower-case": "^1.1.1"
+			}
+		},
 		"node-abi": {
 			"version": "2.5.0",
 			"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.5.0.tgz",
@@ -12129,7 +12234,7 @@
 		"npmlog": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-			"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+			"integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
 			"requires": {
 				"are-we-there-yet": "~1.1.2",
 				"console-control-strings": "~1.1.0",
@@ -13842,7 +13947,7 @@
 				},
 				"pify": {
 					"version": "2.3.0",
-					"resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
 					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
 					"dev": true
 				}
@@ -14968,11 +15073,69 @@
 				"figgy-pudding": "^3.5.1"
 			}
 		},
+		"stack-chain": {
+			"version": "1.3.7",
+			"resolved": "https://registry.npmjs.org/stack-chain/-/stack-chain-1.3.7.tgz",
+			"integrity": "sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU=",
+			"dev": true
+		},
+		"stack-generator": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/stack-generator/-/stack-generator-1.1.0.tgz",
+			"integrity": "sha1-NvapIHUabBD0maE8Msu19RoLiyU=",
+			"dev": true,
+			"requires": {
+				"stackframe": "^1.0.2"
+			},
+			"dependencies": {
+				"stackframe": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz",
+					"integrity": "sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==",
+					"dev": true
+				}
+			}
+		},
 		"stack-trace": {
 			"version": "0.0.10",
 			"resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
 			"integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA="
 		},
+		"stackframe": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz",
+			"integrity": "sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ=",
+			"dev": true
+		},
+		"stacktrace-gps": {
+			"version": "2.4.4",
+			"resolved": "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-2.4.4.tgz",
+			"integrity": "sha1-acgn6dbW9Bz0ONfxleLjy/zyjEQ=",
+			"dev": true,
+			"requires": {
+				"source-map": "0.5.6",
+				"stackframe": "~0.3"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.5.6",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
+					"integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
+					"dev": true
+				}
+			}
+		},
+		"stacktrace-js": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/stacktrace-js/-/stacktrace-js-1.3.1.tgz",
+			"integrity": "sha1-Z8qyWJr1xBe5Yvc2mUAne7O2oYs=",
+			"dev": true,
+			"requires": {
+				"error-stack-parser": "^1.3.6",
+				"stack-generator": "^1.0.7",
+				"stacktrace-gps": "^2.4.3"
+			}
+		},
 		"starttls": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/starttls/-/starttls-1.0.1.tgz",
@@ -16244,6 +16407,12 @@
 			"integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
 			"dev": true
 		},
+		"upper-case": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+			"integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
+			"dev": true
+		},
 		"uri-js": {
 			"version": "4.2.2",
 			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -16560,14 +16729,12 @@
 						"balanced-match": {
 							"version": "1.0.0",
 							"bundled": true,
-							"dev": true,
-							"optional": true
+							"dev": true
 						},
 						"brace-expansion": {
 							"version": "1.1.11",
 							"bundled": true,
 							"dev": true,
-							"optional": true,
 							"requires": {
 								"balanced-match": "^1.0.0",
 								"concat-map": "0.0.1"
@@ -16587,8 +16754,7 @@
 						"concat-map": {
 							"version": "0.0.1",
 							"bundled": true,
-							"dev": true,
-							"optional": true
+							"dev": true
 						},
 						"console-control-strings": {
 							"version": "1.1.0",
@@ -16736,7 +16902,6 @@
 							"version": "3.0.4",
 							"bundled": true,
 							"dev": true,
-							"optional": true,
 							"requires": {
 								"brace-expansion": "^1.1.7"
 							}
diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
index 4c782a1c6451..363c3a62d50b 100644
--- a/packages/rocketchat-ui-message/client/messageBox.js
+++ b/packages/rocketchat-ui-message/client/messageBox.js
@@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
+import { Tracker } from 'meteor/tracker';
 import { settings } from 'meteor/rocketchat:settings';
 import { Markdown } from 'meteor/rocketchat:markdown';
 import { EmojiPicker } from 'meteor/rocketchat:emoji';
@@ -140,29 +141,34 @@ Template.messageBox.onCreated(function() {
 });
 
 Template.messageBox.onRendered(function() {
-	const input = this.find('.js-input-message');
-	this.input = input;
+	this.autorun(() => {
+		const subscribed = roomTypes.verifyCanSendMessage(this.data._id);
 
-	if (!input) {
-		return;
-	}
+		Tracker.afterFlush(() => {
+			const input = subscribed && this.find('.js-input-message');
 
-	const $input = $(input);
-	$input.on('dataChange', () => { // TODO: remove jQuery event layer dependency
-		const reply = $input.data('reply');
-		this.replyMessageData.set(reply);
-	});
+			if (!input) {
+				return;
+			}
 
-	$input.autogrow({
-		animate: true,
-		onInitialize: true,
-	})
-		.on('autogrow', () => {
-			this.data && this.data.onResize && this.data.onResize();
-		});
+			const $input = $(input);
+			$input.on('dataChange', () => { // TODO: remove jQuery event layer dependency
+				const reply = $input.data('reply');
+				this.replyMessageData.set(reply);
+			});
 
-	chatMessages[RoomManager.openedRoom] = chatMessages[RoomManager.openedRoom] || new ChatMessages;
-	chatMessages[RoomManager.openedRoom].input = input;
+			$input.autogrow({
+				animate: true,
+				onInitialize: true,
+			})
+				.on('autogrow', () => {
+					this.data && this.data.onResize && this.data.onResize();
+				});
+
+			chatMessages[RoomManager.openedRoom] = chatMessages[RoomManager.openedRoom] || new ChatMessages;
+			chatMessages[RoomManager.openedRoom].input = input;
+		});
+	});
 });
 
 Template.messageBox.helpers({
@@ -205,7 +211,7 @@ Template.messageBox.helpers({
 		};
 	},
 	input() {
-		return Template.instance().input;
+		return Template.instance().find('.js-input-message');
 	},
 	replyMessageData() {
 		return Template.instance().replyMessageData.get();
@@ -287,11 +293,8 @@ Template.messageBox.events({
 			input.selectionEnd = caretPos + emojiValue.length;
 		});
 	},
-	'focus .js-input-message'(event, instance) {
+	'focus .js-input-message'() {
 		KonchatNotification.removeRoomNotification(this._id);
-		if (chatMessages[this._id]) {
-			chatMessages[this._id].input = instance.input;
-		}
 	},
 	'keyup .js-input-message'(event, instance) {
 		chatMessages[this._id].keyup(this._id, event, instance);
@@ -299,7 +302,7 @@ Template.messageBox.events({
 	},
 	'paste .js-input-message'(event, instance) {
 		setTimeout(() => {
-			const { input } = instance;
+			const { input } = chatMessages[RoomManager.openedRoom];
 			typeof input.updateAutogrow === 'function' && input.updateAutogrow();
 		}, 50);
 
@@ -342,7 +345,7 @@ Template.messageBox.events({
 		}
 	},
 	'click .js-send'(event, instance) {
-		const { input } = instance;
+		const { input } = chatMessages[RoomManager.openedRoom];
 		chatMessages[this._id].send(this._id, input, () => {
 			input.updateAutogrow();
 			instance.isMessageFieldEmpty.set(chatMessages[this._id].isEmpty());
diff --git a/packages/rocketchat-ui-message/client/messageBoxNotSubscribed.js b/packages/rocketchat-ui-message/client/messageBoxNotSubscribed.js
index f709eb56a8e7..b54769857e16 100644
--- a/packages/rocketchat-ui-message/client/messageBoxNotSubscribed.js
+++ b/packages/rocketchat-ui-message/client/messageBoxNotSubscribed.js
@@ -40,7 +40,8 @@ Template.messageBoxNotSubscribed.events({
 		event.stopPropagation();
 		event.preventDefault();
 
-		const joinCode = Template.instance().$('[name=joinCode]').val();
+		const joinCodeInput = Template.instance().find('[name=joinCode]');
+		const joinCode = joinCodeInput && joinCodeInput.value;
 
 		try {
 			await call('joinRoom', this.rid, joinCode);