From f57fd078b7ac458d4e65006172d904a3f0f69c54 Mon Sep 17 00:00:00 2001
From: Brylie Christopher Oxley <brylie@gnumedia.org>
Date: Sun, 28 Jan 2018 14:50:26 +0200
Subject: [PATCH 01/29] Semantic markup

---
 packages/rocketchat-i18n/i18n/en.i18n.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index e9db704bad10..2b34e56fbcef 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -49,7 +49,7 @@
   "Accounts_EmailVerification": "Email Verification",
   "Accounts_EmailVerification_Description": "Make sure you have correct SMTP settings to use this feature",
   "Accounts_Enrollment_Email": "Enrollment Email",
-  "Accounts_Enrollment_Email_Default": "<h2>Welcome to <h1>[Site_Name]</h1></h2><p>Go to [Site_URL] and try the best open source chat solution available today!</p>",
+  "Accounts_Enrollment_Email_Default": "<h1>Welcome to <strong>[Site_Name]</strong></h1><p>Go to [Site_URL] and try the best open source chat solution available today!</p>",
   "Accounts_Enrollment_Email_Description": "You may use the following placeholders: <br /><ul><li>[name], [fname], [lname] for the user's full name, first name or last name, respectively.</li><li>[email] for the user's email.</li><li>[Site_Name] and [Site_URL] for the Application Name and URL respectively.</li></ul>",
   "Accounts_Enrollment_Email_Subject_Default": "Welcome to [Site_Name]",
   "Accounts_ForgetUserSessionOnWindowClose": "Forget User Session on Window Close",
@@ -139,7 +139,7 @@
   "Accounts_ShowFormLogin": "Show Form-Based Login",
   "Accounts_UseDefaultBlockedDomainsList": "Use Default Blocked Domains List",
   "Accounts_UseDNSDomainCheck": "Use DNS Domain Check",
-  "Accounts_UserAddedEmail_Default": "<h2>Welcome to <h1>[Site_Name]</h1></h2><p>Go to [Site_URL] and try the best open source chat solution available today!</p><p>You may login using your email: [email] and password: [password]. You may be required to change it after your first login.",
+  "Accounts_UserAddedEmail_Default": "<h1>Welcome to <strong>[Site_Name]</strong></h1><p>Go to [Site_URL] and try the best open source chat solution available today!</p><p>You may login using your email: [email] and password: [password]. You may be required to change it after your first login.",
   "Accounts_UserAddedEmail_Description": "You may use the following placeholders: <br /><ul><li>[name], [fname], [lname] for the user's full name, first name or last name, respectively.</li><li>[email] for the user's email.</li><li>[password] for the user's password.</li><li>[Site_Name] and [Site_URL] for the Application Name and URL respectively.</li></ul>",
   "Accounts_UserAddedEmailSubject_Default": "You have been added to [Site_Name]",
   "Activate": "Activate",
@@ -941,7 +941,7 @@
   "Invisible": "Invisible",
   "Invitation": "Invitation",
   "Invitation_HTML": "Invitation HTML",
-  "Invitation_HTML_Default": "<h2>You have been invited to <h1>[Site_Name]</h1></h2><p>Go to [Site_URL] and try the best open source chat solution available today!</p>",
+  "Invitation_HTML_Default": "<h1>You have been invited to <strong>[Site_Name]</strong></h1><p>Go to [Site_URL] and try the best open source chat solution available today!</p>",
   "Invitation_HTML_Description": "You may use the following placeholders: <br /><ul><li>[email] for the recipient email.</li><li>[Site_Name] and [Site_URL] for the Application Name and URL respectively.</li></ul>",
   "Invitation_Subject": "Invitation Subject",
   "Invitation_Subject_Default": "You have been invited to [Site_Name]",

From 047e6f34bad6ba99fec216bcead0ea94e5d71b32 Mon Sep 17 00:00:00 2001
From: "Stuart P. Bentley" <s@stuartpb.com>
Date: Wed, 14 Mar 2018 00:36:50 -0700
Subject: [PATCH 02/29] Fix spelling of "collaborative"

---
 .../client/views/channelSettings.html                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.html b/packages/rocketchat-channel-settings/client/views/channelSettings.html
index 735b947029ec..f71675b7cb9e 100644
--- a/packages/rocketchat-channel-settings/client/views/channelSettings.html
+++ b/packages/rocketchat-channel-settings/client/views/channelSettings.html
@@ -94,7 +94,7 @@
 			<div class="rc-user-info__row rc-user-info__row--separator">
 				<div class="rc-switch-double">
 					<div class="rc-switch-double__label  {{equal true value 'disabled'}}">
-						{{_ "Colaborative"}}{{equal default value '*'}}
+						{{_ "Collaborative"}}{{equal default value '*'}}
 						<div class="rc-switch-double__description">
 							{{_ "All_users_in_the_channel_can_write_new_messages"}}
 						</div>

From e5333d48cfee0e84095c6c1e7cae59bd879f5b45 Mon Sep 17 00:00:00 2001
From: "Pierre H. Lehnen" <Hudell@users.noreply.github.com>
Date: Fri, 15 Jun 2018 17:31:35 -0300
Subject: [PATCH 03/29] [FIX] Wordpress OAuth not providing enough info to log
 in (#11152)

---
 packages/rocketchat-api/server/v1/settings.js |  2 +-
 packages/rocketchat-wordpress/common.js       | 28 +++++++++++++++----
 packages/rocketchat-wordpress/startup.js      |  3 +-
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/packages/rocketchat-api/server/v1/settings.js b/packages/rocketchat-api/server/v1/settings.js
index b4bd19ebf505..e3fa0ee742e0 100644
--- a/packages/rocketchat-api/server/v1/settings.js
+++ b/packages/rocketchat-api/server/v1/settings.js
@@ -35,7 +35,7 @@ RocketChat.API.v1.addRoute('settings.oauth', { authRequired: false }, {
 			const oAuthServicesEnabled = ServiceConfiguration.configurations.find({}, { fields: { secret: 0 } }).fetch();
 
 			return oAuthServicesEnabled.map((service) => {
-				if (service.custom || ['saml', 'cas'].includes(service.service)) {
+				if (service.custom || ['saml', 'cas', 'wordpress'].includes(service.service)) {
 					return { ...service };
 				}
 
diff --git a/packages/rocketchat-wordpress/common.js b/packages/rocketchat-wordpress/common.js
index c1e2bd5fa3be..3bb2550e18bd 100644
--- a/packages/rocketchat-wordpress/common.js
+++ b/packages/rocketchat-wordpress/common.js
@@ -13,7 +13,7 @@ const config = {
 
 const WordPress = new CustomOAuth('wordpress', config);
 
-const fillSettings = _.debounce(() => {
+const fillSettings = _.debounce(Meteor.bindEnvironment(() => {
 	config.serverURL = RocketChat.settings.get('API_Wordpress_URL');
 
 	delete config.identityPath;
@@ -46,18 +46,34 @@ const fillSettings = _.debounce(() => {
 			}
 			break;
 		case 'wordpress-com':
-			config.identityPath = '/rest/v1/me';
+			config.identityPath = 'https://public-api.wordpress.com/rest/v1/me';
 			config.identityTokenSentVia = 'header';
-			config.authorizePath = '/oauth2/authorize';
-			config.tokenPath = '/oauth2/token';
+			config.authorizePath = 'https://public-api.wordpress.com/oauth2/authorize';
+			config.tokenPath = 'https://public-api.wordpress.com/oauth2/token';
 			config.scope = 'auth';
 			break;
 		default:
 			config.identityPath = '/oauth/me';
 			break;
 	}
-	return WordPress.configure(config);
-}, 1000);
+
+	const result = WordPress.configure(config);
+
+	const enabled = RocketChat.settings.get('Accounts_OAuth_Wordpress');
+	if (enabled) {
+		ServiceConfiguration.configurations.upsert({
+			service: 'wordpress'
+		}, {
+			$set: config
+		});
+	} else {
+		ServiceConfiguration.configurations.remove({
+			service: 'wordpress'
+		});
+	}
+
+	return result;
+}), 1000);
 
 if (Meteor.isServer) {
 	Meteor.startup(function() {
diff --git a/packages/rocketchat-wordpress/startup.js b/packages/rocketchat-wordpress/startup.js
index 39f520505ec7..80e204375668 100644
--- a/packages/rocketchat-wordpress/startup.js
+++ b/packages/rocketchat-wordpress/startup.js
@@ -39,7 +39,8 @@ RocketChat.settings.addGroup('OAuth', function() {
 					key: 'custom',
 					i18nLabel: 'Accounts_OAuth_Wordpress_server_type_custom'
 				}
-			]
+			],
+			i18nLabel: 'Server_Type'
 		});
 
 		const customOAuthQuery = [{

From 7897a29810688b31761a69117594b729eac35872 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Mon, 4 Jun 2018 22:46:47 +0200
Subject: [PATCH 04/29] Merge pull request #10998 from
 vynmera/fix-lazy-load-big-images-because-they-are-a-bit-too-big

[FIX] Preview of large images scrollbars because not resizing the to fit area
---
 .../client/messageAttachment.html                             | 2 +-
 packages/rocketchat-theme/client/imports/general/base_old.css | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/rocketchat-message-attachments/client/messageAttachment.html b/packages/rocketchat-message-attachments/client/messageAttachment.html
index 46b033f4a0f0..4378ce94b97f 100644
--- a/packages/rocketchat-message-attachments/client/messageAttachment.html
+++ b/packages/rocketchat-message-attachments/client/messageAttachment.html
@@ -63,7 +63,7 @@
 
 			{{#if image_url}}
 				{{#unless mediaCollapsed}}
-					<div class="attachment-image">
+					<div class="attachment-image inline-image">
 					{{#if loadImage}}
 						<figure>
 							{{> lazyloadImage src=image_url preview=image_preview height=(getImageHeight image_dimensions.height) class="gallery-item" title=title description=description}}
diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index 362af719c35d..6f0e0c49e570 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -3162,7 +3162,6 @@
 
 		& .inline-image {
 			display: inline-block;
-			overflow: hidden;
 
 			border-radius: 3px;
 			background-repeat: no-repeat;
@@ -3175,6 +3174,7 @@
 			& img {
 				max-width: 100%;
 				max-height: 200px;
+				object-fit: contain;
 
 				cursor: pointer;
 			}
@@ -3295,7 +3295,7 @@
 }
 
 .rc-old .attachment-description {
-	margin-top: 10px;
+	margin: 6px;
 
 	line-height: 1;
 }

From 78ca5564ca742704a8f335966878b2d8253f7e33 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Wed, 13 Jun 2018 15:02:27 -0300
Subject: [PATCH 05/29] [FIX] users model not receiving options (#11129)

---
 packages/rocketchat-lib/server/models/Users.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-lib/server/models/Users.js b/packages/rocketchat-lib/server/models/Users.js
index db9982b25ca0..5424fb97982d 100644
--- a/packages/rocketchat-lib/server/models/Users.js
+++ b/packages/rocketchat-lib/server/models/Users.js
@@ -51,10 +51,10 @@ class ModelUsers extends RocketChat.models._Base {
 		return this.findOne(query, options);
 	}
 
-	findOneById(userId) {
+	findOneById(userId, options) {
 		const query =	{_id: userId};
 
-		return this.findOne(query);
+		return this.findOne(query, options);
 	}
 
 	// FIND

From fbb72dfaa068dad29e314806446ff39869e4c405 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Sat, 16 Jun 2018 11:09:46 -0300
Subject: [PATCH 06/29] Bump version to 0.65.2

---
 .docker/Dockerfile                      |   2 +-
 .docker/Dockerfile.rhel                 |   2 +-
 .github/history.json                    |  49 +++
 .sandstorm/sandstorm-pkgdef.capnp       |   4 +-
 .travis/snap.sh                         |   2 +-
 HISTORY.md                              | 531 +++++++++++++++++++-----
 package.json                            |   2 +-
 packages/rocketchat-lib/rocketchat.info |   2 +-
 8 files changed, 490 insertions(+), 104 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index be68d0ce1a12..8337d52f3915 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:8
 
-ENV RC_VERSION 0.65.1
+ENV RC_VERSION 0.65.2
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index be945c34c810..25c1c175ca6c 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 0.65.1
+ENV RC_VERSION 0.65.2
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index c1a279dfff1c..d38af54ba947 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -14745,5 +14745,54 @@
         "ggazzo"
       ]
     }
+  ],
+  "0.65.2": [
+    {
+      "pr": "11129",
+      "title": "[FIX] Users model was not receiving options",
+      "userLogin": "sampaiodiego",
+      "contributors": [
+        "sampaiodiego"
+      ]
+    },
+    {
+      "pr": "10998",
+      "title": "[FIX] Preview of large images not resizing to fit the area and having scrollbars",
+      "userLogin": "vynmera",
+      "milestone": "0.66.0",
+      "contributors": [
+        "vynmera",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11152",
+      "title": "[FIX] Wordpress OAuth not providing enough info to log in ",
+      "userLogin": "Hudell",
+      "contributors": [
+        "Hudell",
+        "sampaiodiego"
+      ]
+    },
+    {
+      "pr": "10134",
+      "title": "[FIX] Fix spelling of \"collaborative\"",
+      "userLogin": "stuartpb",
+      "contributors": [
+        "stuartpb",
+        "web-flow",
+        "engelgabriel"
+      ]
+    },
+    {
+      "pr": "9534",
+      "title": "[FIX] i18n - add semantic markup",
+      "userLogin": "brylie",
+      "contributors": [
+        "brylie",
+        "web-flow",
+        "engelgabriel"
+      ]
+    }
   ]
 }
\ No newline at end of file
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index df614183ca37..27de9eab9eb0 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appTitle = (defaultText = "Rocket.Chat"),
 
-		appVersion = 71,  # Increment this for every release.
+		appVersion = 72,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.65.1"),
+		appMarketingVersion = (defaultText = "0.65.2"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index cc0e50afd18d..417c90fb1b04 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.65.1
+    RC_VERSION=0.65.2
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index da40e7921937..6d7c11b2a2ed 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,29 @@
 
+# 0.65.2
+`2018-06-16  ·  5 🐛  ·  6 👩‍💻👨‍💻`
+
+### 🐛 Bug fixes
+
+- Users model was not receiving options ([#11129](https://github.com/RocketChat/Rocket.Chat/pull/11129))
+- Preview of large images not resizing to fit the area and having scrollbars ([#10998](https://github.com/RocketChat/Rocket.Chat/pull/10998) by [@vynmera](https://github.com/vynmera))
+- Wordpress OAuth not providing enough info to log in  ([#11152](https://github.com/RocketChat/Rocket.Chat/pull/11152))
+- Fix spelling of "collaborative" ([#10134](https://github.com/RocketChat/Rocket.Chat/pull/10134) by [@stuartpb](https://github.com/stuartpb))
+- i18n - add semantic markup ([#9534](https://github.com/RocketChat/Rocket.Chat/pull/9534) by [@brylie](https://github.com/brylie))
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@brylie](https://github.com/brylie)
+- [@stuartpb](https://github.com/stuartpb)
+- [@vynmera](https://github.com/vynmera)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@Hudell](https://github.com/Hudell)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.65.1
-`2018-05-30  ·  5 🐛`
+`2018-05-30  ·  5 🐛  ·  3 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
@@ -10,8 +33,14 @@
 - Image lazy load was breaking attachments ([#10904](https://github.com/RocketChat/Rocket.Chat/pull/10904))
 - Leave room wasn't working as expected ([#10851](https://github.com/RocketChat/Rocket.Chat/pull/10851))
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.65.0
-`2018-05-28  ·  17 🎉  ·  24 🐛  ·  41 🔍  ·  17 👩‍💻👨‍💻`
+`2018-05-28  ·  17 🎉  ·  24 🐛  ·  41 🔍  ·  29 👩‍💻👨‍💻`
 
 ### 🎉 New features
 
@@ -27,11 +56,11 @@
 - Now is possible to access files using header authorization (`x-user-id` and `x-auth-token`) ([#10741](https://github.com/RocketChat/Rocket.Chat/pull/10741))
 - Add REST API endpoints `channels.counters`, `groups.counters and `im.counters` ([#9679](https://github.com/RocketChat/Rocket.Chat/pull/9679) by [@xbolshe](https://github.com/xbolshe))
 - Add REST API endpoints `channels.setCustomFields` and `groups.setCustomFields` ([#9733](https://github.com/RocketChat/Rocket.Chat/pull/9733) by [@xbolshe](https://github.com/xbolshe))
-- Add REST endpoints `channels.roles` & `groups.roles` ([#10607](https://github.com/RocketChat/Rocket.Chat/pull/10607) by [@cardoso](https://github.com/cardoso))
+- Add REST endpoints `channels.roles` & `groups.roles` ([#10607](https://github.com/RocketChat/Rocket.Chat/pull/10607))
 - Add more options for Wordpress OAuth configuration ([#10724](https://github.com/RocketChat/Rocket.Chat/pull/10724))
 - Setup Wizard ([#10523](https://github.com/RocketChat/Rocket.Chat/pull/10523))
 - Improvements to notifications logic ([#10686](https://github.com/RocketChat/Rocket.Chat/pull/10686))
-- Add permission `view-broadcast-member-list` ([#10753](https://github.com/RocketChat/Rocket.Chat/pull/10753) by [@cardoso](https://github.com/cardoso))
+- Add permission `view-broadcast-member-list` ([#10753](https://github.com/RocketChat/Rocket.Chat/pull/10753))
 
 ### 🐛 Bug fixes
 
@@ -63,9 +92,9 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
-- Release 0.64.2 ([#10812](https://github.com/RocketChat/Rocket.Chat/pull/10812) by [@Sameesunkaria](https://github.com/Sameesunkaria) & [@cardoso](https://github.com/cardoso) & [@erhan-](https://github.com/erhan-) & [@peccu](https://github.com/peccu) & [@winterstefan](https://github.com/winterstefan))
+- Release 0.64.2 ([#10812](https://github.com/RocketChat/Rocket.Chat/pull/10812) by [@Sameesunkaria](https://github.com/Sameesunkaria) & [@erhan-](https://github.com/erhan-) & [@peccu](https://github.com/peccu) & [@winterstefan](https://github.com/winterstefan))
 - Release 0.64.1 ([#10660](https://github.com/RocketChat/Rocket.Chat/pull/10660) by [@saplla](https://github.com/saplla))
-- Release 0.64.0 ([#10613](https://github.com/RocketChat/Rocket.Chat/pull/10613) by [@TwizzyDizzy](https://github.com/TwizzyDizzy) & [@christianh814](https://github.com/christianh814) & [@tttt-conan](https://github.com/tttt-conan))
+- Release 0.64.0 ([#10613](https://github.com/RocketChat/Rocket.Chat/pull/10613) by [@christianh814](https://github.com/christianh814) & [@tttt-conan](https://github.com/tttt-conan))
 - Release 0.63.3 ([#10504](https://github.com/RocketChat/Rocket.Chat/pull/10504))
 - Release 0.63.2 ([#10476](https://github.com/RocketChat/Rocket.Chat/pull/10476))
 - add redhat dockerfile to master ([#10408](https://github.com/RocketChat/Rocket.Chat/pull/10408))
@@ -88,9 +117,9 @@
 - LingoHub based on develop ([#10691](https://github.com/RocketChat/Rocket.Chat/pull/10691))
 - Add `npm run postinstall` into example build script ([#10524](https://github.com/RocketChat/Rocket.Chat/pull/10524) by [@peccu](https://github.com/peccu))
 - Correct links in README file ([#10674](https://github.com/RocketChat/Rocket.Chat/pull/10674) by [@winterstefan](https://github.com/winterstefan))
-- Release 0.64.2 ([#10812](https://github.com/RocketChat/Rocket.Chat/pull/10812) by [@Sameesunkaria](https://github.com/Sameesunkaria) & [@cardoso](https://github.com/cardoso) & [@erhan-](https://github.com/erhan-) & [@peccu](https://github.com/peccu) & [@winterstefan](https://github.com/winterstefan))
+- Release 0.64.2 ([#10812](https://github.com/RocketChat/Rocket.Chat/pull/10812) by [@Sameesunkaria](https://github.com/Sameesunkaria) & [@erhan-](https://github.com/erhan-) & [@peccu](https://github.com/peccu) & [@winterstefan](https://github.com/winterstefan))
 - Release 0.64.1 ([#10660](https://github.com/RocketChat/Rocket.Chat/pull/10660) by [@saplla](https://github.com/saplla))
-- Release 0.64.0 ([#10613](https://github.com/RocketChat/Rocket.Chat/pull/10613) by [@TwizzyDizzy](https://github.com/TwizzyDizzy) & [@christianh814](https://github.com/christianh814) & [@tttt-conan](https://github.com/tttt-conan))
+- Release 0.64.0 ([#10613](https://github.com/RocketChat/Rocket.Chat/pull/10613) by [@christianh814](https://github.com/christianh814) & [@tttt-conan](https://github.com/tttt-conan))
 - Release 0.63.3 ([#10504](https://github.com/RocketChat/Rocket.Chat/pull/10504))
 - Release 0.63.2 ([#10476](https://github.com/RocketChat/Rocket.Chat/pull/10476))
 - add redhat dockerfile to master ([#10408](https://github.com/RocketChat/Rocket.Chat/pull/10408))
@@ -112,9 +141,7 @@
 - [@Mr-Gryphon](https://github.com/Mr-Gryphon)
 - [@Sameesunkaria](https://github.com/Sameesunkaria)
 - [@ThomasRoehl](https://github.com/ThomasRoehl)
-- [@TwizzyDizzy](https://github.com/TwizzyDizzy)
 - [@c0dzilla](https://github.com/c0dzilla)
-- [@cardoso](https://github.com/cardoso)
 - [@cfunkles](https://github.com/cfunkles)
 - [@christianh814](https://github.com/christianh814)
 - [@chuckAtCataworx](https://github.com/chuckAtCataworx)
@@ -127,16 +154,33 @@
 - [@winterstefan](https://github.com/winterstefan)
 - [@xbolshe](https://github.com/xbolshe)
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@Hudell](https://github.com/Hudell)
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@TwizzyDizzy](https://github.com/TwizzyDizzy)
+- [@cardoso](https://github.com/cardoso)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@gdelavald](https://github.com/gdelavald)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@ggazzo](https://github.com/ggazzo)
+- [@graywolf336](https://github.com/graywolf336)
+- [@karlprieb](https://github.com/karlprieb)
+- [@rafaelks](https://github.com/rafaelks)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.64.2
-`2018-05-18  ·  8 🎉  ·  16 🐛  ·  31 🔍  ·  5 👩‍💻👨‍💻`
+`2018-05-18  ·  8 🎉  ·  16 🐛  ·  31 🔍  ·  13 👩‍💻👨‍💻`
 
 ### 🎉 New features
 
-- Add REST endpoints `channels.roles` & `groups.roles` ([#10607](https://github.com/RocketChat/Rocket.Chat/pull/10607) by [@cardoso](https://github.com/cardoso))
+- Add REST endpoints `channels.roles` & `groups.roles` ([#10607](https://github.com/RocketChat/Rocket.Chat/pull/10607))
 - Add more options for Wordpress OAuth configuration ([#10724](https://github.com/RocketChat/Rocket.Chat/pull/10724))
 - Setup Wizard ([#10523](https://github.com/RocketChat/Rocket.Chat/pull/10523))
 - Improvements to notifications logic ([#10686](https://github.com/RocketChat/Rocket.Chat/pull/10686))
-- Add REST endpoints `channels.roles` & `groups.roles` ([#10607](https://github.com/RocketChat/Rocket.Chat/pull/10607) by [@cardoso](https://github.com/cardoso))
+- Add REST endpoints `channels.roles` & `groups.roles` ([#10607](https://github.com/RocketChat/Rocket.Chat/pull/10607))
 - Add more options for Wordpress OAuth configuration ([#10724](https://github.com/RocketChat/Rocket.Chat/pull/10724))
 - Setup Wizard ([#10523](https://github.com/RocketChat/Rocket.Chat/pull/10523))
 - Improvements to notifications logic ([#10686](https://github.com/RocketChat/Rocket.Chat/pull/10686))
@@ -163,7 +207,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
-- Release 0.64.2 ([#10812](https://github.com/RocketChat/Rocket.Chat/pull/10812) by [@Sameesunkaria](https://github.com/Sameesunkaria) & [@cardoso](https://github.com/cardoso) & [@erhan-](https://github.com/erhan-) & [@peccu](https://github.com/peccu) & [@winterstefan](https://github.com/winterstefan))
+- Release 0.64.2 ([#10812](https://github.com/RocketChat/Rocket.Chat/pull/10812) by [@Sameesunkaria](https://github.com/Sameesunkaria) & [@erhan-](https://github.com/erhan-) & [@peccu](https://github.com/peccu) & [@winterstefan](https://github.com/winterstefan))
 - Prometheus: Add metric to track hooks time ([#10798](https://github.com/RocketChat/Rocket.Chat/pull/10798))
 - Regression: Autorun of wizard was not destroyed after completion ([#10802](https://github.com/RocketChat/Rocket.Chat/pull/10802))
 - Prometheus: Fix notification metric ([#10803](https://github.com/RocketChat/Rocket.Chat/pull/10803))
@@ -200,13 +244,24 @@
 ### 👩‍💻👨‍💻 Contributors 😍
 
 - [@Sameesunkaria](https://github.com/Sameesunkaria)
-- [@cardoso](https://github.com/cardoso)
 - [@erhan-](https://github.com/erhan-)
 - [@peccu](https://github.com/peccu)
 - [@winterstefan](https://github.com/winterstefan)
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@Hudell](https://github.com/Hudell)
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@cardoso](https://github.com/cardoso)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@gdelavald](https://github.com/gdelavald)
+- [@karlprieb](https://github.com/karlprieb)
+- [@rafaelks](https://github.com/rafaelks)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.64.1
-`2018-05-03  ·  1 🎉  ·  2 🐛  ·  3 🔍  ·  1 👩‍💻👨‍💻`
+`2018-05-03  ·  1 🎉  ·  2 🐛  ·  3 🔍  ·  5 👩‍💻👨‍💻`
 
 ### 🎉 New features
 
@@ -230,8 +285,15 @@
 
 - [@saplla](https://github.com/saplla)
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@graywolf336](https://github.com/graywolf336)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.64.0
-`2018-04-28  ·  2 ️️️⚠️  ·  18 🎉  ·  44 🐛  ·  33 🔍  ·  18 👩‍💻👨‍💻`
+`2018-04-28  ·  2 ️️️⚠️  ·  18 🎉  ·  44 🐛  ·  33 🔍  ·  30 👩‍💻👨‍💻`
 
 ### ⚠️ BREAKING CHANGES
 
@@ -310,7 +372,7 @@
 <summary>🔍 Minor changes</summary>
 
 - Regression: Various search provider fixes ([#10591](https://github.com/RocketChat/Rocket.Chat/pull/10591) by [@tkurz](https://github.com/tkurz))
-- Regression: /api/v1/settings.oauth not sending needed info for SAML & CAS ([#10596](https://github.com/RocketChat/Rocket.Chat/pull/10596) by [@cardoso](https://github.com/cardoso))
+- Regression: /api/v1/settings.oauth not sending needed info for SAML & CAS ([#10596](https://github.com/RocketChat/Rocket.Chat/pull/10596))
 - Regression: Apps and Livechats not getting along well with each other ([#10598](https://github.com/RocketChat/Rocket.Chat/pull/10598))
 - Development: Add Visual Studio Code debugging configuration ([#10586](https://github.com/RocketChat/Rocket.Chat/pull/10586))
 - Included missing lib for migrations ([#10532](https://github.com/RocketChat/Rocket.Chat/pull/10532))
@@ -323,7 +385,7 @@
 - [OTHER] Removed the developer warning on the rest api ([#10441](https://github.com/RocketChat/Rocket.Chat/pull/10441))
 - Fix and improve vietnamese translation ([#10397](https://github.com/RocketChat/Rocket.Chat/pull/10397) by [@TDiNguyen](https://github.com/TDiNguyen) & [@tttt-conan](https://github.com/tttt-conan))
 - Use Node 8.9 for CI build ([#10405](https://github.com/RocketChat/Rocket.Chat/pull/10405))
-- Update allowed labels for bot ([#10360](https://github.com/RocketChat/Rocket.Chat/pull/10360) by [@TwizzyDizzy](https://github.com/TwizzyDizzy))
+- Update allowed labels for bot ([#10360](https://github.com/RocketChat/Rocket.Chat/pull/10360))
 - Remove @core team mention from Pull Request template ([#10384](https://github.com/RocketChat/Rocket.Chat/pull/10384))
 - New issue template for *Release Process* ([#10234](https://github.com/RocketChat/Rocket.Chat/pull/10234))
 - Master into Develop Branch Sync ([#10376](https://github.com/RocketChat/Rocket.Chat/pull/10376))
@@ -334,7 +396,7 @@
 - Regression: Revert announcement structure ([#10544](https://github.com/RocketChat/Rocket.Chat/pull/10544))
 - Regression: Upload was not working ([#10543](https://github.com/RocketChat/Rocket.Chat/pull/10543))
 - Deps update ([#10549](https://github.com/RocketChat/Rocket.Chat/pull/10549))
-- Regression: /api/v1/settings.oauth not returning clientId for Twitter ([#10560](https://github.com/RocketChat/Rocket.Chat/pull/10560) by [@cardoso](https://github.com/cardoso))
+- Regression: /api/v1/settings.oauth not returning clientId for Twitter ([#10560](https://github.com/RocketChat/Rocket.Chat/pull/10560))
 - Regression: Webhooks breaking due to restricted test ([#10555](https://github.com/RocketChat/Rocket.Chat/pull/10555))
 - Regression: Rooms and Apps weren't playing nice with each other ([#10559](https://github.com/RocketChat/Rocket.Chat/pull/10559))
 - Regression: Fix announcement bar being displayed without content ([#10554](https://github.com/RocketChat/Rocket.Chat/pull/10554))
@@ -349,11 +411,9 @@
 
 - [@Prakharsvnit](https://github.com/Prakharsvnit)
 - [@TDiNguyen](https://github.com/TDiNguyen)
-- [@TwizzyDizzy](https://github.com/TwizzyDizzy)
 - [@abernix](https://github.com/abernix)
 - [@brendangadd](https://github.com/brendangadd)
 - [@c0dzilla](https://github.com/c0dzilla)
-- [@cardoso](https://github.com/cardoso)
 - [@christianh814](https://github.com/christianh814)
 - [@dschuan](https://github.com/dschuan)
 - [@kaiiiiiiiii](https://github.com/kaiiiiiiiii)
@@ -366,8 +426,25 @@
 - [@tkurz](https://github.com/tkurz)
 - [@tttt-conan](https://github.com/tttt-conan)
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@Hudell](https://github.com/Hudell)
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@TwizzyDizzy](https://github.com/TwizzyDizzy)
+- [@cardoso](https://github.com/cardoso)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@gdelavald](https://github.com/gdelavald)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@ggazzo](https://github.com/ggazzo)
+- [@graywolf336](https://github.com/graywolf336)
+- [@karlprieb](https://github.com/karlprieb)
+- [@rafaelks](https://github.com/rafaelks)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.63.3
-`2018-04-18  ·  2 🐛  ·  2 🔍  ·  1 👩‍💻👨‍💻`
+`2018-04-18  ·  2 🐛  ·  2 🔍  ·  3 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
@@ -386,8 +463,13 @@
 
 - [@nsuchy](https://github.com/nsuchy)
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@graywolf336](https://github.com/graywolf336)
+- [@rafaelks](https://github.com/rafaelks)
+
 # 0.63.2
-`2018-04-17  ·  1 🐛  ·  1 🔍`
+`2018-04-17  ·  1 🐛  ·  1 🔍  ·  2 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
@@ -400,8 +482,13 @@
 
 </details>
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@graywolf336](https://github.com/graywolf336)
+
 # 0.63.1
-`2018-04-07  ·  5 🐛  ·  3 👩‍💻👨‍💻`
+`2018-04-07  ·  5 🐛  ·  6 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
@@ -417,8 +504,14 @@
 - [@kaiiiiiiiii](https://github.com/kaiiiiiiiii)
 - [@tttt-conan](https://github.com/tttt-conan)
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@graywolf336](https://github.com/graywolf336)
+- [@rodrigok](https://github.com/rodrigok)
+
 # 0.63.0
-`2018-04-04  ·  1 ️️️⚠️  ·  18 🎉  ·  44 🐛  ·  20 🔍  ·  13 👩‍💻👨‍💻`
+`2018-04-04  ·  1 ️️️⚠️  ·  18 🎉  ·  44 🐛  ·  20 🔍  ·  25 👩‍💻👨‍💻`
 
 ### ⚠️ BREAKING CHANGES
 
@@ -462,7 +555,7 @@
 - Reactions not working on mobile ([#10104](https://github.com/RocketChat/Rocket.Chat/pull/10104))
 - Broken video call accept dialog ([#9872](https://github.com/RocketChat/Rocket.Chat/pull/9872) by [@ramrami](https://github.com/ramrami))
 - Wrong switch button border color ([#10081](https://github.com/RocketChat/Rocket.Chat/pull/10081) by [@kb0304](https://github.com/kb0304))
-- Nextcloud as custom oauth provider wasn't mapping data correctly ([#10090](https://github.com/RocketChat/Rocket.Chat/pull/10090) by [@pierreozoux](https://github.com/pierreozoux))
+- Nextcloud as custom oauth provider wasn't mapping data correctly ([#10090](https://github.com/RocketChat/Rocket.Chat/pull/10090))
 - Missing sidebar default options on admin ([#10016](https://github.com/RocketChat/Rocket.Chat/pull/10016))
 - Able to react with invalid emoji ([#8667](https://github.com/RocketChat/Rocket.Chat/pull/8667) by [@mutdmour](https://github.com/mutdmour))
 - Slack Import reports `invalid import file type` due to a call to BSON.native() which is now doesn't exist ([#10071](https://github.com/RocketChat/Rocket.Chat/pull/10071) by [@trongthanh](https://github.com/trongthanh))
@@ -490,7 +583,7 @@
 - Wrong pagination information on /api/v1/channels.members ([#10224](https://github.com/RocketChat/Rocket.Chat/pull/10224))
 - Inline code following a url leads to autolinking of code with url ([#10163](https://github.com/RocketChat/Rocket.Chat/pull/10163) by [@c0dzilla](https://github.com/c0dzilla))
 - Incoming Webhooks were missing the raw content ([#10258](https://github.com/RocketChat/Rocket.Chat/pull/10258))
-- Missing Translation Key on Reactions ([#10270](https://github.com/RocketChat/Rocket.Chat/pull/10270))
+- Missing Translation Key on Reactions ([#10270](https://github.com/RocketChat/Rocket.Chat/pull/10270) by [@bernardoetrevisan](https://github.com/bernardoetrevisan))
 
 <details>
 <summary>🔍 Minor changes</summary>
@@ -500,9 +593,9 @@
 - Update Meteor to 1.6.1.1 ([#10314](https://github.com/RocketChat/Rocket.Chat/pull/10314))
 - LingoHub based on develop ([#10243](https://github.com/RocketChat/Rocket.Chat/pull/10243))
 - Rename migration name on 108 to match file name ([#10237](https://github.com/RocketChat/Rocket.Chat/pull/10237))
-- Fix typo for Nextcloud login ([#10159](https://github.com/RocketChat/Rocket.Chat/pull/10159) by [@pierreozoux](https://github.com/pierreozoux))
+- Fix typo for Nextcloud login ([#10159](https://github.com/RocketChat/Rocket.Chat/pull/10159))
 - Add a few listener supports for the Rocket.Chat Apps ([#10154](https://github.com/RocketChat/Rocket.Chat/pull/10154))
-- Add forums as a place to suggest, discuss and upvote features ([#10148](https://github.com/RocketChat/Rocket.Chat/pull/10148))
+- Add forums as a place to suggest, discuss and upvote features ([#10148](https://github.com/RocketChat/Rocket.Chat/pull/10148) by [@SeanPackham](https://github.com/SeanPackham))
 - Fix tests breaking randomly ([#10065](https://github.com/RocketChat/Rocket.Chat/pull/10065))
 - [OTHER] Reactivate all tests ([#10036](https://github.com/RocketChat/Rocket.Chat/pull/10036))
 - [OTHER] Reactivate API tests ([#9844](https://github.com/RocketChat/Rocket.Chat/pull/9844))
@@ -521,21 +614,36 @@
 ### 👩‍💻👨‍💻 Contributors 😍
 
 - [@Joe-mcgee](https://github.com/Joe-mcgee)
+- [@SeanPackham](https://github.com/SeanPackham)
 - [@TopHattedCat](https://github.com/TopHattedCat)
+- [@bernardoetrevisan](https://github.com/bernardoetrevisan)
 - [@c0dzilla](https://github.com/c0dzilla)
 - [@cyclops24](https://github.com/cyclops24)
 - [@hmagarotto](https://github.com/hmagarotto)
 - [@kaiiiiiiiii](https://github.com/kaiiiiiiiii)
 - [@kb0304](https://github.com/kb0304)
 - [@mutdmour](https://github.com/mutdmour)
-- [@pierreozoux](https://github.com/pierreozoux)
 - [@ramrami](https://github.com/ramrami)
 - [@sumedh123](https://github.com/sumedh123)
 - [@trongthanh](https://github.com/trongthanh)
 - [@ubarsaiyan](https://github.com/ubarsaiyan)
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@Hudell](https://github.com/Hudell)
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@ggazzo](https://github.com/ggazzo)
+- [@graywolf336](https://github.com/graywolf336)
+- [@karlprieb](https://github.com/karlprieb)
+- [@pierreozoux](https://github.com/pierreozoux)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.62.2
-`2018-03-09  ·  6 🐛  ·  1 🔍  ·  1 👩‍💻👨‍💻`
+`2018-03-09  ·  6 🐛  ·  1 🔍  ·  4 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
@@ -557,8 +665,14 @@
 
 - [@trongthanh](https://github.com/trongthanh)
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.62.1
-`2018-03-03  ·  4 🐛  ·  1 🔍`
+`2018-03-03  ·  4 🐛  ·  1 🔍  ·  4 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
@@ -574,8 +688,15 @@
 
 </details>
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+- [@karlprieb](https://github.com/karlprieb)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.62.0
-`2018-02-27  ·  1 ️️️⚠️  ·  24 🎉  ·  32 🐛  ·  26 🔍  ·  25 👩‍💻👨‍💻`
+`2018-02-27  ·  1 ️️️⚠️  ·  24 🎉  ·  32 🐛  ·  26 🔍  ·  39 👩‍💻👨‍💻`
 
 ### ⚠️ BREAKING CHANGES
 
@@ -590,7 +711,7 @@
 - New sidebar layout ([#9608](https://github.com/RocketChat/Rocket.Chat/pull/9608))
 - Message read receipts ([#9717](https://github.com/RocketChat/Rocket.Chat/pull/9717))
 - Alert admins when user requires approval & alert users when the account is approved/activated/deactivated ([#7098](https://github.com/RocketChat/Rocket.Chat/pull/7098) by [@luisfn](https://github.com/luisfn))
-- Allow configuration of SAML logout behavior ([#9527](https://github.com/RocketChat/Rocket.Chat/pull/9527) by [@mrsimpson](https://github.com/mrsimpson))
+- Allow configuration of SAML logout behavior ([#9527](https://github.com/RocketChat/Rocket.Chat/pull/9527))
 - Internal hubot support for Direct Messages and Private Groups ([#8933](https://github.com/RocketChat/Rocket.Chat/pull/8933) by [@ramrami](https://github.com/ramrami))
 - Improved default welcome message ([#9298](https://github.com/RocketChat/Rocket.Chat/pull/9298) by [@HammyHavoc](https://github.com/HammyHavoc))
 - Makes shield icon configurable ([#9746](https://github.com/RocketChat/Rocket.Chat/pull/9746) by [@c0dzilla](https://github.com/c0dzilla))
@@ -605,8 +726,8 @@
 - Add route to get user shield/badge ([#9549](https://github.com/RocketChat/Rocket.Chat/pull/9549) by [@kb0304](https://github.com/kb0304))
 - GraphQL API ([#8158](https://github.com/RocketChat/Rocket.Chat/pull/8158) by [@kamilkisiela](https://github.com/kamilkisiela))
 - Livestream tab ([#9255](https://github.com/RocketChat/Rocket.Chat/pull/9255))
-- Add documentation requirement to PRs ([#9658](https://github.com/RocketChat/Rocket.Chat/pull/9658))
-- Request mongoDB version in github issue template ([#9807](https://github.com/RocketChat/Rocket.Chat/pull/9807) by [@TwizzyDizzy](https://github.com/TwizzyDizzy))
+- Add documentation requirement to PRs ([#9658](https://github.com/RocketChat/Rocket.Chat/pull/9658) by [@SeanPackham](https://github.com/SeanPackham))
+- Request mongoDB version in github issue template ([#9807](https://github.com/RocketChat/Rocket.Chat/pull/9807))
 
 ### 🐛 Bug fixes
 
@@ -616,9 +737,9 @@
 - Livechat conversation not receiving messages when start without form ([#9772](https://github.com/RocketChat/Rocket.Chat/pull/9772))
 - Emoji rendering on last message ([#9776](https://github.com/RocketChat/Rocket.Chat/pull/9776))
 - Chrome 64 breaks jitsi-meet iframe ([#9560](https://github.com/RocketChat/Rocket.Chat/pull/9560) by [@speedy01](https://github.com/speedy01))
-- Harmonize channel-related actions ([#9697](https://github.com/RocketChat/Rocket.Chat/pull/9697) by [@mrsimpson](https://github.com/mrsimpson))
+- Harmonize channel-related actions ([#9697](https://github.com/RocketChat/Rocket.Chat/pull/9697))
 - Custom emoji was cropping sometimes ([#9676](https://github.com/RocketChat/Rocket.Chat/pull/9676) by [@anu-007](https://github.com/anu-007))
-- Show custom room types icon in channel header ([#9696](https://github.com/RocketChat/Rocket.Chat/pull/9696) by [@mrsimpson](https://github.com/mrsimpson))
+- Show custom room types icon in channel header ([#9696](https://github.com/RocketChat/Rocket.Chat/pull/9696))
 - 'Query' support for channels.list.joined, groups.list, groups.listAll, im.list ([#9424](https://github.com/RocketChat/Rocket.Chat/pull/9424) by [@xbolshe](https://github.com/xbolshe))
 - Livechat issues on external queue and lead capture ([#9750](https://github.com/RocketChat/Rocket.Chat/pull/9750))
 - DeprecationWarning: prom-client ... when starting Rocket Chat server ([#9747](https://github.com/RocketChat/Rocket.Chat/pull/9747) by [@jgtoriginal](https://github.com/jgtoriginal))
@@ -634,7 +755,7 @@
 - Desktop notification not showing when avatar came from external storage service ([#9639](https://github.com/RocketChat/Rocket.Chat/pull/9639))
 - Missing link Site URLs in enrollment e-mails ([#9454](https://github.com/RocketChat/Rocket.Chat/pull/9454) by [@kemitchell](https://github.com/kemitchell))
 - Missing string 'Username_already_exist' on the accountProfile page ([#9610](https://github.com/RocketChat/Rocket.Chat/pull/9610) by [@sumedh123](https://github.com/sumedh123))
-- SVG avatars are not been displayed correctly when load in non HTML containers ([#9570](https://github.com/RocketChat/Rocket.Chat/pull/9570) by [@filipedelimabrito](https://github.com/filipedelimabrito))
+- SVG avatars are not been displayed correctly when load in non HTML containers ([#9570](https://github.com/RocketChat/Rocket.Chat/pull/9570))
 - Livechat is not working when running in a sub path ([#9599](https://github.com/RocketChat/Rocket.Chat/pull/9599))
 - Not receiving sound notifications in rooms created by new LiveChats ([#9802](https://github.com/RocketChat/Rocket.Chat/pull/9802))
 - Silence the update check error message ([#9858](https://github.com/RocketChat/Rocket.Chat/pull/9858))
@@ -662,14 +783,14 @@
 - Dependencies update ([#9811](https://github.com/RocketChat/Rocket.Chat/pull/9811))
 - Fix: Custom fields not showing on user info panel ([#9821](https://github.com/RocketChat/Rocket.Chat/pull/9821))
 - Regression: Page was not respecting the window height on Firefox ([#9804](https://github.com/RocketChat/Rocket.Chat/pull/9804))
-- Update bot-config.yml ([#9784](https://github.com/RocketChat/Rocket.Chat/pull/9784) by [@JSzaszvari](https://github.com/JSzaszvari))
+- Update bot-config.yml ([#9784](https://github.com/RocketChat/Rocket.Chat/pull/9784))
 - Develop fix sync from master ([#9797](https://github.com/RocketChat/Rocket.Chat/pull/9797))
 - Regression: Change create channel icon ([#9851](https://github.com/RocketChat/Rocket.Chat/pull/9851))
 - Regression: Fix channel icons on safari ([#9852](https://github.com/RocketChat/Rocket.Chat/pull/9852))
 - Regression: Fix admin/user settings item text ([#9845](https://github.com/RocketChat/Rocket.Chat/pull/9845))
 - Regression: Improve sidebar filter ([#9905](https://github.com/RocketChat/Rocket.Chat/pull/9905))
 - [OTHER] Fix Apps not working on multi-instance deployments ([#9902](https://github.com/RocketChat/Rocket.Chat/pull/9902))
-- [Fix] Not Translated Phrases ([#9877](https://github.com/RocketChat/Rocket.Chat/pull/9877))
+- [Fix] Not Translated Phrases ([#9877](https://github.com/RocketChat/Rocket.Chat/pull/9877) by [@bernardoetrevisan](https://github.com/bernardoetrevisan))
 - Regression: Overlapping header in user profile panel ([#9889](https://github.com/RocketChat/Rocket.Chat/pull/9889) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
 - Regression: sort on room's list not working correctly ([#9897](https://github.com/RocketChat/Rocket.Chat/pull/9897))
 
@@ -679,13 +800,12 @@
 
 - [@AmShaegar13](https://github.com/AmShaegar13)
 - [@HammyHavoc](https://github.com/HammyHavoc)
-- [@JSzaszvari](https://github.com/JSzaszvari)
 - [@RationalCoding](https://github.com/RationalCoding)
-- [@TwizzyDizzy](https://github.com/TwizzyDizzy)
+- [@SeanPackham](https://github.com/SeanPackham)
 - [@anu-007](https://github.com/anu-007)
+- [@bernardoetrevisan](https://github.com/bernardoetrevisan)
 - [@c0dzilla](https://github.com/c0dzilla)
 - [@cyberhck](https://github.com/cyberhck)
-- [@filipedelimabrito](https://github.com/filipedelimabrito)
 - [@jgtoriginal](https://github.com/jgtoriginal)
 - [@jorgeluisrezende](https://github.com/jorgeluisrezende)
 - [@jsm84](https://github.com/jsm84)
@@ -695,7 +815,6 @@
 - [@kemitchell](https://github.com/kemitchell)
 - [@lindoelio](https://github.com/lindoelio)
 - [@luisfn](https://github.com/luisfn)
-- [@mrsimpson](https://github.com/mrsimpson)
 - [@ramrami](https://github.com/ramrami)
 - [@savikko](https://github.com/savikko)
 - [@sizrar](https://github.com/sizrar)
@@ -703,8 +822,27 @@
 - [@sumedh123](https://github.com/sumedh123)
 - [@xbolshe](https://github.com/xbolshe)
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@JSzaszvari](https://github.com/JSzaszvari)
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@MartinSchoeler](https://github.com/MartinSchoeler)
+- [@TwizzyDizzy](https://github.com/TwizzyDizzy)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@filipedelimabrito](https://github.com/filipedelimabrito)
+- [@gdelavald](https://github.com/gdelavald)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@ggazzo](https://github.com/ggazzo)
+- [@graywolf336](https://github.com/graywolf336)
+- [@karlprieb](https://github.com/karlprieb)
+- [@mrsimpson](https://github.com/mrsimpson)
+- [@rafaelks](https://github.com/rafaelks)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.61.2
-`2018-02-20  ·  3 🐛  ·  1 🔍`
+`2018-02-20  ·  3 🐛  ·  1 🔍  ·  3 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
@@ -719,8 +857,14 @@
 
 </details>
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.61.1
-`2018-02-14  ·  1 🔍`
+`2018-02-14  ·  1 🔍  ·  1 👩‍💻👨‍💻`
 
 <details>
 <summary>🔍 Minor changes</summary>
@@ -729,8 +873,12 @@
 
 </details>
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@rodrigok](https://github.com/rodrigok)
+
 # 0.61.0
-`2018-01-27  ·  1 ️️️⚠️  ·  12 🎉  ·  55 🐛  ·  43 🔍  ·  13 👩‍💻👨‍💻`
+`2018-01-27  ·  1 ️️️⚠️  ·  12 🎉  ·  55 🐛  ·  43 🔍  ·  23 👩‍💻👨‍💻`
 
 ### ⚠️ BREAKING CHANGES
 
@@ -748,7 +896,7 @@
 - Livechat extract lead data from message ([#9135](https://github.com/RocketChat/Rocket.Chat/pull/9135))
 - Add impersonate option for livechat triggers ([#9107](https://github.com/RocketChat/Rocket.Chat/pull/9107))
 - Add support to external livechat queue service provider ([#9053](https://github.com/RocketChat/Rocket.Chat/pull/9053))
-- Make Custom oauth accept nested usernameField ([#9066](https://github.com/RocketChat/Rocket.Chat/pull/9066) by [@pierreozoux](https://github.com/pierreozoux))
+- Make Custom oauth accept nested usernameField ([#9066](https://github.com/RocketChat/Rocket.Chat/pull/9066))
 - Contextual bar mail messages ([#9510](https://github.com/RocketChat/Rocket.Chat/pull/9510))
 
 ### 🐛 Bug fixes
@@ -853,7 +1001,7 @@
 - Release 0.60.4 ([#9377](https://github.com/RocketChat/Rocket.Chat/pull/9377))
 - Release 0.60.3 ([#9320](https://github.com/RocketChat/Rocket.Chat/pull/9320) by [@HammyHavoc](https://github.com/HammyHavoc))
 - [DOCS] Update the links of our Mobile Apps in Features topic ([#9469](https://github.com/RocketChat/Rocket.Chat/pull/9469))
-- Update license ([#9490](https://github.com/RocketChat/Rocket.Chat/pull/9490) by [@frdmn](https://github.com/frdmn))
+- Update license ([#9490](https://github.com/RocketChat/Rocket.Chat/pull/9490))
 - Prevent NPM package-lock inside livechat ([#9504](https://github.com/RocketChat/Rocket.Chat/pull/9504))
 
 </details>
@@ -864,18 +1012,31 @@
 - [@TheReal1604](https://github.com/TheReal1604)
 - [@cpitman](https://github.com/cpitman)
 - [@cyclops24](https://github.com/cyclops24)
-- [@frdmn](https://github.com/frdmn)
 - [@ggrish](https://github.com/ggrish)
 - [@mms-segu](https://github.com/mms-segu)
 - [@paulovitin](https://github.com/paulovitin)
 - [@peterlee0127](https://github.com/peterlee0127)
-- [@pierreozoux](https://github.com/pierreozoux)
 - [@ramrami](https://github.com/ramrami)
 - [@ryjones](https://github.com/ryjones)
 - [@vitor-nagao](https://github.com/vitor-nagao)
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MartinSchoeler](https://github.com/MartinSchoeler)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@frdmn](https://github.com/frdmn)
+- [@gdelavald](https://github.com/gdelavald)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@ggazzo](https://github.com/ggazzo)
+- [@graywolf336](https://github.com/graywolf336)
+- [@karlprieb](https://github.com/karlprieb)
+- [@pierreozoux](https://github.com/pierreozoux)
+- [@rafaelks](https://github.com/rafaelks)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.60.4
-`2018-01-10  ·  5 🐛  ·  4 🔍  ·  1 👩‍💻👨‍💻`
+`2018-01-10  ·  5 🐛  ·  4 🔍  ·  4 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
@@ -899,8 +1060,14 @@
 
 - [@HammyHavoc](https://github.com/HammyHavoc)
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@karlprieb](https://github.com/karlprieb)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.60.3
-`2018-01-03  ·  6 🐛  ·  5 🔍  ·  1 👩‍💻👨‍💻`
+`2018-01-03  ·  6 🐛  ·  5 🔍  ·  3 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
@@ -926,8 +1093,13 @@
 
 - [@HammyHavoc](https://github.com/HammyHavoc)
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@karlprieb](https://github.com/karlprieb)
+- [@rodrigok](https://github.com/rodrigok)
+
 # 0.60.2
-`2017-12-29  ·  3 🐛  ·  1 🔍`
+`2017-12-29  ·  3 🐛  ·  1 🔍  ·  2 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
@@ -942,15 +1114,24 @@
 
 </details>
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.60.1
-`2017-12-27  ·  1 🐛`
+`2017-12-27  ·  1 🐛  ·  1 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
 - File access not working when passing credentials via querystring ([#9262](https://github.com/RocketChat/Rocket.Chat/pull/9262))
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@rodrigok](https://github.com/rodrigok)
+
 # 0.60.0
-`2017-12-27  ·  33 🎉  ·  174 🐛  ·  108 🔍  ·  59 👩‍💻👨‍💻`
+`2017-12-27  ·  33 🎉  ·  174 🐛  ·  108 🔍  ·  71 👩‍💻👨‍💻`
 
 ### 🎉 New features
 
@@ -967,7 +1148,7 @@
 - Add new API endpoints ([#8947](https://github.com/RocketChat/Rocket.Chat/pull/8947))
 - Option to enable/disable auto away and configure timer ([#8029](https://github.com/RocketChat/Rocket.Chat/pull/8029) by [@armand1m](https://github.com/armand1m))
 - New Modal component ([#8882](https://github.com/RocketChat/Rocket.Chat/pull/8882))
-- Improve room types API and usages ([#9009](https://github.com/RocketChat/Rocket.Chat/pull/9009) by [@mrsimpson](https://github.com/mrsimpson))
+- Improve room types API and usages ([#9009](https://github.com/RocketChat/Rocket.Chat/pull/9009))
 - Room counter sidebar preference ([#8866](https://github.com/RocketChat/Rocket.Chat/pull/8866))
 - Save room's last message ([#8979](https://github.com/RocketChat/Rocket.Chat/pull/8979))
 - Token Controlled Access channels ([#8060](https://github.com/RocketChat/Rocket.Chat/pull/8060) by [@lindoelio](https://github.com/lindoelio))
@@ -986,7 +1167,7 @@
 - Upgrade to meteor 1.5.2 ([#8073](https://github.com/RocketChat/Rocket.Chat/pull/8073))
 - Add yunohost.org installation method to Readme.md ([#8037](https://github.com/RocketChat/Rocket.Chat/pull/8037) by [@selamanse](https://github.com/selamanse))
 - Modal ([#9092](https://github.com/RocketChat/Rocket.Chat/pull/9092))
-- Make Custom oauth accept nested usernameField ([#9066](https://github.com/RocketChat/Rocket.Chat/pull/9066) by [@pierreozoux](https://github.com/pierreozoux))
+- Make Custom oauth accept nested usernameField ([#9066](https://github.com/RocketChat/Rocket.Chat/pull/9066))
 
 ### 🐛 Bug fixes
 
@@ -1004,7 +1185,7 @@
 - Notification sound is not disabling when busy ([#9042](https://github.com/RocketChat/Rocket.Chat/pull/9042))
 - Use encodeURI in AmazonS3 contentDisposition file.name to prevent fail ([#9024](https://github.com/RocketChat/Rocket.Chat/pull/9024) by [@paulovitin](https://github.com/paulovitin))
 - snap install by setting grpc package used by google/vision to 1.6.6 ([#9029](https://github.com/RocketChat/Rocket.Chat/pull/9029))
-- Enable CORS for Restivus ([#8671](https://github.com/RocketChat/Rocket.Chat/pull/8671) by [@mrsimpson](https://github.com/mrsimpson))
+- Enable CORS for Restivus ([#8671](https://github.com/RocketChat/Rocket.Chat/pull/8671))
 - Importers failing when usernames exists but cases don't match and improve the importer framework's performance ([#8966](https://github.com/RocketChat/Rocket.Chat/pull/8966))
 - Error when saving integration with symbol as only trigger ([#9023](https://github.com/RocketChat/Rocket.Chat/pull/9023))
 - Sync of non existent field throws exception ([#8006](https://github.com/RocketChat/Rocket.Chat/pull/8006) by [@goiaba](https://github.com/goiaba))
@@ -1035,14 +1216,14 @@
 - Improved grammar and made it clearer to the user ([#8795](https://github.com/RocketChat/Rocket.Chat/pull/8795) by [@HammyHavoc](https://github.com/HammyHavoc))
 - Show real name of current user at top of side nav if setting enabled ([#8718](https://github.com/RocketChat/Rocket.Chat/pull/8718))
 - Range Slider Value label has bug in RTL ([#8441](https://github.com/RocketChat/Rocket.Chat/pull/8441) by [@cyclops24](https://github.com/cyclops24))
-- Add historic chats icon in Livechat ([#8708](https://github.com/RocketChat/Rocket.Chat/pull/8708) by [@mrsimpson](https://github.com/mrsimpson))
+- Add historic chats icon in Livechat ([#8708](https://github.com/RocketChat/Rocket.Chat/pull/8708))
 - Sort direct messages by full name if show real names setting enabled ([#8717](https://github.com/RocketChat/Rocket.Chat/pull/8717))
 - Improving consistency of UX ([#8796](https://github.com/RocketChat/Rocket.Chat/pull/8796) by [@HammyHavoc](https://github.com/HammyHavoc))
 - fixed some typos ([#8787](https://github.com/RocketChat/Rocket.Chat/pull/8787) by [@TheReal1604](https://github.com/TheReal1604))
 - Fix e-mail message forward ([#8645](https://github.com/RocketChat/Rocket.Chat/pull/8645))
 - Audio message icon ([#8648](https://github.com/RocketChat/Rocket.Chat/pull/8648))
 - Highlighted color height issue ([#8431](https://github.com/RocketChat/Rocket.Chat/pull/8431) by [@cyclops24](https://github.com/cyclops24))
-- AmazonS3: Quote file.name for ContentDisposition for files with commas ([#8593](https://github.com/RocketChat/Rocket.Chat/pull/8593) by [@xenithorb](https://github.com/xenithorb))
+- AmazonS3: Quote file.name for ContentDisposition for files with commas ([#8593](https://github.com/RocketChat/Rocket.Chat/pull/8593))
 - Update pt-BR translation ([#8655](https://github.com/RocketChat/Rocket.Chat/pull/8655) by [@rodorgas](https://github.com/rodorgas))
 - Fix typos ([#8679](https://github.com/RocketChat/Rocket.Chat/pull/8679))
 - LDAP not respecting UTF8 characters & Sync Interval not working ([#8691](https://github.com/RocketChat/Rocket.Chat/pull/8691))
@@ -1314,10 +1495,8 @@
 - [@luizbills](https://github.com/luizbills)
 - [@mastappl](https://github.com/mastappl)
 - [@mritunjaygoutam12](https://github.com/mritunjaygoutam12)
-- [@mrsimpson](https://github.com/mrsimpson)
 - [@paulovitin](https://github.com/paulovitin)
 - [@peterlee0127](https://github.com/peterlee0127)
-- [@pierreozoux](https://github.com/pierreozoux)
 - [@pkgodara](https://github.com/pkgodara)
 - [@ramrami](https://github.com/ramrami)
 - [@rmetzler](https://github.com/rmetzler)
@@ -1339,10 +1518,27 @@
 - [@vitor-nagao](https://github.com/vitor-nagao)
 - [@wesnspace](https://github.com/wesnspace)
 - [@wferris722](https://github.com/wferris722)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MartinSchoeler](https://github.com/MartinSchoeler)
+- [@alexbrazier](https://github.com/alexbrazier)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@gdelavald](https://github.com/gdelavald)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@ggazzo](https://github.com/ggazzo)
+- [@graywolf336](https://github.com/graywolf336)
+- [@karlprieb](https://github.com/karlprieb)
+- [@marceloschmidt](https://github.com/marceloschmidt)
+- [@mrsimpson](https://github.com/mrsimpson)
+- [@pierreozoux](https://github.com/pierreozoux)
+- [@rafaelks](https://github.com/rafaelks)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
 - [@xenithorb](https://github.com/xenithorb)
 
 # 0.59.6
-`2017-11-29  ·  1 🔍`
+`2017-11-29  ·  1 🔍  ·  1 👩‍💻👨‍💻`
 
 <details>
 <summary>🔍 Minor changes</summary>
@@ -1351,8 +1547,12 @@
 
 </details>
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.59.5
-`2017-11-29  ·  1 🔍`
+`2017-11-29  ·  1 🔍  ·  1 👩‍💻👨‍💻`
 
 <details>
 <summary>🔍 Minor changes</summary>
@@ -1361,8 +1561,12 @@
 
 </details>
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.59.4
-`2017-11-29  ·  1 🐛  ·  2 🔍  ·  1 👩‍💻👨‍💻`
+`2017-11-29  ·  1 🐛  ·  2 🔍  ·  5 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
@@ -1380,12 +1584,19 @@
 
 - [@cpitman](https://github.com/cpitman)
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@karlprieb](https://github.com/karlprieb)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.59.3
-`2017-10-29  ·  7 🐛  ·  2 🔍  ·  4 👩‍💻👨‍💻`
+`2017-10-29  ·  7 🐛  ·  2 🔍  ·  8 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
-- AmazonS3: Quote file.name for ContentDisposition for files with commas ([#8593](https://github.com/RocketChat/Rocket.Chat/pull/8593) by [@xenithorb](https://github.com/xenithorb))
+- AmazonS3: Quote file.name for ContentDisposition for files with commas ([#8593](https://github.com/RocketChat/Rocket.Chat/pull/8593))
 - Fix e-mail message forward ([#8645](https://github.com/RocketChat/Rocket.Chat/pull/8645))
 - Audio message icon ([#8648](https://github.com/RocketChat/Rocket.Chat/pull/8648))
 - Highlighted color height issue ([#8431](https://github.com/RocketChat/Rocket.Chat/pull/8431) by [@cyclops24](https://github.com/cyclops24))
@@ -1406,10 +1617,17 @@
 - [@cyclops24](https://github.com/cyclops24)
 - [@rodorgas](https://github.com/rodorgas)
 - [@vikaskedia](https://github.com/vikaskedia)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@karlprieb](https://github.com/karlprieb)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
 - [@xenithorb](https://github.com/xenithorb)
 
 # 0.59.2
-`2017-10-25  ·  6 🐛  ·  1 👩‍💻👨‍💻`
+`2017-10-25  ·  6 🐛  ·  4 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
@@ -1424,8 +1642,14 @@
 
 - [@joesitton](https://github.com/joesitton)
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@karlprieb](https://github.com/karlprieb)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.59.1
-`2017-10-19  ·  4 🐛`
+`2017-10-19  ·  4 🐛  ·  2 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
@@ -1434,8 +1658,13 @@
 - LDAP login error regression at 0.59.0 ([#8541](https://github.com/RocketChat/Rocket.Chat/pull/8541))
 - Migration 103 wrong converting primrary colors ([#8544](https://github.com/RocketChat/Rocket.Chat/pull/8544))
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.59.0
-`2017-10-18  ·  25 🎉  ·  131 🐛  ·  51 🔍  ·  34 👩‍💻👨‍💻`
+`2017-10-18  ·  25 🎉  ·  131 🐛  ·  51 🔍  ·  46 👩‍💻👨‍💻`
 
 ### 🎉 New features
 
@@ -1693,8 +1922,23 @@
 - [@vcapretz](https://github.com/vcapretz)
 - [@xurizaemon](https://github.com/xurizaemon)
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MartinSchoeler](https://github.com/MartinSchoeler)
+- [@alexbrazier](https://github.com/alexbrazier)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@gdelavald](https://github.com/gdelavald)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@ggazzo](https://github.com/ggazzo)
+- [@graywolf336](https://github.com/graywolf336)
+- [@karlprieb](https://github.com/karlprieb)
+- [@marceloschmidt](https://github.com/marceloschmidt)
+- [@rafaelks](https://github.com/rafaelks)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.58.4
-`2017-10-05  ·  3 🐛`
+`2017-10-05  ·  3 🐛  ·  2 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
@@ -1702,8 +1946,13 @@
 - Slack import failing and not being able to be restarted ([#8390](https://github.com/RocketChat/Rocket.Chat/pull/8390))
 - Add needed dependency for snaps ([#8389](https://github.com/RocketChat/Rocket.Chat/pull/8389))
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@graywolf336](https://github.com/graywolf336)
+
 # 0.58.2
-`2017-08-22  ·  1 🔍  ·  1 👩‍💻👨‍💻`
+`2017-08-22  ·  1 🔍  ·  2 👩‍💻👨‍💻`
 
 <details>
 <summary>🔍 Minor changes</summary>
@@ -1716,8 +1965,12 @@
 
 - [@snoozan](https://github.com/snoozan)
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+
 # 0.58.1
-`2017-08-17  ·  1 🐛  ·  1 🔍`
+`2017-08-17  ·  1 🐛  ·  1 🔍  ·  2 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
@@ -1730,8 +1983,13 @@
 
 </details>
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MartinSchoeler](https://github.com/MartinSchoeler)
+- [@rodrigok](https://github.com/rodrigok)
+
 # 0.58.0
-`2017-08-16  ·  1 ️️️⚠️  ·  27 🎉  ·  72 🐛  ·  22 🔍  ·  24 👩‍💻👨‍💻`
+`2017-08-16  ·  1 ️️️⚠️  ·  27 🎉  ·  72 🐛  ·  22 🔍  ·  33 👩‍💻👨‍💻`
 
 ### ⚠️ BREAKING CHANGES
 
@@ -1797,7 +2055,7 @@
 - Fix admin room list show the correct i18n type ([#7582](https://github.com/RocketChat/Rocket.Chat/pull/7582) by [@ccfang](https://github.com/ccfang))
 - Missing eventName in unUser ([#7533](https://github.com/RocketChat/Rocket.Chat/pull/7533) by [@Darkneon](https://github.com/Darkneon))
 - URL parse error fix for issue #7169 ([#7538](https://github.com/RocketChat/Rocket.Chat/pull/7538) by [@satyapramodh](https://github.com/satyapramodh))
-- User avatar image background ([#7572](https://github.com/RocketChat/Rocket.Chat/pull/7572) by [@filipedelimabrito](https://github.com/filipedelimabrito))
+- User avatar image background ([#7572](https://github.com/RocketChat/Rocket.Chat/pull/7572))
 - Improve build script example ([#7555](https://github.com/RocketChat/Rocket.Chat/pull/7555))
 - Fix Join Channel Without Preview Room Permission ([#7535](https://github.com/RocketChat/Rocket.Chat/pull/7535))
 - Look for livechat visitor IP address on X-Forwarded-For header ([#7554](https://github.com/RocketChat/Rocket.Chat/pull/7554))
@@ -1845,7 +2103,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
-- Release 0.58.0 ([#7752](https://github.com/RocketChat/Rocket.Chat/pull/7752) by [@flaviogrossi](https://github.com/flaviogrossi) & [@jangmarker](https://github.com/jangmarker) & [@pierreozoux](https://github.com/pierreozoux) & [@ryoshimizu](https://github.com/ryoshimizu))
+- Release 0.58.0 ([#7752](https://github.com/RocketChat/Rocket.Chat/pull/7752) by [@flaviogrossi](https://github.com/flaviogrossi) & [@jangmarker](https://github.com/jangmarker) & [@ryoshimizu](https://github.com/ryoshimizu))
 - Sync Master with 0.57.3 ([#7690](https://github.com/RocketChat/Rocket.Chat/pull/7690))
 - [Fix] Users and Channels list not respecting permissions ([#7212](https://github.com/RocketChat/Rocket.Chat/pull/7212))
 - [Fix] Users and Channels list not respecting permissions ([#7212](https://github.com/RocketChat/Rocket.Chat/pull/7212))
@@ -1860,8 +2118,8 @@
 - [Fix] Users and Channels list not respecting permissions ([#7212](https://github.com/RocketChat/Rocket.Chat/pull/7212))
 - Develop sync ([#7500](https://github.com/RocketChat/Rocket.Chat/pull/7500) by [@thinkeridea](https://github.com/thinkeridea))
 - Better Issue Template ([#7492](https://github.com/RocketChat/Rocket.Chat/pull/7492))
-- Add helm chart kubernetes deployment ([#6340](https://github.com/RocketChat/Rocket.Chat/pull/6340) by [@pierreozoux](https://github.com/pierreozoux))
-- Develop sync ([#7363](https://github.com/RocketChat/Rocket.Chat/pull/7363) by [@JSzaszvari](https://github.com/JSzaszvari))
+- Add helm chart kubernetes deployment ([#6340](https://github.com/RocketChat/Rocket.Chat/pull/6340))
+- Develop sync ([#7363](https://github.com/RocketChat/Rocket.Chat/pull/7363))
 - Escape error messages ([#7308](https://github.com/RocketChat/Rocket.Chat/pull/7308))
 - update meteor to 1.5.0 ([#7287](https://github.com/RocketChat/Rocket.Chat/pull/7287))
 - Fix the Zapier oAuth return url to the new one ([#7215](https://github.com/RocketChat/Rocket.Chat/pull/7215))
@@ -1874,19 +2132,16 @@
 
 - [@AhmetS](https://github.com/AhmetS)
 - [@Darkneon](https://github.com/Darkneon)
-- [@JSzaszvari](https://github.com/JSzaszvari)
 - [@Oliver84](https://github.com/Oliver84)
 - [@al3x](https://github.com/al3x)
 - [@borsden](https://github.com/borsden)
 - [@ccfang](https://github.com/ccfang)
 - [@danilomiranda](https://github.com/danilomiranda)
 - [@danischreiber](https://github.com/danischreiber)
-- [@filipedelimabrito](https://github.com/filipedelimabrito)
 - [@flaviogrossi](https://github.com/flaviogrossi)
 - [@jangmarker](https://github.com/jangmarker)
 - [@jfchevrette](https://github.com/jfchevrette)
 - [@lindoelio](https://github.com/lindoelio)
-- [@pierreozoux](https://github.com/pierreozoux)
 - [@rasos](https://github.com/rasos)
 - [@reist](https://github.com/reist)
 - [@ruKurz](https://github.com/ruKurz)
@@ -1897,8 +2152,23 @@
 - [@thinkeridea](https://github.com/thinkeridea)
 - [@wsw70](https://github.com/wsw70)
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@JSzaszvari](https://github.com/JSzaszvari)
+- [@MartinSchoeler](https://github.com/MartinSchoeler)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@filipedelimabrito](https://github.com/filipedelimabrito)
+- [@gdelavald](https://github.com/gdelavald)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@ggazzo](https://github.com/ggazzo)
+- [@graywolf336](https://github.com/graywolf336)
+- [@karlprieb](https://github.com/karlprieb)
+- [@pierreozoux](https://github.com/pierreozoux)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.57.4
-`2017-10-05  ·  3 🐛`
+`2017-10-05  ·  3 🐛  ·  2 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
@@ -1906,8 +2176,13 @@
 - Duplicate code in rest api letting in a few bugs with the rest api ([#8408](https://github.com/RocketChat/Rocket.Chat/pull/8408))
 - Add needed dependency for snaps ([#8389](https://github.com/RocketChat/Rocket.Chat/pull/8389))
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@graywolf336](https://github.com/graywolf336)
+
 # 0.57.3
-`2017-08-08  ·  8 🐛  ·  1 🔍  ·  4 👩‍💻👨‍💻`
+`2017-08-08  ·  8 🐛  ·  1 🔍  ·  7 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
@@ -1934,8 +2209,14 @@
 - [@rasos](https://github.com/rasos)
 - [@ryoshimizu](https://github.com/ryoshimizu)
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MartinSchoeler](https://github.com/MartinSchoeler)
+- [@graywolf336](https://github.com/graywolf336)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.57.2
-`2017-07-14  ·  6 🐛`
+`2017-07-14  ·  6 🐛  ·  3 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
@@ -1946,15 +2227,26 @@
 - Fix Private Channel List Submit ([#7432](https://github.com/RocketChat/Rocket.Chat/pull/7432))
 - S3 uploads not working for custom URLs ([#7443](https://github.com/RocketChat/Rocket.Chat/pull/7443))
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MartinSchoeler](https://github.com/MartinSchoeler)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.57.1
-`2017-07-05  ·  1 🐛`
+`2017-07-05  ·  1 🐛  ·  2 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
 - Fix migration of avatars from version 0.57.0 ([#7428](https://github.com/RocketChat/Rocket.Chat/pull/7428))
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.57.0
-`2017-07-03  ·  1 ️️️⚠️  ·  12 🎉  ·  45 🐛  ·  31 🔍  ·  15 👩‍💻👨‍💻`
+`2017-07-03  ·  1 ️️️⚠️  ·  12 🎉  ·  45 🐛  ·  31 🔍  ·  25 👩‍💻👨‍💻`
 
 ### ⚠️ BREAKING CHANGES
 
@@ -2015,7 +2307,7 @@
 - Fix editing others messages ([#7200](https://github.com/RocketChat/Rocket.Chat/pull/7200))
 - Fix oembed previews not being shown ([#7208](https://github.com/RocketChat/Rocket.Chat/pull/7208))
 - "requirePasswordChange" property not being saved when set to false ([#7209](https://github.com/RocketChat/Rocket.Chat/pull/7209))
-- Removing the kadira package install from example build script. ([#7160](https://github.com/RocketChat/Rocket.Chat/pull/7160) by [@JSzaszvari](https://github.com/JSzaszvari))
+- Removing the kadira package install from example build script. ([#7160](https://github.com/RocketChat/Rocket.Chat/pull/7160))
 - Fix user's customFields not being saved correctly ([#7358](https://github.com/RocketChat/Rocket.Chat/pull/7358))
 - Improve avatar migration ([#7352](https://github.com/RocketChat/Rocket.Chat/pull/7352))
 - Fix jump to unread button ([#7320](https://github.com/RocketChat/Rocket.Chat/pull/7320))
@@ -2063,7 +2355,6 @@
 ### 👩‍💻👨‍💻 Contributors 😍
 
 - [@ExTechOp](https://github.com/ExTechOp)
-- [@JSzaszvari](https://github.com/JSzaszvari)
 - [@abrom](https://github.com/abrom)
 - [@bbrauns](https://github.com/bbrauns)
 - [@colin-campbell](https://github.com/colin-campbell)
@@ -2078,8 +2369,22 @@
 - [@sathieu](https://github.com/sathieu)
 - [@thinkeridea](https://github.com/thinkeridea)
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@JSzaszvari](https://github.com/JSzaszvari)
+- [@MartinSchoeler](https://github.com/MartinSchoeler)
+- [@alexbrazier](https://github.com/alexbrazier)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@gdelavald](https://github.com/gdelavald)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@ggazzo](https://github.com/ggazzo)
+- [@graywolf336](https://github.com/graywolf336)
+- [@marceloschmidt](https://github.com/marceloschmidt)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.56.0
-`2017-05-15  ·  11 🎉  ·  21 🐛  ·  22 🔍  ·  8 👩‍💻👨‍💻`
+`2017-05-15  ·  11 🎉  ·  21 🐛  ·  22 🔍  ·  19 👩‍💻👨‍💻`
 
 ### 🎉 New features
 
@@ -2158,8 +2463,22 @@
 - [@sscholl](https://github.com/sscholl)
 - [@vlogic](https://github.com/vlogic)
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MartinSchoeler](https://github.com/MartinSchoeler)
+- [@alexbrazier](https://github.com/alexbrazier)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@gdelavald](https://github.com/gdelavald)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@ggazzo](https://github.com/ggazzo)
+- [@graywolf336](https://github.com/graywolf336)
+- [@karlprieb](https://github.com/karlprieb)
+- [@marceloschmidt](https://github.com/marceloschmidt)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.55.1
-`2017-04-19  ·  1 🔍`
+`2017-04-19  ·  1 🔍  ·  1 👩‍💻👨‍💻`
 
 <details>
 <summary>🔍 Minor changes</summary>
@@ -2168,8 +2487,12 @@
 
 </details>
 
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@rodrigok](https://github.com/rodrigok)
+
 # 0.55.0
-`2017-04-18  ·  1 ️️️⚠️  ·  9 🎉  ·  25 🐛  ·  87 🔍  ·  12 👩‍💻👨‍💻`
+`2017-04-18  ·  1 ️️️⚠️  ·  9 🎉  ·  25 🐛  ·  87 🔍  ·  23 👩‍💻👨‍💻`
 
 ### ⚠️ BREAKING CHANGES
 
@@ -2304,7 +2627,7 @@
 - Added Deploy method and platform to stats ([#6649](https://github.com/RocketChat/Rocket.Chat/pull/6649))
 - LingoHub based on develop ([#6647](https://github.com/RocketChat/Rocket.Chat/pull/6647))
 - meteor update ([#6631](https://github.com/RocketChat/Rocket.Chat/pull/6631))
-- Env override initial setting ([#6163](https://github.com/RocketChat/Rocket.Chat/pull/6163) by [@mrsimpson](https://github.com/mrsimpson))
+- Env override initial setting ([#6163](https://github.com/RocketChat/Rocket.Chat/pull/6163))
 
 </details>
 
@@ -2316,9 +2639,23 @@
 - [@billtt](https://github.com/billtt)
 - [@drallgood](https://github.com/drallgood)
 - [@fengt](https://github.com/fengt)
-- [@mrsimpson](https://github.com/mrsimpson)
 - [@nathanmarcos](https://github.com/nathanmarcos)
 - [@qge](https://github.com/qge)
 - [@sezinkarli](https://github.com/sezinkarli)
 - [@szluohua](https://github.com/szluohua)
-- [@tgxn](https://github.com/tgxn)
\ No newline at end of file
+- [@tgxn](https://github.com/tgxn)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MartinSchoeler](https://github.com/MartinSchoeler)
+- [@alexbrazier](https://github.com/alexbrazier)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@gdelavald](https://github.com/gdelavald)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@ggazzo](https://github.com/ggazzo)
+- [@graywolf336](https://github.com/graywolf336)
+- [@karlprieb](https://github.com/karlprieb)
+- [@marceloschmidt](https://github.com/marceloschmidt)
+- [@mrsimpson](https://github.com/mrsimpson)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
\ No newline at end of file
diff --git a/package.json b/package.json
index 1b2dc6e5ae35..564c50c6bf2c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.65.1",
+	"version": "0.65.2",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index fcf1d26d9641..6258ea59d65c 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.65.1"
+	"version": "0.65.2"
 }

From 138345cdc9d6fe2cb3b3c00e01570c9d610202eb Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Fri, 8 Jun 2018 04:38:55 +0200
Subject: [PATCH 07/29] Bump version to 0.65.2

---
 .github/history.json                                | 9 +++++++++
 HISTORY.md                                          | 4 +++-
 packages/rocketchat-ui-flextab/client/flexTabBar.js | 4 +++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/history.json b/.github/history.json
index d38af54ba947..2138d062bcaa 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -14747,6 +14747,15 @@
     }
   ],
   "0.65.2": [
+    {
+      "pr": "11049",
+      "title": "[FIX] flex-tab icons missing",
+      "userLogin": "ggazzo",
+      "milestone": "0.66.0",
+      "contributors": [
+        "ggazzo"
+      ]
+    },
     {
       "pr": "11129",
       "title": "[FIX] Users model was not receiving options",
diff --git a/HISTORY.md b/HISTORY.md
index 6d7c11b2a2ed..0a489cab81c2 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,9 +1,10 @@
 
 # 0.65.2
-`2018-06-16  ·  5 🐛  ·  6 👩‍💻👨‍💻`
+`2018-06-08  ·  6 🐛  ·  7 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
+- flex-tab icons missing ([#11049](https://github.com/RocketChat/Rocket.Chat/pull/11049))
 - Users model was not receiving options ([#11129](https://github.com/RocketChat/Rocket.Chat/pull/11129))
 - Preview of large images not resizing to fit the area and having scrollbars ([#10998](https://github.com/RocketChat/Rocket.Chat/pull/10998) by [@vynmera](https://github.com/vynmera))
 - Wordpress OAuth not providing enough info to log in  ([#11152](https://github.com/RocketChat/Rocket.Chat/pull/11152))
@@ -20,6 +21,7 @@
 
 - [@Hudell](https://github.com/Hudell)
 - [@engelgabriel](https://github.com/engelgabriel)
+- [@ggazzo](https://github.com/ggazzo)
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.65.1
diff --git a/packages/rocketchat-ui-flextab/client/flexTabBar.js b/packages/rocketchat-ui-flextab/client/flexTabBar.js
index f034b8da124a..51d75d175eef 100644
--- a/packages/rocketchat-ui-flextab/client/flexTabBar.js
+++ b/packages/rocketchat-ui-flextab/client/flexTabBar.js
@@ -55,7 +55,9 @@ Template.flexTabBar.helpers({
 	},
 	...commonHelpers,
 	buttons() {
-		return RocketChat.TabBar.getButtons().filter(button => filterButtons(button, this.anonymous, this.data.rid));
+		return RocketChat.TabBar.getButtons().filter(button =>
+			filterButtons(button, this.anonymous, this.data && this.data.rid)
+		);
 	},
 	opened() {
 		return Template.instance().tabBar.getState();

From ad3abbb20af5cf2091e8c4e32b1ca98443df0868 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Fri, 8 Jun 2018 04:38:55 +0200
Subject: [PATCH 08/29] Merge pull request #11049 from
 RocketChat/fix-admin-tab-icons

[FIX] flex-tab icons missing

From ba166a144b67350fddf78056a9d8e00be46b16f7 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 20 Jun 2018 23:37:12 -0300
Subject: [PATCH 09/29] Bump version to 0.66.0-rc.0

---
 .docker/Dockerfile.rhel                 |    2 +-
 .github/history.json                    | 1129 +++++++++++++++++++++++
 .sandstorm/sandstorm-pkgdef.capnp       |    4 +-
 .travis/snap.sh                         |    2 +-
 HISTORY.md                              |  276 +++++-
 package.json                            |    2 +-
 packages/rocketchat-lib/rocketchat.info |    2 +-
 7 files changed, 1385 insertions(+), 32 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 4b6c8b3e1cc6..fb5af0a3f814 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 0.66.0-develop
+ENV RC_VERSION 0.66.0-rc.0
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index c1a279dfff1c..6b2de8d0a6b5 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -14745,5 +14745,1134 @@
         "ggazzo"
       ]
     }
+  ],
+  "0.65.2": [
+    {
+      "pr": "9534",
+      "title": "[FIX] i18n - add semantic markup",
+      "userLogin": "brylie",
+      "contributors": [
+        "brylie",
+        "web-flow",
+        "engelgabriel"
+      ]
+    },
+    {
+      "pr": "10947",
+      "title": "Release 0.65.1",
+      "userLogin": "sampaiodiego",
+      "contributors": [
+        "rodrigok",
+        "sampaiodiego",
+        "engelgabriel"
+      ]
+    }
+  ],
+  "0.66.0-rc.0": [
+    {
+      "pr": "11166",
+      "title": "[IMPROVE] Listing of apps in the admin page",
+      "userLogin": "gdelavald",
+      "milestone": "0.66.0",
+      "contributors": [
+        "karlprieb",
+        "web-flow",
+        "gdelavald",
+        "engelgabriel"
+      ]
+    },
+    {
+      "pr": "11206",
+      "title": "Regression: Directory css",
+      "userLogin": "ggazzo",
+      "milestone": "0.66.0",
+      "contributors": [
+        "karlprieb",
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "11208",
+      "title": "LingoHub based on develop",
+      "userLogin": "engelgabriel",
+      "contributors": [
+        "rodrigok"
+      ]
+    },
+    {
+      "pr": "10127",
+      "title": "[NEW] Youtube Broadcasting",
+      "userLogin": "gdelavald",
+      "milestone": "0.66.0",
+      "contributors": [
+        "gdelavald",
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "11187",
+      "title": "[FIX] Wordpress oauth configuration not loading properly",
+      "userLogin": "Hudell",
+      "milestone": "0.66.0",
+      "contributors": [
+        "Hudell",
+        "geekgonecrazy",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10975",
+      "title": "[NEW] REST API endpoints `permissions.list` and `permissions.update`. Deprecated endpoint `permissions`",
+      "userLogin": "vynmera",
+      "milestone": "0.66.0",
+      "contributors": [
+        "vynmera",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10941",
+      "title": "[NEW] REST API endpoint `channels.setDefault`",
+      "userLogin": "vynmera",
+      "milestone": "0.66.0",
+      "contributors": [
+        "vynmera",
+        "web-flow",
+        "engelgabriel"
+      ]
+    },
+    {
+      "pr": "10113",
+      "title": "IRC Federation: RFC2813 implementation (ngIRCd)",
+      "userLogin": "alansikora",
+      "milestone": "0.66.0",
+      "contributors": [
+        "cpitman",
+        "lindoelio",
+        "alansikora",
+        "Hudell",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10999",
+      "title": "[FIX] REST API: Add more test cases for `/login`",
+      "userLogin": "MarcosSpessatto",
+      "milestone": "0.66.0",
+      "contributors": [
+        "MarcosSpessatto"
+      ]
+    },
+    {
+      "pr": "11191",
+      "title": "[FIX] Wrong font-family order",
+      "userLogin": "Hudell",
+      "milestone": "0.66.0",
+      "contributors": [
+        "myfonj",
+        "web-flow",
+        "engelgabriel",
+        "Hudell"
+      ]
+    },
+    {
+      "pr": "11008",
+      "title": "Add verification to make sure the user exists in REST  insert object helper",
+      "userLogin": "MarcosSpessatto",
+      "milestone": "0.66.0",
+      "contributors": [
+        "MarcosSpessatto"
+      ]
+    },
+    {
+      "pr": "10799",
+      "title": "[BREAK] Always remove the field `services` from user data responses in REST API",
+      "userLogin": "MarcosSpessatto",
+      "milestone": "0.66.0",
+      "contributors": [
+        "MarcosSpessatto"
+      ]
+    },
+    {
+      "pr": "11204",
+      "title": "[FIX] REST endpoint `users.updateOwnBasicInfo` was not returning errors for invalid names and trying to save custom fields when empty",
+      "userLogin": "MarcosSpessatto",
+      "milestone": "0.66.0",
+      "contributors": [
+        "MarcosSpessatto"
+      ]
+    },
+    {
+      "pr": "9751",
+      "title": "[NEW] Set Document Domain property in IFrame",
+      "userLogin": "kb0304",
+      "milestone": "0.66.0",
+      "contributors": [
+        "kb0304",
+        "engelgabriel",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10767",
+      "title": "[FIX] Livechat visitor not being prompted for transcript when himself is closing the chat",
+      "userLogin": "renatobecker",
+      "milestone": "0.66.0",
+      "contributors": [
+        "renatobecker",
+        "sampaiodiego",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11188",
+      "title": "[FIX] HipChat Cloud import fails to import rooms",
+      "userLogin": "Hudell",
+      "milestone": "0.66.0",
+      "contributors": [
+        "Hudell"
+      ]
+    },
+    {
+      "pr": "11190",
+      "title": "[FIX] Failure to download user data",
+      "userLogin": "Hudell",
+      "milestone": "0.66.0",
+      "contributors": [
+        "Hudell"
+      ]
+    },
+    {
+      "pr": "10447",
+      "title": "[FIX] Add parameter to REST chat.react endpoint, to make it work like a setter",
+      "userLogin": "MarcosSpessatto",
+      "contributors": [
+        "MarcosSpessatto",
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "11025",
+      "title": "[NEW] Custom login wallpapers",
+      "userLogin": "vynmera",
+      "milestone": "0.66.0",
+      "contributors": [
+        "vynmera",
+        "web-flow",
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "11200",
+      "title": "Regression: Directory user table infinite scroll doesn't working",
+      "userLogin": "karlprieb",
+      "milestone": "0.66.0",
+      "contributors": [
+        "karlprieb"
+      ]
+    },
+    {
+      "pr": "10205",
+      "title": "[NEW] Support for dynamic slack and rocket.chat channels",
+      "userLogin": "Hudell",
+      "milestone": "0.66.0",
+      "contributors": [
+        "kable-wilmoth",
+        "Hudell",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11150",
+      "title": "[FIX] Default selected language",
+      "userLogin": "tassoevan",
+      "milestone": "0.66.0",
+      "contributors": [
+        "tassoevan",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11026",
+      "title": "[IMPROVE] UI design for Tables and tabs component on Directory",
+      "userLogin": "karlprieb",
+      "milestone": "0.66.0",
+      "contributors": [
+        "karlprieb",
+        "web-flow",
+        "engelgabriel",
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "11165",
+      "title": "[FIX] Rendering of emails and mentions in messages",
+      "userLogin": "tassoevan",
+      "milestone": "0.66.0",
+      "contributors": [
+        "tassoevan",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11177",
+      "title": "[FIX] Livechat icon with status",
+      "userLogin": "tassoevan",
+      "milestone": "0.66.0",
+      "contributors": [
+        "tassoevan",
+        "ggazzo",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11183",
+      "title": "[FIX] remove sidebar on embedded view",
+      "userLogin": "ggazzo",
+      "milestone": "0.66.0",
+      "contributors": [
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "11173",
+      "title": "[FIX]Missing language constants",
+      "userLogin": "rw4lll",
+      "contributors": [
+        "rw4lll",
+        "engelgabriel",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11181",
+      "title": "[FIX Readme] Nodejs + Python version spicifications",
+      "userLogin": "mahdiyari",
+      "contributors": [
+        "mahdiyari",
+        "web-flow",
+        "engelgabriel"
+      ]
+    },
+    {
+      "pr": "11178",
+      "title": "[FIX] Room creation error due absence of subscriptions",
+      "userLogin": "tassoevan",
+      "milestone": "0.66.0",
+      "contributors": [
+        "tassoevan",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11132",
+      "title": "[FIX] Remove failed upload messages when switching rooms",
+      "userLogin": "tassoevan",
+      "milestone": "0.66.0",
+      "contributors": [
+        "tassoevan",
+        "web-flow",
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "11152",
+      "title": "[FIX] Wordpress OAuth not providing enough info to log in ",
+      "userLogin": "Hudell",
+      "contributors": [
+        "Hudell",
+        "sampaiodiego"
+      ]
+    },
+    {
+      "pr": "11010",
+      "title": "[FIX] /groups.invite not allow a user to invite even with permission",
+      "userLogin": "MarcosSpessatto",
+      "milestone": "0.66.0",
+      "contributors": [
+        "MarcosSpessatto",
+        "Hudell",
+        "web-flow",
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "11115",
+      "title": "[NEW] Add prometheus port config",
+      "userLogin": "thaiphv",
+      "contributors": [
+        "brylie",
+        "web-flow",
+        "stuartpb",
+        "engelgabriel",
+        "thaiphv"
+      ]
+    },
+    {
+      "pr": "10095",
+      "title": "[FIX] Various lang fixes [RU]",
+      "userLogin": "rw4lll",
+      "milestone": "0.66.0",
+      "contributors": [
+        "rw4lll",
+        "web-flow",
+        "engelgabriel",
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "11109",
+      "title": "[FIX] set-toolbar-items postMessage",
+      "userLogin": "ggazzo",
+      "milestone": "0.66.0",
+      "contributors": [
+        "ggazzo",
+        "web-flow",
+        "tassoevan"
+      ]
+    },
+    {
+      "pr": "11021",
+      "title": "[FIX] title and value attachments are optionals on sendMessage method",
+      "userLogin": "MarcosSpessatto",
+      "milestone": "0.66.0",
+      "contributors": [
+        "MarcosSpessatto"
+      ]
+    },
+    {
+      "pr": "10301",
+      "title": "[NEW] Button to remove closed LiveChat rooms",
+      "userLogin": "renatobecker",
+      "milestone": "0.66.0",
+      "contributors": [
+        "renatobecker"
+      ]
+    },
+    {
+      "pr": "11136",
+      "title": "[FIX] Some typos in the error message names",
+      "userLogin": "vynmera",
+      "contributors": [
+        "vynmera"
+      ]
+    },
+    {
+      "pr": "11050",
+      "title": "[FIX] open conversation from room info",
+      "userLogin": "ggazzo",
+      "milestone": "0.66.0",
+      "contributors": [
+        "ggazzo",
+        "web-flow",
+        "engelgabriel"
+      ]
+    },
+    {
+      "pr": "11129",
+      "title": "[FIX] Users model was not receiving options",
+      "userLogin": "sampaiodiego",
+      "contributors": [
+        "sampaiodiego"
+      ]
+    },
+    {
+      "pr": "11113",
+      "title": "[FIX] Popover position",
+      "userLogin": "tassoevan",
+      "milestone": "0.66.0",
+      "contributors": [
+        "tassoevan",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11096",
+      "title": "[FIX] Generated random password visible to the user",
+      "userLogin": "tassoevan",
+      "milestone": "0.66.0",
+      "contributors": [
+        "tassoevan",
+        "engelgabriel",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11111",
+      "title": "[FIX] LiveChat appearance changes not being saved",
+      "userLogin": "renatobecker",
+      "milestone": "0.66.0",
+      "contributors": [
+        "renatobecker",
+        "ggazzo",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11095",
+      "title": "[FIX] Confirm password on set new password user profile",
+      "userLogin": "tassoevan",
+      "milestone": "0.66.0",
+      "contributors": [
+        "tassoevan",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11090",
+      "title": "Regression: sorting direct message by asc on favorites group",
+      "userLogin": "ggazzo",
+      "milestone": "0.66.0",
+      "contributors": [
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "10431",
+      "title": "[FIX] Message_AllowedMaxSize fails for emoji sequences",
+      "userLogin": "c0dzilla",
+      "milestone": "0.66.0",
+      "contributors": [
+        "c0dzilla",
+        "web-flow",
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "11001",
+      "title": "[IMPROVE] User mentions",
+      "userLogin": "vynmera",
+      "milestone": "0.66.0",
+      "contributors": [
+        "vynmera",
+        "web-flow",
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "11107",
+      "title": "Fix PR Docker image creation by splitting in two build jobs",
+      "userLogin": "sampaiodiego",
+      "contributors": [
+        "sampaiodiego"
+      ]
+    },
+    {
+      "pr": "8402",
+      "title": "[NEW] Update katex to v0.9.0",
+      "userLogin": "pitamar",
+      "milestone": "0.66.0",
+      "contributors": [
+        "pitamar"
+      ]
+    },
+    {
+      "pr": "11027",
+      "title": "[NEW] WebDAV(Nextcloud/ownCloud) Storage Server Option",
+      "userLogin": "karakayasemi",
+      "milestone": "0.66.0",
+      "contributors": [
+        "karakayasemi",
+        "web-flow",
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "11103",
+      "title": "Update v126.js",
+      "userLogin": "ggazzo",
+      "contributors": [
+        "ggazzo",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10973",
+      "title": "[NEW] Don't ask me again checkbox on hide room modal",
+      "userLogin": "karlprieb",
+      "milestone": "0.66.0",
+      "contributors": [
+        "karlprieb",
+        "engelgabriel",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11097",
+      "title": "Speed up the build time by removing JSON Minify from i18n package",
+      "userLogin": "rodrigok",
+      "milestone": "0.66.0",
+      "contributors": [
+        "rodrigok"
+      ]
+    },
+    {
+      "pr": "10958",
+      "title": "[NEW] Add input to set time for avatar cache control",
+      "userLogin": "MarcosSpessatto",
+      "milestone": "0.66.0",
+      "contributors": [
+        "MarcosSpessatto"
+      ]
+    },
+    {
+      "pr": "10727",
+      "title": "[NEW] Command /hide to hide channels",
+      "userLogin": "mikaelmello",
+      "milestone": "0.66.0",
+      "contributors": [
+        "mikaelmello",
+        "ggazzo",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11089",
+      "title": "[FIX] Can't access the `/account/profile`",
+      "userLogin": "tassoevan",
+      "milestone": "0.66.0",
+      "contributors": [
+        "tassoevan",
+        "ggazzo",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11087",
+      "title": "[NEW] Do not wait method calls response on websocket before next method call",
+      "userLogin": "rodrigok",
+      "milestone": "0.66.0",
+      "contributors": [
+        "rodrigok",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11086",
+      "title": "[NEW] Disconnect users from websocket when away from the login screen for 10min",
+      "userLogin": "rodrigok",
+      "milestone": "0.66.0",
+      "contributors": [
+        "rodrigok"
+      ]
+    },
+    {
+      "pr": "11083",
+      "title": "[NEW] Reduce the amount of DDP API calls on login screen",
+      "userLogin": "rodrigok",
+      "milestone": "0.66.0",
+      "contributors": [
+        "rodrigok",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11093",
+      "title": "Fix Docker image for develop commits",
+      "userLogin": "sampaiodiego",
+      "contributors": [
+        "sampaiodiego"
+      ]
+    },
+    {
+      "pr": "11085",
+      "title": "[NEW] Option to trace Methods and Subscription calls",
+      "userLogin": "rodrigok",
+      "milestone": "0.66.0",
+      "contributors": [
+        "rodrigok"
+      ]
+    },
+    {
+      "pr": "11084",
+      "title": "[FIX] Idle time limit wasn’t working as expected",
+      "userLogin": "rodrigok",
+      "milestone": "0.66.0",
+      "contributors": [
+        "rodrigok"
+      ]
+    },
+    {
+      "pr": "11076",
+      "title": "Build Docker image on CI",
+      "userLogin": "sampaiodiego",
+      "contributors": [
+        "sampaiodiego"
+      ]
+    },
+    {
+      "pr": "9959",
+      "title": "[FIX] Rooms list sorting by activity multiple re-renders and case sensitive sorting alphabetically",
+      "userLogin": "ggazzo",
+      "milestone": "0.66.0",
+      "contributors": [
+        "ggazzo",
+        "sampaiodiego",
+        "web-flow",
+        "karlprieb",
+        "JoseRenan"
+      ]
+    },
+    {
+      "pr": "11024",
+      "title": "[FIX] Notification not working for group mentions and not respecting ignored users",
+      "userLogin": "sampaiodiego",
+      "milestone": "0.66.0",
+      "contributors": [
+        "sampaiodiego",
+        "web-flow",
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "10294",
+      "title": "[FIX] Overlapping of search text and cancel search icon (X)",
+      "userLogin": "taeven",
+      "milestone": "0.66.0",
+      "contributors": [
+        "taeven",
+        "rodrigok",
+        "web-flow",
+        "engelgabriel"
+      ]
+    },
+    {
+      "pr": "11063",
+      "title": "[FIX] Link previews not being removed from messages after removed on editing",
+      "userLogin": "ggazzo",
+      "milestone": "0.66.0",
+      "contributors": [
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "11074",
+      "title": "[FIX] avoid send presence without login",
+      "userLogin": "ggazzo",
+      "contributors": [
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "11072",
+      "title": "[FIX] Exception in metrics generation",
+      "userLogin": "rodrigok",
+      "milestone": "0.66.0",
+      "contributors": [
+        "rodrigok"
+      ]
+    },
+    {
+      "pr": "11070",
+      "title": "Update issue templates",
+      "userLogin": "engelgabriel",
+      "contributors": [
+        "engelgabriel"
+      ]
+    },
+    {
+      "pr": "11062",
+      "title": "LingoHub based on develop",
+      "userLogin": "engelgabriel",
+      "contributors": [
+        "engelgabriel",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11056",
+      "title": "[FIX] Build for Sandstorm missing dependence for capnp",
+      "userLogin": "peterlee0127",
+      "contributors": [
+        "peterlee0127"
+      ]
+    },
+    {
+      "pr": "11049",
+      "title": "[FIX] flex-tab icons missing",
+      "userLogin": "ggazzo",
+      "milestone": "0.66.0",
+      "contributors": [
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "11054",
+      "title": "LingoHub based on develop",
+      "userLogin": "engelgabriel",
+      "contributors": [
+        "engelgabriel"
+      ]
+    },
+    {
+      "pr": "11053",
+      "title": "LingoHub based on develop",
+      "userLogin": "engelgabriel",
+      "contributors": [
+        "engelgabriel"
+      ]
+    },
+    {
+      "pr": "11051",
+      "title": "LingoHub based on develop",
+      "userLogin": "engelgabriel",
+      "contributors": [
+        "engelgabriel"
+      ]
+    },
+    {
+      "pr": "11045",
+      "title": "LingoHub based on develop",
+      "userLogin": "engelgabriel",
+      "contributors": [
+        "engelgabriel"
+      ]
+    },
+    {
+      "pr": "11044",
+      "title": "LingoHub based on develop",
+      "userLogin": "engelgabriel",
+      "contributors": [
+        "engelgabriel"
+      ]
+    },
+    {
+      "pr": "11043",
+      "title": "LingoHub based on develop",
+      "userLogin": "engelgabriel",
+      "contributors": [
+        "engelgabriel"
+      ]
+    },
+    {
+      "pr": "11042",
+      "title": "LingoHub based on develop",
+      "userLogin": "engelgabriel",
+      "contributors": [
+        "engelgabriel"
+      ]
+    },
+    {
+      "pr": "9969",
+      "title": "Changed 'confirm password' placeholder text on user registration form",
+      "userLogin": "kumarnitj",
+      "milestone": "0.66.0",
+      "contributors": [
+        null,
+        "kumarnitj",
+        "web-flow",
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "11020",
+      "title": "[FIX] Update ja.i18n.json",
+      "userLogin": "noobbbbb",
+      "contributors": [
+        "noobbbbb",
+        "web-flow",
+        "Hudell"
+      ]
+    },
+    {
+      "pr": "11039",
+      "title": "LingoHub based on develop",
+      "userLogin": "engelgabriel",
+      "contributors": [
+        null,
+        "engelgabriel",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11035",
+      "title": "LingoHub based on develop",
+      "userLogin": "engelgabriel",
+      "contributors": [
+        "engelgabriel"
+      ]
+    },
+    {
+      "pr": "10954",
+      "title": "[NEW] Replace variable 'mergeChannels' with 'groupByType'.",
+      "userLogin": "mikaelmello",
+      "milestone": "0.66.0",
+      "contributors": [
+        "mikaelmello",
+        "rodrigok",
+        "web-flow",
+        "ggazzo",
+        "engelgabriel"
+      ]
+    },
+    {
+      "pr": "11012",
+      "title": "[FIX] Strange msg when setting room announcement, topic or description to be empty",
+      "userLogin": "vynmera",
+      "milestone": "0.66.0",
+      "contributors": [
+        "vynmera",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "11009",
+      "title": "[FIX] Exception thrown on avatar validation",
+      "userLogin": "Hudell",
+      "contributors": [
+        "Hudell"
+      ]
+    },
+    {
+      "pr": "10091",
+      "title": "[NEW] Send LiveChat visitor navigation history as messages",
+      "userLogin": "renatobecker",
+      "milestone": "0.66.0",
+      "contributors": [
+        "renatobecker",
+        "sampaiodiego"
+      ]
+    },
+    {
+      "pr": "10673",
+      "title": "[NEW] Make supplying an AWS access key and secret optional for S3 uploads",
+      "userLogin": "saplla",
+      "milestone": "0.66.0",
+      "contributors": [
+        "saplla",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10207",
+      "title": "Update Documentation: README.md",
+      "userLogin": "rakhi2104",
+      "contributors": [
+        "rakhi2104",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10998",
+      "title": "[FIX] Preview of large images not resizing to fit the area and having scrollbars",
+      "userLogin": "vynmera",
+      "milestone": "0.66.0",
+      "contributors": [
+        "vynmera",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10956",
+      "title": "[FIX] Allow inviting livechat managers to the same LiveChat room",
+      "userLogin": "renatobecker",
+      "milestone": "0.66.0",
+      "contributors": [
+        "renatobecker",
+        "sampaiodiego"
+      ]
+    },
+    {
+      "pr": "10913",
+      "title": "NPM Dependencies Update",
+      "userLogin": "engelgabriel",
+      "milestone": "0.66.0",
+      "contributors": [
+        "engelgabriel",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10805",
+      "title": "[FIX] Cannot read property 'debug' of undefined when trying to use REST API",
+      "userLogin": "haffla",
+      "milestone": "0.66.0",
+      "contributors": [
+        "haffla",
+        "engelgabriel",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10131",
+      "title": "update meteor to 1.6.1 for sandstorm build",
+      "userLogin": "peterlee0127",
+      "contributors": [
+        "peterlee0127",
+        "web-flow",
+        "engelgabriel"
+      ]
+    },
+    {
+      "pr": "10986",
+      "title": "Renaming username.username to username.value for clarity",
+      "userLogin": "engelgabriel",
+      "milestone": "0.66.0",
+      "contributors": [
+        "engelgabriel",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10988",
+      "title": "[NEW] Direct Reply: separate Reply-To email from account username field",
+      "userLogin": "engelgabriel",
+      "milestone": "0.66.0",
+      "contributors": [
+        "pkgodara",
+        "web-flow",
+        "engelgabriel"
+      ]
+    },
+    {
+      "pr": "5",
+      "title": "Fix readme typo",
+      "userLogin": "filipealva",
+      "contributors": [
+        "filipealva"
+      ]
+    },
+    {
+      "pr": "10055",
+      "title": "[NEW] Changes all 'mergeChannels' to 'groupByType'.",
+      "userLogin": "mikaelmello",
+      "milestone": "0.66.0",
+      "contributors": [
+        "mikaelmello",
+        "rodrigok",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10771",
+      "title": "[FIX] Icons svg xml structure",
+      "userLogin": "timkinnane",
+      "contributors": [
+        "timkinnane"
+      ]
+    },
+    {
+      "pr": "10851",
+      "title": "[FIX] Leave room wasn't working as expected",
+      "userLogin": "ggazzo",
+      "milestone": "0.65.1",
+      "contributors": [
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "10807",
+      "title": "Remove wrong and not needed time unit",
+      "userLogin": "cliffparnitzky",
+      "contributors": [
+        "cliffparnitzky"
+      ]
+    },
+    {
+      "pr": "10934",
+      "title": "[FIX] Application crashing on startup when trying to log errors to `exceptions` channel",
+      "userLogin": "sampaiodiego",
+      "milestone": "0.65.1",
+      "contributors": [
+        "sampaiodiego"
+      ]
+    },
+    {
+      "pr": "10904",
+      "title": "[FIX] Image lazy load was breaking attachments",
+      "userLogin": "ggazzo",
+      "milestone": "0.65.1",
+      "contributors": [
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "10928",
+      "title": "[FIX] Incomplete email notification link",
+      "userLogin": "sampaiodiego",
+      "milestone": "0.65.1",
+      "contributors": [
+        "sampaiodiego"
+      ]
+    },
+    {
+      "pr": "10916",
+      "title": "[FIX] Remove outdated 2FA warning for mobile clients",
+      "userLogin": "cardoso",
+      "contributors": [
+        "cardoso"
+      ]
+    },
+    {
+      "pr": "10841",
+      "title": "[NEW] Update WeDeploy deployment",
+      "userLogin": "jonnilundy",
+      "contributors": [
+        "jonnilundy",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10867",
+      "title": "[FIX] Update Sandstorm build config",
+      "userLogin": "ocdtrekkie",
+      "contributors": [
+        "ocdtrekkie",
+        "engelgabriel",
+        "web-flow"
+      ]
+    },
+    {
+      "pr": "10909",
+      "title": "Develop sync commits",
+      "userLogin": "rodrigok",
+      "contributors": [
+        "geekgonecrazy",
+        "web-flow",
+        "graywolf336",
+        "nsuchy",
+        "rodrigok",
+        "rafaelks",
+        "sampaiodiego"
+      ]
+    },
+    {
+      "pr": "10908",
+      "title": "Develop sync2",
+      "userLogin": "rodrigok",
+      "contributors": [
+        "geekgonecrazy",
+        "web-flow",
+        "graywolf336",
+        "nsuchy",
+        "rodrigok",
+        "rafaelks",
+        "sampaiodiego"
+      ]
+    },
+    {
+      "pr": "10903",
+      "title": "Merge master into develop & Set version to 0.66.0-develop",
+      "userLogin": "rodrigok",
+      "contributors": [
+        "geekgonecrazy",
+        "web-flow",
+        "graywolf336",
+        "nsuchy",
+        "rodrigok",
+        "rafaelks",
+        "sampaiodiego"
+      ]
+    },
+    {
+      "pr": "9534",
+      "title": "[FIX] i18n - add semantic markup",
+      "userLogin": "brylie",
+      "contributors": [
+        "brylie",
+        "web-flow",
+        "engelgabriel"
+      ]
+    }
   ]
 }
\ No newline at end of file
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 1ccd77554696..1ca058b5447b 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appTitle = (defaultText = "Rocket.Chat"),
 
-		appVersion = 71,  # Increment this for every release.
+		appVersion = 72,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.66.0-develop"),
+		appMarketingVersion = (defaultText = "0.66.0-rc.0"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 3a2254b83a4f..412c7cc50096 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.66.0-develop
+    RC_VERSION=0.66.0-rc.0
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 4445db84bbe4..7be3ff8f4f9d 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,230 @@
 
+# 0.66.0 (Under Release Candidate Process)
+
+## 0.66.0-rc.0
+`2018-06-20  ·  1 ️️️⚠️  ·  23 🎉  ·  52 🐛  ·  36 🔍  ·  45 👩‍💻👨‍💻`
+
+### ⚠️ BREAKING CHANGES
+
+- Always remove the field `services` from user data responses in REST API ([#10799](https://github.com/RocketChat/Rocket.Chat/pull/10799))
+
+### 🎉 New features
+
+- Youtube Broadcasting ([#10127](https://github.com/RocketChat/Rocket.Chat/pull/10127))
+- REST API endpoints `permissions.list` and `permissions.update`. Deprecated endpoint `permissions` ([#10975](https://github.com/RocketChat/Rocket.Chat/pull/10975) by [@vynmera](https://github.com/vynmera))
+- REST API endpoint `channels.setDefault` ([#10941](https://github.com/RocketChat/Rocket.Chat/pull/10941) by [@vynmera](https://github.com/vynmera))
+- Set Document Domain property in IFrame ([#9751](https://github.com/RocketChat/Rocket.Chat/pull/9751) by [@kb0304](https://github.com/kb0304))
+- Custom login wallpapers ([#11025](https://github.com/RocketChat/Rocket.Chat/pull/11025) by [@vynmera](https://github.com/vynmera))
+- Support for dynamic slack and rocket.chat channels ([#10205](https://github.com/RocketChat/Rocket.Chat/pull/10205) by [@kable-wilmoth](https://github.com/kable-wilmoth))
+- Add prometheus port config ([#11115](https://github.com/RocketChat/Rocket.Chat/pull/11115) by [@brylie](https://github.com/brylie) & [@stuartpb](https://github.com/stuartpb) & [@thaiphv](https://github.com/thaiphv))
+- Button to remove closed LiveChat rooms ([#10301](https://github.com/RocketChat/Rocket.Chat/pull/10301))
+- Update katex to v0.9.0 ([#8402](https://github.com/RocketChat/Rocket.Chat/pull/8402) by [@pitamar](https://github.com/pitamar))
+- WebDAV(Nextcloud/ownCloud) Storage Server Option ([#11027](https://github.com/RocketChat/Rocket.Chat/pull/11027) by [@karakayasemi](https://github.com/karakayasemi))
+- Don't ask me again checkbox on hide room modal ([#10973](https://github.com/RocketChat/Rocket.Chat/pull/10973))
+- Add input to set time for avatar cache control ([#10958](https://github.com/RocketChat/Rocket.Chat/pull/10958))
+- Command /hide to hide channels ([#10727](https://github.com/RocketChat/Rocket.Chat/pull/10727) by [@mikaelmello](https://github.com/mikaelmello))
+- Do not wait method calls response on websocket before next method call ([#11087](https://github.com/RocketChat/Rocket.Chat/pull/11087))
+- Disconnect users from websocket when away from the login screen for 10min ([#11086](https://github.com/RocketChat/Rocket.Chat/pull/11086))
+- Reduce the amount of DDP API calls on login screen ([#11083](https://github.com/RocketChat/Rocket.Chat/pull/11083))
+- Option to trace Methods and Subscription calls ([#11085](https://github.com/RocketChat/Rocket.Chat/pull/11085))
+- Replace variable 'mergeChannels' with 'groupByType'. ([#10954](https://github.com/RocketChat/Rocket.Chat/pull/10954) by [@mikaelmello](https://github.com/mikaelmello))
+- Send LiveChat visitor navigation history as messages ([#10091](https://github.com/RocketChat/Rocket.Chat/pull/10091))
+- Make supplying an AWS access key and secret optional for S3 uploads ([#10673](https://github.com/RocketChat/Rocket.Chat/pull/10673) by [@saplla](https://github.com/saplla))
+- Direct Reply: separate Reply-To email from account username field ([#10988](https://github.com/RocketChat/Rocket.Chat/pull/10988) by [@pkgodara](https://github.com/pkgodara))
+- Changes all 'mergeChannels' to 'groupByType'. ([#10055](https://github.com/RocketChat/Rocket.Chat/pull/10055) by [@mikaelmello](https://github.com/mikaelmello))
+- Update WeDeploy deployment ([#10841](https://github.com/RocketChat/Rocket.Chat/pull/10841) by [@jonnilundy](https://github.com/jonnilundy))
+
+### 🐛 Bug fixes
+
+- Wordpress oauth configuration not loading properly ([#11187](https://github.com/RocketChat/Rocket.Chat/pull/11187))
+- REST API: Add more test cases for `/login` ([#10999](https://github.com/RocketChat/Rocket.Chat/pull/10999))
+- Wrong font-family order ([#11191](https://github.com/RocketChat/Rocket.Chat/pull/11191) by [@myfonj](https://github.com/myfonj))
+- REST endpoint `users.updateOwnBasicInfo` was not returning errors for invalid names and trying to save custom fields when empty ([#11204](https://github.com/RocketChat/Rocket.Chat/pull/11204))
+- Livechat visitor not being prompted for transcript when himself is closing the chat ([#10767](https://github.com/RocketChat/Rocket.Chat/pull/10767))
+- HipChat Cloud import fails to import rooms ([#11188](https://github.com/RocketChat/Rocket.Chat/pull/11188))
+- Failure to download user data ([#11190](https://github.com/RocketChat/Rocket.Chat/pull/11190))
+- Add parameter to REST chat.react endpoint, to make it work like a setter ([#10447](https://github.com/RocketChat/Rocket.Chat/pull/10447))
+- Default selected language ([#11150](https://github.com/RocketChat/Rocket.Chat/pull/11150))
+- Rendering of emails and mentions in messages ([#11165](https://github.com/RocketChat/Rocket.Chat/pull/11165))
+- Livechat icon with status ([#11177](https://github.com/RocketChat/Rocket.Chat/pull/11177))
+- remove sidebar on embedded view ([#11183](https://github.com/RocketChat/Rocket.Chat/pull/11183))
+- Missing language constants ([#11173](https://github.com/RocketChat/Rocket.Chat/pull/11173) by [@rw4lll](https://github.com/rw4lll))
+- Room creation error due absence of subscriptions ([#11178](https://github.com/RocketChat/Rocket.Chat/pull/11178))
+- Remove failed upload messages when switching rooms ([#11132](https://github.com/RocketChat/Rocket.Chat/pull/11132))
+- Wordpress OAuth not providing enough info to log in  ([#11152](https://github.com/RocketChat/Rocket.Chat/pull/11152))
+- /groups.invite not allow a user to invite even with permission ([#11010](https://github.com/RocketChat/Rocket.Chat/pull/11010))
+- Various lang fixes [RU] ([#10095](https://github.com/RocketChat/Rocket.Chat/pull/10095) by [@rw4lll](https://github.com/rw4lll))
+- set-toolbar-items postMessage ([#11109](https://github.com/RocketChat/Rocket.Chat/pull/11109))
+- title and value attachments are optionals on sendMessage method ([#11021](https://github.com/RocketChat/Rocket.Chat/pull/11021))
+- Some typos in the error message names ([#11136](https://github.com/RocketChat/Rocket.Chat/pull/11136) by [@vynmera](https://github.com/vynmera))
+- open conversation from room info ([#11050](https://github.com/RocketChat/Rocket.Chat/pull/11050))
+- Users model was not receiving options ([#11129](https://github.com/RocketChat/Rocket.Chat/pull/11129))
+- Popover position ([#11113](https://github.com/RocketChat/Rocket.Chat/pull/11113))
+- Generated random password visible to the user ([#11096](https://github.com/RocketChat/Rocket.Chat/pull/11096))
+- LiveChat appearance changes not being saved ([#11111](https://github.com/RocketChat/Rocket.Chat/pull/11111))
+- Confirm password on set new password user profile ([#11095](https://github.com/RocketChat/Rocket.Chat/pull/11095))
+- Message_AllowedMaxSize fails for emoji sequences ([#10431](https://github.com/RocketChat/Rocket.Chat/pull/10431) by [@c0dzilla](https://github.com/c0dzilla))
+- Can't access the `/account/profile` ([#11089](https://github.com/RocketChat/Rocket.Chat/pull/11089))
+- Idle time limit wasn’t working as expected ([#11084](https://github.com/RocketChat/Rocket.Chat/pull/11084))
+- Rooms list sorting by activity multiple re-renders and case sensitive sorting alphabetically ([#9959](https://github.com/RocketChat/Rocket.Chat/pull/9959) by [@JoseRenan](https://github.com/JoseRenan))
+- Notification not working for group mentions and not respecting ignored users ([#11024](https://github.com/RocketChat/Rocket.Chat/pull/11024))
+- Overlapping of search text and cancel search icon (X) ([#10294](https://github.com/RocketChat/Rocket.Chat/pull/10294) by [@taeven](https://github.com/taeven))
+- Link previews not being removed from messages after removed on editing ([#11063](https://github.com/RocketChat/Rocket.Chat/pull/11063))
+- avoid send presence without login ([#11074](https://github.com/RocketChat/Rocket.Chat/pull/11074))
+- Exception in metrics generation ([#11072](https://github.com/RocketChat/Rocket.Chat/pull/11072))
+- Build for Sandstorm missing dependence for capnp ([#11056](https://github.com/RocketChat/Rocket.Chat/pull/11056) by [@peterlee0127](https://github.com/peterlee0127))
+- flex-tab icons missing ([#11049](https://github.com/RocketChat/Rocket.Chat/pull/11049))
+- Update ja.i18n.json ([#11020](https://github.com/RocketChat/Rocket.Chat/pull/11020) by [@noobbbbb](https://github.com/noobbbbb))
+- Strange msg when setting room announcement, topic or description to be empty ([#11012](https://github.com/RocketChat/Rocket.Chat/pull/11012) by [@vynmera](https://github.com/vynmera))
+- Exception thrown on avatar validation ([#11009](https://github.com/RocketChat/Rocket.Chat/pull/11009))
+- Preview of large images not resizing to fit the area and having scrollbars ([#10998](https://github.com/RocketChat/Rocket.Chat/pull/10998) by [@vynmera](https://github.com/vynmera))
+- Allow inviting livechat managers to the same LiveChat room ([#10956](https://github.com/RocketChat/Rocket.Chat/pull/10956))
+- Cannot read property 'debug' of undefined when trying to use REST API ([#10805](https://github.com/RocketChat/Rocket.Chat/pull/10805) by [@haffla](https://github.com/haffla))
+- Icons svg xml structure ([#10771](https://github.com/RocketChat/Rocket.Chat/pull/10771))
+- Leave room wasn't working as expected ([#10851](https://github.com/RocketChat/Rocket.Chat/pull/10851))
+- Application crashing on startup when trying to log errors to `exceptions` channel ([#10934](https://github.com/RocketChat/Rocket.Chat/pull/10934))
+- Image lazy load was breaking attachments ([#10904](https://github.com/RocketChat/Rocket.Chat/pull/10904))
+- Incomplete email notification link ([#10928](https://github.com/RocketChat/Rocket.Chat/pull/10928))
+- Remove outdated 2FA warning for mobile clients ([#10916](https://github.com/RocketChat/Rocket.Chat/pull/10916))
+- Update Sandstorm build config ([#10867](https://github.com/RocketChat/Rocket.Chat/pull/10867) by [@ocdtrekkie](https://github.com/ocdtrekkie))
+- i18n - add semantic markup ([#9534](https://github.com/RocketChat/Rocket.Chat/pull/9534) by [@brylie](https://github.com/brylie))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- [IMPROVE] Listing of apps in the admin page ([#11166](https://github.com/RocketChat/Rocket.Chat/pull/11166))
+- Regression: Directory css ([#11206](https://github.com/RocketChat/Rocket.Chat/pull/11206))
+- LingoHub based on develop ([#11208](https://github.com/RocketChat/Rocket.Chat/pull/11208))
+- IRC Federation: RFC2813 implementation (ngIRCd) ([#10113](https://github.com/RocketChat/Rocket.Chat/pull/10113) by [@cpitman](https://github.com/cpitman) & [@lindoelio](https://github.com/lindoelio))
+- Add verification to make sure the user exists in REST  insert object helper ([#11008](https://github.com/RocketChat/Rocket.Chat/pull/11008))
+- Regression: Directory user table infinite scroll doesn't working ([#11200](https://github.com/RocketChat/Rocket.Chat/pull/11200))
+- [IMPROVE] UI design for Tables and tabs component on Directory ([#11026](https://github.com/RocketChat/Rocket.Chat/pull/11026))
+- [FIX Readme] Nodejs + Python version spicifications ([#11181](https://github.com/RocketChat/Rocket.Chat/pull/11181) by [@mahdiyari](https://github.com/mahdiyari))
+- Regression: sorting direct message by asc on favorites group ([#11090](https://github.com/RocketChat/Rocket.Chat/pull/11090))
+- [IMPROVE] User mentions ([#11001](https://github.com/RocketChat/Rocket.Chat/pull/11001) by [@vynmera](https://github.com/vynmera))
+- Fix PR Docker image creation by splitting in two build jobs ([#11107](https://github.com/RocketChat/Rocket.Chat/pull/11107))
+- Update v126.js ([#11103](https://github.com/RocketChat/Rocket.Chat/pull/11103))
+- Speed up the build time by removing JSON Minify from i18n package ([#11097](https://github.com/RocketChat/Rocket.Chat/pull/11097))
+- Fix Docker image for develop commits ([#11093](https://github.com/RocketChat/Rocket.Chat/pull/11093))
+- Build Docker image on CI ([#11076](https://github.com/RocketChat/Rocket.Chat/pull/11076))
+- Update issue templates ([#11070](https://github.com/RocketChat/Rocket.Chat/pull/11070))
+- LingoHub based on develop ([#11062](https://github.com/RocketChat/Rocket.Chat/pull/11062))
+- LingoHub based on develop ([#11054](https://github.com/RocketChat/Rocket.Chat/pull/11054))
+- LingoHub based on develop ([#11053](https://github.com/RocketChat/Rocket.Chat/pull/11053))
+- LingoHub based on develop ([#11051](https://github.com/RocketChat/Rocket.Chat/pull/11051))
+- LingoHub based on develop ([#11045](https://github.com/RocketChat/Rocket.Chat/pull/11045))
+- LingoHub based on develop ([#11044](https://github.com/RocketChat/Rocket.Chat/pull/11044))
+- LingoHub based on develop ([#11043](https://github.com/RocketChat/Rocket.Chat/pull/11043))
+- LingoHub based on develop ([#11042](https://github.com/RocketChat/Rocket.Chat/pull/11042))
+- Changed 'confirm password' placeholder text on user registration form ([#9969](https://github.com/RocketChat/Rocket.Chat/pull/9969) by [@kumarnitj](https://github.com/kumarnitj))
+- LingoHub based on develop ([#11039](https://github.com/RocketChat/Rocket.Chat/pull/11039))
+- LingoHub based on develop ([#11035](https://github.com/RocketChat/Rocket.Chat/pull/11035))
+- Update Documentation: README.md ([#10207](https://github.com/RocketChat/Rocket.Chat/pull/10207) by [@rakhi2104](https://github.com/rakhi2104))
+- NPM Dependencies Update ([#10913](https://github.com/RocketChat/Rocket.Chat/pull/10913))
+- update meteor to 1.6.1 for sandstorm build ([#10131](https://github.com/RocketChat/Rocket.Chat/pull/10131) by [@peterlee0127](https://github.com/peterlee0127))
+- Renaming username.username to username.value for clarity ([#10986](https://github.com/RocketChat/Rocket.Chat/pull/10986))
+- Fix readme typo ([#5](https://github.com/RocketChat/Rocket.Chat/pull/5))
+- Remove wrong and not needed time unit ([#10807](https://github.com/RocketChat/Rocket.Chat/pull/10807) by [@cliffparnitzky](https://github.com/cliffparnitzky))
+- Develop sync commits ([#10909](https://github.com/RocketChat/Rocket.Chat/pull/10909) by [@nsuchy](https://github.com/nsuchy))
+- Develop sync2 ([#10908](https://github.com/RocketChat/Rocket.Chat/pull/10908) by [@nsuchy](https://github.com/nsuchy))
+- Merge master into develop & Set version to 0.66.0-develop ([#10903](https://github.com/RocketChat/Rocket.Chat/pull/10903) by [@nsuchy](https://github.com/nsuchy))
+
+</details>
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@JoseRenan](https://github.com/JoseRenan)
+- [@brylie](https://github.com/brylie)
+- [@c0dzilla](https://github.com/c0dzilla)
+- [@cliffparnitzky](https://github.com/cliffparnitzky)
+- [@cpitman](https://github.com/cpitman)
+- [@haffla](https://github.com/haffla)
+- [@jonnilundy](https://github.com/jonnilundy)
+- [@kable-wilmoth](https://github.com/kable-wilmoth)
+- [@karakayasemi](https://github.com/karakayasemi)
+- [@kb0304](https://github.com/kb0304)
+- [@kumarnitj](https://github.com/kumarnitj)
+- [@lindoelio](https://github.com/lindoelio)
+- [@mahdiyari](https://github.com/mahdiyari)
+- [@mikaelmello](https://github.com/mikaelmello)
+- [@myfonj](https://github.com/myfonj)
+- [@noobbbbb](https://github.com/noobbbbb)
+- [@nsuchy](https://github.com/nsuchy)
+- [@ocdtrekkie](https://github.com/ocdtrekkie)
+- [@peterlee0127](https://github.com/peterlee0127)
+- [@pitamar](https://github.com/pitamar)
+- [@pkgodara](https://github.com/pkgodara)
+- [@rakhi2104](https://github.com/rakhi2104)
+- [@rw4lll](https://github.com/rw4lll)
+- [@saplla](https://github.com/saplla)
+- [@stuartpb](https://github.com/stuartpb)
+- [@taeven](https://github.com/taeven)
+- [@thaiphv](https://github.com/thaiphv)
+- [@vynmera](https://github.com/vynmera)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@Hudell](https://github.com/Hudell)
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@alansikora](https://github.com/alansikora)
+- [@cardoso](https://github.com/cardoso)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@filipealva](https://github.com/filipealva)
+- [@gdelavald](https://github.com/gdelavald)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@ggazzo](https://github.com/ggazzo)
+- [@graywolf336](https://github.com/graywolf336)
+- [@karlprieb](https://github.com/karlprieb)
+- [@rafaelks](https://github.com/rafaelks)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@tassoevan](https://github.com/tassoevan)
+- [@timkinnane](https://github.com/timkinnane)
+
+# 0.65.2
+`2018-06-16  ·  1 🐛  ·  1 🔍  ·  4 👩‍💻👨‍💻`
+
+### 🐛 Bug fixes
+
+- i18n - add semantic markup ([#9534](https://github.com/RocketChat/Rocket.Chat/pull/9534) by [@brylie](https://github.com/brylie))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- Release 0.65.1 ([#10947](https://github.com/RocketChat/Rocket.Chat/pull/10947))
+
+</details>
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@brylie](https://github.com/brylie)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
+# 0.65.1
+`2018-05-30  ·  5 🐛  ·  3 👩‍💻👨‍💻`
+
+### 🐛 Bug fixes
+
+- Livechat not loading ([#10940](https://github.com/RocketChat/Rocket.Chat/pull/10940))
+- Application crashing on startup when trying to log errors to `exceptions` channel ([#10934](https://github.com/RocketChat/Rocket.Chat/pull/10934))
+- Incomplete email notification link ([#10928](https://github.com/RocketChat/Rocket.Chat/pull/10928))
+- Image lazy load was breaking attachments ([#10904](https://github.com/RocketChat/Rocket.Chat/pull/10904))
+- Leave room wasn't working as expected ([#10851](https://github.com/RocketChat/Rocket.Chat/pull/10851))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.65.0
-`2018-05-27  ·  17 🎉  ·  24 🐛  ·  41 🔍  ·  29 👩‍💻👨‍💻`
+`2018-05-28  ·  17 🎉  ·  24 🐛  ·  41 🔍  ·  29 👩‍💻👨‍💻`
 
 ### 🎉 New features
 
@@ -54,7 +278,7 @@
 
 - Release 0.64.2 ([#10812](https://github.com/RocketChat/Rocket.Chat/pull/10812) by [@Sameesunkaria](https://github.com/Sameesunkaria) & [@erhan-](https://github.com/erhan-) & [@peccu](https://github.com/peccu) & [@winterstefan](https://github.com/winterstefan))
 - Release 0.64.1 ([#10660](https://github.com/RocketChat/Rocket.Chat/pull/10660) by [@saplla](https://github.com/saplla))
-- Release 0.64.0 ([#10613](https://github.com/RocketChat/Rocket.Chat/pull/10613) by [@TwizzyDizzy](https://github.com/TwizzyDizzy) & [@christianh814](https://github.com/christianh814) & [@tttt-conan](https://github.com/tttt-conan))
+- Release 0.64.0 ([#10613](https://github.com/RocketChat/Rocket.Chat/pull/10613) by [@christianh814](https://github.com/christianh814) & [@tttt-conan](https://github.com/tttt-conan))
 - Release 0.63.3 ([#10504](https://github.com/RocketChat/Rocket.Chat/pull/10504))
 - Release 0.63.2 ([#10476](https://github.com/RocketChat/Rocket.Chat/pull/10476))
 - add redhat dockerfile to master ([#10408](https://github.com/RocketChat/Rocket.Chat/pull/10408))
@@ -79,7 +303,7 @@
 - Correct links in README file ([#10674](https://github.com/RocketChat/Rocket.Chat/pull/10674) by [@winterstefan](https://github.com/winterstefan))
 - Release 0.64.2 ([#10812](https://github.com/RocketChat/Rocket.Chat/pull/10812) by [@Sameesunkaria](https://github.com/Sameesunkaria) & [@erhan-](https://github.com/erhan-) & [@peccu](https://github.com/peccu) & [@winterstefan](https://github.com/winterstefan))
 - Release 0.64.1 ([#10660](https://github.com/RocketChat/Rocket.Chat/pull/10660) by [@saplla](https://github.com/saplla))
-- Release 0.64.0 ([#10613](https://github.com/RocketChat/Rocket.Chat/pull/10613) by [@TwizzyDizzy](https://github.com/TwizzyDizzy) & [@christianh814](https://github.com/christianh814) & [@tttt-conan](https://github.com/tttt-conan))
+- Release 0.64.0 ([#10613](https://github.com/RocketChat/Rocket.Chat/pull/10613) by [@christianh814](https://github.com/christianh814) & [@tttt-conan](https://github.com/tttt-conan))
 - Release 0.63.3 ([#10504](https://github.com/RocketChat/Rocket.Chat/pull/10504))
 - Release 0.63.2 ([#10476](https://github.com/RocketChat/Rocket.Chat/pull/10476))
 - add redhat dockerfile to master ([#10408](https://github.com/RocketChat/Rocket.Chat/pull/10408))
@@ -101,7 +325,6 @@
 - [@Mr-Gryphon](https://github.com/Mr-Gryphon)
 - [@Sameesunkaria](https://github.com/Sameesunkaria)
 - [@ThomasRoehl](https://github.com/ThomasRoehl)
-- [@TwizzyDizzy](https://github.com/TwizzyDizzy)
 - [@c0dzilla](https://github.com/c0dzilla)
 - [@cfunkles](https://github.com/cfunkles)
 - [@christianh814](https://github.com/christianh814)
@@ -119,6 +342,7 @@
 
 - [@Hudell](https://github.com/Hudell)
 - [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@TwizzyDizzy](https://github.com/TwizzyDizzy)
 - [@cardoso](https://github.com/cardoso)
 - [@engelgabriel](https://github.com/engelgabriel)
 - [@gdelavald](https://github.com/gdelavald)
@@ -345,7 +569,7 @@
 - [OTHER] Removed the developer warning on the rest api ([#10441](https://github.com/RocketChat/Rocket.Chat/pull/10441))
 - Fix and improve vietnamese translation ([#10397](https://github.com/RocketChat/Rocket.Chat/pull/10397) by [@TDiNguyen](https://github.com/TDiNguyen) & [@tttt-conan](https://github.com/tttt-conan))
 - Use Node 8.9 for CI build ([#10405](https://github.com/RocketChat/Rocket.Chat/pull/10405))
-- Update allowed labels for bot ([#10360](https://github.com/RocketChat/Rocket.Chat/pull/10360) by [@TwizzyDizzy](https://github.com/TwizzyDizzy))
+- Update allowed labels for bot ([#10360](https://github.com/RocketChat/Rocket.Chat/pull/10360))
 - Remove @core team mention from Pull Request template ([#10384](https://github.com/RocketChat/Rocket.Chat/pull/10384))
 - New issue template for *Release Process* ([#10234](https://github.com/RocketChat/Rocket.Chat/pull/10234))
 - Master into Develop Branch Sync ([#10376](https://github.com/RocketChat/Rocket.Chat/pull/10376))
@@ -371,7 +595,6 @@
 
 - [@Prakharsvnit](https://github.com/Prakharsvnit)
 - [@TDiNguyen](https://github.com/TDiNguyen)
-- [@TwizzyDizzy](https://github.com/TwizzyDizzy)
 - [@abernix](https://github.com/abernix)
 - [@brendangadd](https://github.com/brendangadd)
 - [@c0dzilla](https://github.com/c0dzilla)
@@ -391,6 +614,7 @@
 
 - [@Hudell](https://github.com/Hudell)
 - [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@TwizzyDizzy](https://github.com/TwizzyDizzy)
 - [@cardoso](https://github.com/cardoso)
 - [@engelgabriel](https://github.com/engelgabriel)
 - [@gdelavald](https://github.com/gdelavald)
@@ -670,8 +894,8 @@
 - Add user settings / preferences API endpoint ([#9457](https://github.com/RocketChat/Rocket.Chat/pull/9457) by [@jgtoriginal](https://github.com/jgtoriginal))
 - New sidebar layout ([#9608](https://github.com/RocketChat/Rocket.Chat/pull/9608))
 - Message read receipts ([#9717](https://github.com/RocketChat/Rocket.Chat/pull/9717))
-- Alert admins when user requires approval & alert users when the account is approved/activated/deactivated ([#7098](https://github.com/RocketChat/Rocket.Chat/pull/7098))
-- Allow configuration of SAML logout behavior ([#9527](https://github.com/RocketChat/Rocket.Chat/pull/9527) by [@mrsimpson](https://github.com/mrsimpson))
+- Alert admins when user requires approval & alert users when the account is approved/activated/deactivated ([#7098](https://github.com/RocketChat/Rocket.Chat/pull/7098) by [@luisfn](https://github.com/luisfn))
+- Allow configuration of SAML logout behavior ([#9527](https://github.com/RocketChat/Rocket.Chat/pull/9527))
 - Internal hubot support for Direct Messages and Private Groups ([#8933](https://github.com/RocketChat/Rocket.Chat/pull/8933) by [@ramrami](https://github.com/ramrami))
 - Improved default welcome message ([#9298](https://github.com/RocketChat/Rocket.Chat/pull/9298) by [@HammyHavoc](https://github.com/HammyHavoc))
 - Makes shield icon configurable ([#9746](https://github.com/RocketChat/Rocket.Chat/pull/9746) by [@c0dzilla](https://github.com/c0dzilla))
@@ -687,7 +911,7 @@
 - GraphQL API ([#8158](https://github.com/RocketChat/Rocket.Chat/pull/8158) by [@kamilkisiela](https://github.com/kamilkisiela))
 - Livestream tab ([#9255](https://github.com/RocketChat/Rocket.Chat/pull/9255))
 - Add documentation requirement to PRs ([#9658](https://github.com/RocketChat/Rocket.Chat/pull/9658) by [@SeanPackham](https://github.com/SeanPackham))
-- Request mongoDB version in github issue template ([#9807](https://github.com/RocketChat/Rocket.Chat/pull/9807) by [@TwizzyDizzy](https://github.com/TwizzyDizzy))
+- Request mongoDB version in github issue template ([#9807](https://github.com/RocketChat/Rocket.Chat/pull/9807))
 
 ### 🐛 Bug fixes
 
@@ -697,9 +921,9 @@
 - Livechat conversation not receiving messages when start without form ([#9772](https://github.com/RocketChat/Rocket.Chat/pull/9772))
 - Emoji rendering on last message ([#9776](https://github.com/RocketChat/Rocket.Chat/pull/9776))
 - Chrome 64 breaks jitsi-meet iframe ([#9560](https://github.com/RocketChat/Rocket.Chat/pull/9560) by [@speedy01](https://github.com/speedy01))
-- Harmonize channel-related actions ([#9697](https://github.com/RocketChat/Rocket.Chat/pull/9697) by [@mrsimpson](https://github.com/mrsimpson))
+- Harmonize channel-related actions ([#9697](https://github.com/RocketChat/Rocket.Chat/pull/9697))
 - Custom emoji was cropping sometimes ([#9676](https://github.com/RocketChat/Rocket.Chat/pull/9676) by [@anu-007](https://github.com/anu-007))
-- Show custom room types icon in channel header ([#9696](https://github.com/RocketChat/Rocket.Chat/pull/9696) by [@mrsimpson](https://github.com/mrsimpson))
+- Show custom room types icon in channel header ([#9696](https://github.com/RocketChat/Rocket.Chat/pull/9696))
 - 'Query' support for channels.list.joined, groups.list, groups.listAll, im.list ([#9424](https://github.com/RocketChat/Rocket.Chat/pull/9424) by [@xbolshe](https://github.com/xbolshe))
 - Livechat issues on external queue and lead capture ([#9750](https://github.com/RocketChat/Rocket.Chat/pull/9750))
 - DeprecationWarning: prom-client ... when starting Rocket Chat server ([#9747](https://github.com/RocketChat/Rocket.Chat/pull/9747) by [@jgtoriginal](https://github.com/jgtoriginal))
@@ -743,7 +967,7 @@
 - Dependencies update ([#9811](https://github.com/RocketChat/Rocket.Chat/pull/9811))
 - Fix: Custom fields not showing on user info panel ([#9821](https://github.com/RocketChat/Rocket.Chat/pull/9821))
 - Regression: Page was not respecting the window height on Firefox ([#9804](https://github.com/RocketChat/Rocket.Chat/pull/9804))
-- Update bot-config.yml ([#9784](https://github.com/RocketChat/Rocket.Chat/pull/9784) by [@JSzaszvari](https://github.com/JSzaszvari))
+- Update bot-config.yml ([#9784](https://github.com/RocketChat/Rocket.Chat/pull/9784))
 - Develop fix sync from master ([#9797](https://github.com/RocketChat/Rocket.Chat/pull/9797))
 - Regression: Change create channel icon ([#9851](https://github.com/RocketChat/Rocket.Chat/pull/9851))
 - Regression: Fix channel icons on safari ([#9852](https://github.com/RocketChat/Rocket.Chat/pull/9852))
@@ -760,10 +984,8 @@
 
 - [@AmShaegar13](https://github.com/AmShaegar13)
 - [@HammyHavoc](https://github.com/HammyHavoc)
-- [@JSzaszvari](https://github.com/JSzaszvari)
 - [@RationalCoding](https://github.com/RationalCoding)
 - [@SeanPackham](https://github.com/SeanPackham)
-- [@TwizzyDizzy](https://github.com/TwizzyDizzy)
 - [@anu-007](https://github.com/anu-007)
 - [@bernardoetrevisan](https://github.com/bernardoetrevisan)
 - [@c0dzilla](https://github.com/c0dzilla)
@@ -776,7 +998,7 @@
 - [@kb0304](https://github.com/kb0304)
 - [@kemitchell](https://github.com/kemitchell)
 - [@lindoelio](https://github.com/lindoelio)
-- [@mrsimpson](https://github.com/mrsimpson)
+- [@luisfn](https://github.com/luisfn)
 - [@ramrami](https://github.com/ramrami)
 - [@savikko](https://github.com/savikko)
 - [@sizrar](https://github.com/sizrar)
@@ -786,8 +1008,10 @@
 
 ### 👩‍💻👨‍💻 Core Team 🤓
 
+- [@JSzaszvari](https://github.com/JSzaszvari)
 - [@MarcosSpessatto](https://github.com/MarcosSpessatto)
 - [@MartinSchoeler](https://github.com/MartinSchoeler)
+- [@TwizzyDizzy](https://github.com/TwizzyDizzy)
 - [@engelgabriel](https://github.com/engelgabriel)
 - [@filipedelimabrito](https://github.com/filipedelimabrito)
 - [@gdelavald](https://github.com/gdelavald)
@@ -795,7 +1019,7 @@
 - [@ggazzo](https://github.com/ggazzo)
 - [@graywolf336](https://github.com/graywolf336)
 - [@karlprieb](https://github.com/karlprieb)
-- [@luisfn](https://github.com/luisfn)
+- [@mrsimpson](https://github.com/mrsimpson)
 - [@rafaelks](https://github.com/rafaelks)
 - [@renatobecker](https://github.com/renatobecker)
 - [@rodrigok](https://github.com/rodrigok)
@@ -1108,7 +1332,7 @@
 - Add new API endpoints ([#8947](https://github.com/RocketChat/Rocket.Chat/pull/8947))
 - Option to enable/disable auto away and configure timer ([#8029](https://github.com/RocketChat/Rocket.Chat/pull/8029) by [@armand1m](https://github.com/armand1m))
 - New Modal component ([#8882](https://github.com/RocketChat/Rocket.Chat/pull/8882))
-- Improve room types API and usages ([#9009](https://github.com/RocketChat/Rocket.Chat/pull/9009) by [@mrsimpson](https://github.com/mrsimpson))
+- Improve room types API and usages ([#9009](https://github.com/RocketChat/Rocket.Chat/pull/9009))
 - Room counter sidebar preference ([#8866](https://github.com/RocketChat/Rocket.Chat/pull/8866))
 - Save room's last message ([#8979](https://github.com/RocketChat/Rocket.Chat/pull/8979))
 - Token Controlled Access channels ([#8060](https://github.com/RocketChat/Rocket.Chat/pull/8060) by [@lindoelio](https://github.com/lindoelio))
@@ -1145,7 +1369,7 @@
 - Notification sound is not disabling when busy ([#9042](https://github.com/RocketChat/Rocket.Chat/pull/9042))
 - Use encodeURI in AmazonS3 contentDisposition file.name to prevent fail ([#9024](https://github.com/RocketChat/Rocket.Chat/pull/9024) by [@paulovitin](https://github.com/paulovitin))
 - snap install by setting grpc package used by google/vision to 1.6.6 ([#9029](https://github.com/RocketChat/Rocket.Chat/pull/9029))
-- Enable CORS for Restivus ([#8671](https://github.com/RocketChat/Rocket.Chat/pull/8671) by [@mrsimpson](https://github.com/mrsimpson))
+- Enable CORS for Restivus ([#8671](https://github.com/RocketChat/Rocket.Chat/pull/8671))
 - Importers failing when usernames exists but cases don't match and improve the importer framework's performance ([#8966](https://github.com/RocketChat/Rocket.Chat/pull/8966))
 - Error when saving integration with symbol as only trigger ([#9023](https://github.com/RocketChat/Rocket.Chat/pull/9023))
 - Sync of non existent field throws exception ([#8006](https://github.com/RocketChat/Rocket.Chat/pull/8006) by [@goiaba](https://github.com/goiaba))
@@ -1176,7 +1400,7 @@
 - Improved grammar and made it clearer to the user ([#8795](https://github.com/RocketChat/Rocket.Chat/pull/8795) by [@HammyHavoc](https://github.com/HammyHavoc))
 - Show real name of current user at top of side nav if setting enabled ([#8718](https://github.com/RocketChat/Rocket.Chat/pull/8718))
 - Range Slider Value label has bug in RTL ([#8441](https://github.com/RocketChat/Rocket.Chat/pull/8441) by [@cyclops24](https://github.com/cyclops24))
-- Add historic chats icon in Livechat ([#8708](https://github.com/RocketChat/Rocket.Chat/pull/8708) by [@mrsimpson](https://github.com/mrsimpson))
+- Add historic chats icon in Livechat ([#8708](https://github.com/RocketChat/Rocket.Chat/pull/8708))
 - Sort direct messages by full name if show real names setting enabled ([#8717](https://github.com/RocketChat/Rocket.Chat/pull/8717))
 - Improving consistency of UX ([#8796](https://github.com/RocketChat/Rocket.Chat/pull/8796) by [@HammyHavoc](https://github.com/HammyHavoc))
 - fixed some typos ([#8787](https://github.com/RocketChat/Rocket.Chat/pull/8787) by [@TheReal1604](https://github.com/TheReal1604))
@@ -1455,7 +1679,6 @@
 - [@luizbills](https://github.com/luizbills)
 - [@mastappl](https://github.com/mastappl)
 - [@mritunjaygoutam12](https://github.com/mritunjaygoutam12)
-- [@mrsimpson](https://github.com/mrsimpson)
 - [@paulovitin](https://github.com/paulovitin)
 - [@peterlee0127](https://github.com/peterlee0127)
 - [@pkgodara](https://github.com/pkgodara)
@@ -1491,6 +1714,7 @@
 - [@graywolf336](https://github.com/graywolf336)
 - [@karlprieb](https://github.com/karlprieb)
 - [@marceloschmidt](https://github.com/marceloschmidt)
+- [@mrsimpson](https://github.com/mrsimpson)
 - [@pierreozoux](https://github.com/pierreozoux)
 - [@rafaelks](https://github.com/rafaelks)
 - [@rodrigok](https://github.com/rodrigok)
@@ -2079,7 +2303,7 @@
 - Develop sync ([#7500](https://github.com/RocketChat/Rocket.Chat/pull/7500) by [@thinkeridea](https://github.com/thinkeridea))
 - Better Issue Template ([#7492](https://github.com/RocketChat/Rocket.Chat/pull/7492))
 - Add helm chart kubernetes deployment ([#6340](https://github.com/RocketChat/Rocket.Chat/pull/6340))
-- Develop sync ([#7363](https://github.com/RocketChat/Rocket.Chat/pull/7363) by [@JSzaszvari](https://github.com/JSzaszvari))
+- Develop sync ([#7363](https://github.com/RocketChat/Rocket.Chat/pull/7363))
 - Escape error messages ([#7308](https://github.com/RocketChat/Rocket.Chat/pull/7308))
 - update meteor to 1.5.0 ([#7287](https://github.com/RocketChat/Rocket.Chat/pull/7287))
 - Fix the Zapier oAuth return url to the new one ([#7215](https://github.com/RocketChat/Rocket.Chat/pull/7215))
@@ -2092,7 +2316,6 @@
 
 - [@AhmetS](https://github.com/AhmetS)
 - [@Darkneon](https://github.com/Darkneon)
-- [@JSzaszvari](https://github.com/JSzaszvari)
 - [@Oliver84](https://github.com/Oliver84)
 - [@al3x](https://github.com/al3x)
 - [@borsden](https://github.com/borsden)
@@ -2115,6 +2338,7 @@
 
 ### 👩‍💻👨‍💻 Core Team 🤓
 
+- [@JSzaszvari](https://github.com/JSzaszvari)
 - [@MartinSchoeler](https://github.com/MartinSchoeler)
 - [@engelgabriel](https://github.com/engelgabriel)
 - [@filipedelimabrito](https://github.com/filipedelimabrito)
@@ -2267,7 +2491,7 @@
 - Fix editing others messages ([#7200](https://github.com/RocketChat/Rocket.Chat/pull/7200))
 - Fix oembed previews not being shown ([#7208](https://github.com/RocketChat/Rocket.Chat/pull/7208))
 - "requirePasswordChange" property not being saved when set to false ([#7209](https://github.com/RocketChat/Rocket.Chat/pull/7209))
-- Removing the kadira package install from example build script. ([#7160](https://github.com/RocketChat/Rocket.Chat/pull/7160) by [@JSzaszvari](https://github.com/JSzaszvari))
+- Removing the kadira package install from example build script. ([#7160](https://github.com/RocketChat/Rocket.Chat/pull/7160))
 - Fix user's customFields not being saved correctly ([#7358](https://github.com/RocketChat/Rocket.Chat/pull/7358))
 - Improve avatar migration ([#7352](https://github.com/RocketChat/Rocket.Chat/pull/7352))
 - Fix jump to unread button ([#7320](https://github.com/RocketChat/Rocket.Chat/pull/7320))
@@ -2315,7 +2539,6 @@
 ### 👩‍💻👨‍💻 Contributors 😍
 
 - [@ExTechOp](https://github.com/ExTechOp)
-- [@JSzaszvari](https://github.com/JSzaszvari)
 - [@abrom](https://github.com/abrom)
 - [@bbrauns](https://github.com/bbrauns)
 - [@colin-campbell](https://github.com/colin-campbell)
@@ -2332,6 +2555,7 @@
 
 ### 👩‍💻👨‍💻 Core Team 🤓
 
+- [@JSzaszvari](https://github.com/JSzaszvari)
 - [@MartinSchoeler](https://github.com/MartinSchoeler)
 - [@alexbrazier](https://github.com/alexbrazier)
 - [@engelgabriel](https://github.com/engelgabriel)
@@ -2587,7 +2811,7 @@
 - Added Deploy method and platform to stats ([#6649](https://github.com/RocketChat/Rocket.Chat/pull/6649))
 - LingoHub based on develop ([#6647](https://github.com/RocketChat/Rocket.Chat/pull/6647))
 - meteor update ([#6631](https://github.com/RocketChat/Rocket.Chat/pull/6631))
-- Env override initial setting ([#6163](https://github.com/RocketChat/Rocket.Chat/pull/6163) by [@mrsimpson](https://github.com/mrsimpson))
+- Env override initial setting ([#6163](https://github.com/RocketChat/Rocket.Chat/pull/6163))
 
 </details>
 
@@ -2599,7 +2823,6 @@
 - [@billtt](https://github.com/billtt)
 - [@drallgood](https://github.com/drallgood)
 - [@fengt](https://github.com/fengt)
-- [@mrsimpson](https://github.com/mrsimpson)
 - [@nathanmarcos](https://github.com/nathanmarcos)
 - [@qge](https://github.com/qge)
 - [@sezinkarli](https://github.com/sezinkarli)
@@ -2617,5 +2840,6 @@
 - [@graywolf336](https://github.com/graywolf336)
 - [@karlprieb](https://github.com/karlprieb)
 - [@marceloschmidt](https://github.com/marceloschmidt)
+- [@mrsimpson](https://github.com/mrsimpson)
 - [@rodrigok](https://github.com/rodrigok)
 - [@sampaiodiego](https://github.com/sampaiodiego)
\ No newline at end of file
diff --git a/package.json b/package.json
index d1a92a39f1dc..1960b48c466d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.66.0-develop",
+	"version": "0.66.0-rc.0",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index d9571c35a9b1..a12ecd56a883 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.66.0-develop"
+	"version": "0.66.0-rc.0"
 }

From b86c9333f677fd6cd72773c65d24431227585392 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 21 Jun 2018 15:11:13 -0300
Subject: [PATCH 10/29] Bump version to 0.66.0-rc.1

---
 .docker/Dockerfile.rhel                 |  2 +-
 .github/history.json                    | 59 +++++++++++++++++++++++++
 .sandstorm/sandstorm-pkgdef.capnp       |  4 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 25 +++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 7 files changed, 90 insertions(+), 6 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index fb5af0a3f814..171a6372fbdd 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 0.66.0-rc.0
+ENV RC_VERSION 0.66.0-rc.1
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 6b2de8d0a6b5..f5b6bd80a94a 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -15874,5 +15874,64 @@
         "engelgabriel"
       ]
     }
+  ],
+  "0.66.0-rc.1": [
+    {
+      "pr": "11223",
+      "title": "Regression: Fix directory table loading",
+      "userLogin": "karlprieb",
+      "milestone": "0.66.0",
+      "contributors": [
+        "ggazzo",
+        "karlprieb"
+      ]
+    },
+    {
+      "pr": "11221",
+      "title": "[FIX] \"blank messages\" on iOS < 11",
+      "userLogin": "ggazzo",
+      "contributors": [
+        "ggazzo",
+        "web-flow",
+        "rodrigok"
+      ]
+    },
+    {
+      "pr": "11215",
+      "title": "Regression: Fix latest and release-candidate docker images building",
+      "userLogin": "sampaiodiego",
+      "milestone": "0.66.0",
+      "contributors": [
+        "sampaiodiego"
+      ]
+    },
+    {
+      "pr": "11199",
+      "title": "[FIX] \"blank\" screen on iOS < 11",
+      "userLogin": "ggazzo",
+      "milestone": "0.66.0",
+      "contributors": [
+        "ggazzo",
+        "web-flow",
+        "rodrigok"
+      ]
+    },
+    {
+      "pr": "11216",
+      "title": "Regression: check username or usersCount on browseChannels",
+      "userLogin": "ggazzo",
+      "milestone": "0.66.0",
+      "contributors": [
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "11211",
+      "title": "Regression: Sending message with a mention is not showing to sender",
+      "userLogin": "sampaiodiego",
+      "contributors": [
+        "sampaiodiego"
+      ]
+    }
   ]
 }
\ No newline at end of file
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 1ca058b5447b..93d6f81f4386 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appTitle = (defaultText = "Rocket.Chat"),
 
-		appVersion = 72,  # Increment this for every release.
+		appVersion = 73,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.66.0-rc.0"),
+		appMarketingVersion = (defaultText = "0.66.0-rc.1"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 412c7cc50096..0a5fa8c0ada5 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.66.0-rc.0
+    RC_VERSION=0.66.0-rc.1
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 7be3ff8f4f9d..fa2378e33e03 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,31 @@
 
 # 0.66.0 (Under Release Candidate Process)
 
+## 0.66.0-rc.1
+`2018-06-21  ·  2 🐛  ·  4 🔍  ·  4 👩‍💻👨‍💻`
+
+### 🐛 Bug fixes
+
+- "blank messages" on iOS < 11 ([#11221](https://github.com/RocketChat/Rocket.Chat/pull/11221))
+- "blank" screen on iOS < 11 ([#11199](https://github.com/RocketChat/Rocket.Chat/pull/11199))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- Regression: Fix directory table loading ([#11223](https://github.com/RocketChat/Rocket.Chat/pull/11223))
+- Regression: Fix latest and release-candidate docker images building ([#11215](https://github.com/RocketChat/Rocket.Chat/pull/11215))
+- Regression: check username or usersCount on browseChannels ([#11216](https://github.com/RocketChat/Rocket.Chat/pull/11216))
+- Regression: Sending message with a mention is not showing to sender ([#11211](https://github.com/RocketChat/Rocket.Chat/pull/11211))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+- [@karlprieb](https://github.com/karlprieb)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 ## 0.66.0-rc.0
 `2018-06-20  ·  1 ️️️⚠️  ·  23 🎉  ·  52 🐛  ·  36 🔍  ·  45 👩‍💻👨‍💻`
 
diff --git a/package.json b/package.json
index 1960b48c466d..b0a8a1a49286 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.66.0-rc.0",
+	"version": "0.66.0-rc.1",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index a12ecd56a883..3a95a1da8986 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.66.0-rc.0"
+	"version": "0.66.0-rc.1"
 }

From 7872d4c390479b75acd2ca1b3e542ca1912c7d56 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 25 Jun 2018 14:53:54 -0300
Subject: [PATCH 11/29] Bump version to 0.66.0-rc.2

---
 .docker/Dockerfile.rhel                 |    2 +-
 .github/history.json                    | 1236 ++++++++++++++++++++++-
 .sandstorm/sandstorm-pkgdef.capnp       |    4 +-
 .travis/snap.sh                         |    2 +-
 HISTORY.md                              |  229 +++++
 package.json                            |    2 +-
 packages/rocketchat-lib/rocketchat.info |    2 +-
 7 files changed, 1469 insertions(+), 8 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 171a6372fbdd..a40870767bc6 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 0.66.0-rc.1
+ENV RC_VERSION 0.66.0-rc.2
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index b1c3bd04b42a..0588c1a74e57 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -15363,9 +15363,1241 @@
       ]
     },
     "HEAD": {
+      "pull_requests": []
+    },
+    "0.66.0-rc.0": {
+      "node_version": "8.11.1",
+      "npm_version": "5.6.0",
+      "pull_requests": [
+        {
+          "pr": "11166",
+          "title": "[IMPROVE] Listing of apps in the admin page",
+          "userLogin": "gdelavald",
+          "milestone": "0.66.0",
+          "contributors": [
+            "karlprieb",
+            "web-flow",
+            "gdelavald",
+            "engelgabriel"
+          ]
+        },
+        {
+          "pr": "11206",
+          "title": "Regression: Directory css",
+          "userLogin": "ggazzo",
+          "milestone": "0.66.0",
+          "contributors": [
+            "karlprieb",
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "11208",
+          "title": "LingoHub based on develop",
+          "userLogin": "engelgabriel",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "10127",
+          "title": "[NEW] Youtube Broadcasting",
+          "userLogin": "gdelavald",
+          "milestone": "0.66.0",
+          "contributors": [
+            "gdelavald",
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "11187",
+          "title": "[FIX] Wordpress oauth configuration not loading properly",
+          "userLogin": "Hudell",
+          "milestone": "0.66.0",
+          "contributors": [
+            "Hudell",
+            "geekgonecrazy",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "10975",
+          "title": "[NEW] REST API endpoints `permissions.list` and `permissions.update`. Deprecated endpoint `permissions`",
+          "userLogin": "vynmera",
+          "milestone": "0.66.0",
+          "contributors": [
+            "vynmera",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "10941",
+          "title": "[NEW] REST API endpoint `channels.setDefault`",
+          "userLogin": "vynmera",
+          "milestone": "0.66.0",
+          "contributors": [
+            "vynmera",
+            "web-flow",
+            "engelgabriel"
+          ]
+        },
+        {
+          "pr": "10113",
+          "title": "IRC Federation: RFC2813 implementation (ngIRCd)",
+          "userLogin": "alansikora",
+          "milestone": "0.66.0",
+          "contributors": [
+            "cpitman",
+            "lindoelio",
+            "alansikora",
+            "Hudell",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "10999",
+          "title": "[FIX] REST API: Add more test cases for `/login`",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "0.66.0",
+          "contributors": [
+            "MarcosSpessatto"
+          ]
+        },
+        {
+          "pr": "11191",
+          "title": "[FIX] Wrong font-family order",
+          "userLogin": "Hudell",
+          "milestone": "0.66.0",
+          "contributors": [
+            "myfonj",
+            "web-flow",
+            "engelgabriel",
+            "Hudell"
+          ]
+        },
+        {
+          "pr": "11008",
+          "title": "Add verification to make sure the user exists in REST  insert object helper",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "0.66.0",
+          "contributors": [
+            "MarcosSpessatto"
+          ]
+        },
+        {
+          "pr": "10799",
+          "title": "[BREAK] Always remove the field `services` from user data responses in REST API",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "0.66.0",
+          "contributors": [
+            "MarcosSpessatto"
+          ]
+        },
+        {
+          "pr": "11204",
+          "title": "[FIX] REST endpoint `users.updateOwnBasicInfo` was not returning errors for invalid names and trying to save custom fields when empty",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "0.66.0",
+          "contributors": [
+            "MarcosSpessatto"
+          ]
+        },
+        {
+          "pr": "9751",
+          "title": "[NEW] Set Document Domain property in IFrame",
+          "userLogin": "kb0304",
+          "milestone": "0.66.0",
+          "contributors": [
+            "kb0304",
+            "engelgabriel",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "10767",
+          "title": "[FIX] Livechat visitor not being prompted for transcript when himself is closing the chat",
+          "userLogin": "renatobecker",
+          "milestone": "0.66.0",
+          "contributors": [
+            "renatobecker",
+            "sampaiodiego",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11188",
+          "title": "[FIX] HipChat Cloud import fails to import rooms",
+          "userLogin": "Hudell",
+          "milestone": "0.66.0",
+          "contributors": [
+            "Hudell"
+          ]
+        },
+        {
+          "pr": "11190",
+          "title": "[FIX] Failure to download user data",
+          "userLogin": "Hudell",
+          "milestone": "0.66.0",
+          "contributors": [
+            "Hudell"
+          ]
+        },
+        {
+          "pr": "10447",
+          "title": "[FIX] Add parameter to REST chat.react endpoint, to make it work like a setter",
+          "userLogin": "MarcosSpessatto",
+          "contributors": [
+            "MarcosSpessatto",
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "11025",
+          "title": "[NEW] Custom login wallpapers",
+          "userLogin": "vynmera",
+          "milestone": "0.66.0",
+          "contributors": [
+            "vynmera",
+            "web-flow",
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "11200",
+          "title": "Regression: Directory user table infinite scroll doesn't working",
+          "userLogin": "karlprieb",
+          "milestone": "0.66.0",
+          "contributors": [
+            "karlprieb"
+          ]
+        },
+        {
+          "pr": "10205",
+          "title": "[NEW] Support for dynamic slack and rocket.chat channels",
+          "userLogin": "Hudell",
+          "milestone": "0.66.0",
+          "contributors": [
+            "kable-wilmoth",
+            "Hudell",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11150",
+          "title": "[FIX] Default selected language",
+          "userLogin": "tassoevan",
+          "milestone": "0.66.0",
+          "contributors": [
+            "tassoevan",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11026",
+          "title": "[IMPROVE] UI design for Tables and tabs component on Directory",
+          "userLogin": "karlprieb",
+          "milestone": "0.66.0",
+          "contributors": [
+            "karlprieb",
+            "web-flow",
+            "engelgabriel",
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "11165",
+          "title": "[FIX] Rendering of emails and mentions in messages",
+          "userLogin": "tassoevan",
+          "milestone": "0.66.0",
+          "contributors": [
+            "tassoevan",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11177",
+          "title": "[FIX] Livechat icon with status",
+          "userLogin": "tassoevan",
+          "milestone": "0.66.0",
+          "contributors": [
+            "tassoevan",
+            "ggazzo",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11183",
+          "title": "[FIX] remove sidebar on embedded view",
+          "userLogin": "ggazzo",
+          "milestone": "0.66.0",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "11173",
+          "title": "[FIX]Missing language constants",
+          "userLogin": "rw4lll",
+          "contributors": [
+            "rw4lll",
+            "engelgabriel",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11181",
+          "title": "[FIX Readme] Nodejs + Python version spicifications",
+          "userLogin": "mahdiyari",
+          "contributors": [
+            "mahdiyari",
+            "web-flow",
+            "engelgabriel"
+          ]
+        },
+        {
+          "pr": "11178",
+          "title": "[FIX] Room creation error due absence of subscriptions",
+          "userLogin": "tassoevan",
+          "milestone": "0.66.0",
+          "contributors": [
+            "tassoevan",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11132",
+          "title": "[FIX] Remove failed upload messages when switching rooms",
+          "userLogin": "tassoevan",
+          "milestone": "0.66.0",
+          "contributors": [
+            "tassoevan",
+            "web-flow",
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "11152",
+          "title": "[FIX] Wordpress OAuth not providing enough info to log in ",
+          "userLogin": "Hudell",
+          "contributors": [
+            "Hudell",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "11010",
+          "title": "[FIX] /groups.invite not allow a user to invite even with permission",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "0.66.0",
+          "contributors": [
+            "MarcosSpessatto",
+            "Hudell",
+            "web-flow",
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "11115",
+          "title": "[NEW] Add prometheus port config",
+          "userLogin": "thaiphv",
+          "contributors": [
+            "brylie",
+            "web-flow",
+            "stuartpb",
+            "engelgabriel",
+            "thaiphv"
+          ]
+        },
+        {
+          "pr": "10095",
+          "title": "[FIX] Various lang fixes [RU]",
+          "userLogin": "rw4lll",
+          "milestone": "0.66.0",
+          "contributors": [
+            "rw4lll",
+            "web-flow",
+            "engelgabriel",
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "11109",
+          "title": "[FIX] set-toolbar-items postMessage",
+          "userLogin": "ggazzo",
+          "milestone": "0.66.0",
+          "contributors": [
+            "ggazzo",
+            "web-flow",
+            "tassoevan"
+          ]
+        },
+        {
+          "pr": "11021",
+          "title": "[FIX] title and value attachments are optionals on sendMessage method",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "0.66.0",
+          "contributors": [
+            "MarcosSpessatto"
+          ]
+        },
+        {
+          "pr": "10301",
+          "title": "[NEW] Button to remove closed LiveChat rooms",
+          "userLogin": "renatobecker",
+          "milestone": "0.66.0",
+          "contributors": [
+            "renatobecker"
+          ]
+        },
+        {
+          "pr": "11136",
+          "title": "[FIX] Some typos in the error message names",
+          "userLogin": "vynmera",
+          "contributors": [
+            "vynmera"
+          ]
+        },
+        {
+          "pr": "11050",
+          "title": "[FIX] open conversation from room info",
+          "userLogin": "ggazzo",
+          "milestone": "0.66.0",
+          "contributors": [
+            "ggazzo",
+            "web-flow",
+            "engelgabriel"
+          ]
+        },
+        {
+          "pr": "11129",
+          "title": "[FIX] Users model was not receiving options",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "11113",
+          "title": "[FIX] Popover position",
+          "userLogin": "tassoevan",
+          "milestone": "0.66.0",
+          "contributors": [
+            "tassoevan",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11096",
+          "title": "[FIX] Generated random password visible to the user",
+          "userLogin": "tassoevan",
+          "milestone": "0.66.0",
+          "contributors": [
+            "tassoevan",
+            "engelgabriel",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11111",
+          "title": "[FIX] LiveChat appearance changes not being saved",
+          "userLogin": "renatobecker",
+          "milestone": "0.66.0",
+          "contributors": [
+            "renatobecker",
+            "ggazzo",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11095",
+          "title": "[FIX] Confirm password on set new password user profile",
+          "userLogin": "tassoevan",
+          "milestone": "0.66.0",
+          "contributors": [
+            "tassoevan",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11090",
+          "title": "Regression: sorting direct message by asc on favorites group",
+          "userLogin": "ggazzo",
+          "milestone": "0.66.0",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "10431",
+          "title": "[FIX] Message_AllowedMaxSize fails for emoji sequences",
+          "userLogin": "c0dzilla",
+          "milestone": "0.66.0",
+          "contributors": [
+            "c0dzilla",
+            "web-flow",
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "11001",
+          "title": "[IMPROVE] User mentions",
+          "userLogin": "vynmera",
+          "milestone": "0.66.0",
+          "contributors": [
+            "vynmera",
+            "web-flow",
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "11107",
+          "title": "Fix PR Docker image creation by splitting in two build jobs",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "8402",
+          "title": "[NEW] Update katex to v0.9.0",
+          "userLogin": "pitamar",
+          "milestone": "0.66.0",
+          "contributors": [
+            "pitamar"
+          ]
+        },
+        {
+          "pr": "11027",
+          "title": "[NEW] WebDAV(Nextcloud/ownCloud) Storage Server Option",
+          "userLogin": "karakayasemi",
+          "milestone": "0.66.0",
+          "contributors": [
+            "karakayasemi",
+            "web-flow",
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "11103",
+          "title": "Update v126.js",
+          "userLogin": "ggazzo",
+          "contributors": [
+            "ggazzo",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "10973",
+          "title": "[NEW] Don't ask me again checkbox on hide room modal",
+          "userLogin": "karlprieb",
+          "milestone": "0.66.0",
+          "contributors": [
+            "karlprieb",
+            "engelgabriel",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11097",
+          "title": "Speed up the build time by removing JSON Minify from i18n package",
+          "userLogin": "rodrigok",
+          "milestone": "0.66.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "10958",
+          "title": "[NEW] Add input to set time for avatar cache control",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "0.66.0",
+          "contributors": [
+            "MarcosSpessatto"
+          ]
+        },
+        {
+          "pr": "10727",
+          "title": "[NEW] Command /hide to hide channels",
+          "userLogin": "mikaelmello",
+          "milestone": "0.66.0",
+          "contributors": [
+            "mikaelmello",
+            "ggazzo",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11089",
+          "title": "[FIX] Can't access the `/account/profile`",
+          "userLogin": "tassoevan",
+          "milestone": "0.66.0",
+          "contributors": [
+            "tassoevan",
+            "ggazzo",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11087",
+          "title": "[NEW] Do not wait method calls response on websocket before next method call",
+          "userLogin": "rodrigok",
+          "milestone": "0.66.0",
+          "contributors": [
+            "rodrigok",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11086",
+          "title": "[NEW] Disconnect users from websocket when away from the login screen for 10min",
+          "userLogin": "rodrigok",
+          "milestone": "0.66.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "11083",
+          "title": "[NEW] Reduce the amount of DDP API calls on login screen",
+          "userLogin": "rodrigok",
+          "milestone": "0.66.0",
+          "contributors": [
+            "rodrigok",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11093",
+          "title": "Fix Docker image for develop commits",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "11085",
+          "title": "[NEW] Option to trace Methods and Subscription calls",
+          "userLogin": "rodrigok",
+          "milestone": "0.66.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "11084",
+          "title": "[FIX] Idle time limit wasn’t working as expected",
+          "userLogin": "rodrigok",
+          "milestone": "0.66.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "11076",
+          "title": "Build Docker image on CI",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "9959",
+          "title": "[FIX] Rooms list sorting by activity multiple re-renders and case sensitive sorting alphabetically",
+          "userLogin": "ggazzo",
+          "milestone": "0.66.0",
+          "contributors": [
+            "ggazzo",
+            "sampaiodiego",
+            "web-flow",
+            "karlprieb",
+            "JoseRenan"
+          ]
+        },
+        {
+          "pr": "11024",
+          "title": "[FIX] Notification not working for group mentions and not respecting ignored users",
+          "userLogin": "sampaiodiego",
+          "milestone": "0.66.0",
+          "contributors": [
+            "sampaiodiego",
+            "web-flow",
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "10294",
+          "title": "[FIX] Overlapping of search text and cancel search icon (X)",
+          "userLogin": "taeven",
+          "milestone": "0.66.0",
+          "contributors": [
+            "taeven",
+            "rodrigok",
+            "web-flow",
+            "engelgabriel"
+          ]
+        },
+        {
+          "pr": "11063",
+          "title": "[FIX] Link previews not being removed from messages after removed on editing",
+          "userLogin": "ggazzo",
+          "milestone": "0.66.0",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "11074",
+          "title": "[FIX] avoid send presence without login",
+          "userLogin": "ggazzo",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "11072",
+          "title": "[FIX] Exception in metrics generation",
+          "userLogin": "rodrigok",
+          "milestone": "0.66.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "11070",
+          "title": "Update issue templates",
+          "userLogin": "engelgabriel",
+          "contributors": [
+            "engelgabriel"
+          ]
+        },
+        {
+          "pr": "11062",
+          "title": "LingoHub based on develop",
+          "userLogin": "engelgabriel",
+          "contributors": [
+            "engelgabriel",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11056",
+          "title": "[FIX] Build for Sandstorm missing dependence for capnp",
+          "userLogin": "peterlee0127",
+          "contributors": [
+            "peterlee0127"
+          ]
+        },
+        {
+          "pr": "11049",
+          "title": "[FIX] flex-tab icons missing",
+          "userLogin": "ggazzo",
+          "milestone": "0.66.0",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "11054",
+          "title": "LingoHub based on develop",
+          "userLogin": "engelgabriel",
+          "contributors": [
+            "engelgabriel"
+          ]
+        },
+        {
+          "pr": "11053",
+          "title": "LingoHub based on develop",
+          "userLogin": "engelgabriel",
+          "contributors": [
+            "engelgabriel"
+          ]
+        },
+        {
+          "pr": "11051",
+          "title": "LingoHub based on develop",
+          "userLogin": "engelgabriel",
+          "contributors": [
+            "engelgabriel"
+          ]
+        },
+        {
+          "pr": "11045",
+          "title": "LingoHub based on develop",
+          "userLogin": "engelgabriel",
+          "contributors": [
+            "engelgabriel"
+          ]
+        },
+        {
+          "pr": "11044",
+          "title": "LingoHub based on develop",
+          "userLogin": "engelgabriel",
+          "contributors": [
+            "engelgabriel"
+          ]
+        },
+        {
+          "pr": "11043",
+          "title": "LingoHub based on develop",
+          "userLogin": "engelgabriel",
+          "contributors": [
+            "engelgabriel"
+          ]
+        },
+        {
+          "pr": "11042",
+          "title": "LingoHub based on develop",
+          "userLogin": "engelgabriel",
+          "contributors": [
+            "engelgabriel"
+          ]
+        },
+        {
+          "pr": "9969",
+          "title": "Changed 'confirm password' placeholder text on user registration form",
+          "userLogin": "kumarnitj",
+          "milestone": "0.66.0",
+          "contributors": [
+            null,
+            "kumarnitj",
+            "web-flow",
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "11020",
+          "title": "[FIX] Update ja.i18n.json",
+          "userLogin": "noobbbbb",
+          "contributors": [
+            "noobbbbb",
+            "web-flow",
+            "Hudell"
+          ]
+        },
+        {
+          "pr": "11039",
+          "title": "LingoHub based on develop",
+          "userLogin": "engelgabriel",
+          "contributors": [
+            null,
+            "engelgabriel",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11035",
+          "title": "LingoHub based on develop",
+          "userLogin": "engelgabriel",
+          "contributors": [
+            "engelgabriel"
+          ]
+        },
+        {
+          "pr": "10954",
+          "title": "[NEW] Replace variable 'mergeChannels' with 'groupByType'.",
+          "userLogin": "mikaelmello",
+          "milestone": "0.66.0",
+          "contributors": [
+            "mikaelmello",
+            "rodrigok",
+            "web-flow",
+            "ggazzo",
+            "engelgabriel"
+          ]
+        },
+        {
+          "pr": "11012",
+          "title": "[FIX] Strange msg when setting room announcement, topic or description to be empty",
+          "userLogin": "vynmera",
+          "milestone": "0.66.0",
+          "contributors": [
+            "vynmera",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11009",
+          "title": "[FIX] Exception thrown on avatar validation",
+          "userLogin": "Hudell",
+          "contributors": [
+            "Hudell"
+          ]
+        },
+        {
+          "pr": "10091",
+          "title": "[NEW] Send LiveChat visitor navigation history as messages",
+          "userLogin": "renatobecker",
+          "milestone": "0.66.0",
+          "contributors": [
+            "renatobecker",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "10673",
+          "title": "[NEW] Make supplying an AWS access key and secret optional for S3 uploads",
+          "userLogin": "saplla",
+          "milestone": "0.66.0",
+          "contributors": [
+            "saplla",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "10207",
+          "title": "Update Documentation: README.md",
+          "userLogin": "rakhi2104",
+          "contributors": [
+            "rakhi2104",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "10998",
+          "title": "[FIX] Preview of large images not resizing to fit the area and having scrollbars",
+          "userLogin": "vynmera",
+          "milestone": "0.66.0",
+          "contributors": [
+            "vynmera",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "10956",
+          "title": "[FIX] Allow inviting livechat managers to the same LiveChat room",
+          "userLogin": "renatobecker",
+          "milestone": "0.66.0",
+          "contributors": [
+            "renatobecker",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "10913",
+          "title": "NPM Dependencies Update",
+          "userLogin": "engelgabriel",
+          "milestone": "0.66.0",
+          "contributors": [
+            "engelgabriel",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "10805",
+          "title": "[FIX] Cannot read property 'debug' of undefined when trying to use REST API",
+          "userLogin": "haffla",
+          "milestone": "0.66.0",
+          "contributors": [
+            "haffla",
+            "engelgabriel",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "10131",
+          "title": "update meteor to 1.6.1 for sandstorm build",
+          "userLogin": "peterlee0127",
+          "contributors": [
+            "peterlee0127",
+            "web-flow",
+            "engelgabriel"
+          ]
+        },
+        {
+          "pr": "10986",
+          "title": "Renaming username.username to username.value for clarity",
+          "userLogin": "engelgabriel",
+          "milestone": "0.66.0",
+          "contributors": [
+            "engelgabriel",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "10988",
+          "title": "[NEW] Direct Reply: separate Reply-To email from account username field",
+          "userLogin": "engelgabriel",
+          "milestone": "0.66.0",
+          "contributors": [
+            "pkgodara",
+            "web-flow",
+            "engelgabriel"
+          ]
+        },
+        {
+          "pr": "5",
+          "title": "Fix readme typo",
+          "userLogin": "filipealva",
+          "contributors": [
+            "filipealva"
+          ]
+        },
+        {
+          "pr": "10055",
+          "title": "[NEW] Changes all 'mergeChannels' to 'groupByType'.",
+          "userLogin": "mikaelmello",
+          "milestone": "0.66.0",
+          "contributors": [
+            "mikaelmello",
+            "rodrigok",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "10771",
+          "title": "[FIX] Icons svg xml structure",
+          "userLogin": "timkinnane",
+          "contributors": [
+            "timkinnane"
+          ]
+        },
+        {
+          "pr": "10851",
+          "title": "[FIX] Leave room wasn't working as expected",
+          "userLogin": "ggazzo",
+          "milestone": "0.65.1",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "10807",
+          "title": "Remove wrong and not needed time unit",
+          "userLogin": "cliffparnitzky",
+          "contributors": [
+            "cliffparnitzky"
+          ]
+        },
+        {
+          "pr": "10934",
+          "title": "[FIX] Application crashing on startup when trying to log errors to `exceptions` channel",
+          "userLogin": "sampaiodiego",
+          "milestone": "0.65.1",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "10904",
+          "title": "[FIX] Image lazy load was breaking attachments",
+          "userLogin": "ggazzo",
+          "milestone": "0.65.1",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "10928",
+          "title": "[FIX] Incomplete email notification link",
+          "userLogin": "sampaiodiego",
+          "milestone": "0.65.1",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "10916",
+          "title": "[FIX] Remove outdated 2FA warning for mobile clients",
+          "userLogin": "cardoso",
+          "contributors": [
+            "cardoso"
+          ]
+        },
+        {
+          "pr": "10841",
+          "title": "[NEW] Update WeDeploy deployment",
+          "userLogin": "jonnilundy",
+          "contributors": [
+            "jonnilundy",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "10867",
+          "title": "[FIX] Update Sandstorm build config",
+          "userLogin": "ocdtrekkie",
+          "contributors": [
+            "ocdtrekkie",
+            "engelgabriel",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "10909",
+          "title": "Develop sync commits",
+          "userLogin": "rodrigok",
+          "contributors": [
+            "geekgonecrazy",
+            "web-flow",
+            "graywolf336",
+            "nsuchy",
+            "rodrigok",
+            "rafaelks",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "10908",
+          "title": "Develop sync2",
+          "userLogin": "rodrigok",
+          "contributors": [
+            "geekgonecrazy",
+            "web-flow",
+            "graywolf336",
+            "nsuchy",
+            "rodrigok",
+            "rafaelks",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "10903",
+          "title": "Merge master into develop & Set version to 0.66.0-develop",
+          "userLogin": "rodrigok",
+          "contributors": [
+            "geekgonecrazy",
+            "web-flow",
+            "graywolf336",
+            "nsuchy",
+            "rodrigok",
+            "rafaelks",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "9534",
+          "title": "[FIX] i18n - add semantic markup",
+          "userLogin": "brylie",
+          "contributors": [
+            "brylie",
+            "web-flow",
+            "engelgabriel"
+          ]
+        }
+      ]
+    },
+    "0.66.0-rc.1": {
       "node_version": "8.11.1",
       "npm_version": "5.6.0",
-      "pull_requests": []
+      "pull_requests": [
+        {
+          "pr": "11223",
+          "title": "Regression: Fix directory table loading",
+          "userLogin": "karlprieb",
+          "milestone": "0.66.0",
+          "contributors": [
+            "ggazzo",
+            "karlprieb"
+          ]
+        },
+        {
+          "pr": "11221",
+          "title": "[FIX] \"blank messages\" on iOS < 11",
+          "userLogin": "ggazzo",
+          "contributors": [
+            "ggazzo",
+            "web-flow",
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "11215",
+          "title": "Regression: Fix latest and release-candidate docker images building",
+          "userLogin": "sampaiodiego",
+          "milestone": "0.66.0",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "11199",
+          "title": "[FIX] \"blank\" screen on iOS < 11",
+          "userLogin": "ggazzo",
+          "milestone": "0.66.0",
+          "contributors": [
+            "ggazzo",
+            "web-flow",
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "11216",
+          "title": "Regression: check username or usersCount on browseChannels",
+          "userLogin": "ggazzo",
+          "milestone": "0.66.0",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "11211",
+          "title": "Regression: Sending message with a mention is not showing to sender",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        }
+      ]
+    },
+    "0.66.0-rc.2": {
+      "node_version": "8.11.3",
+      "npm_version": "5.6.0",
+      "pull_requests": [
+        {
+          "pr": "11249",
+          "title": "Regression: Prometheus was not being enabled in some cases",
+          "userLogin": "rodrigok",
+          "milestone": "0.66.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "11232",
+          "title": "Regression: Skip operations if no actions on livechat migration",
+          "userLogin": "sampaiodiego",
+          "milestone": "0.66.0",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "11224",
+          "title": "Regression: Directory sort users, fix null results, text for empty results",
+          "userLogin": "ggazzo",
+          "milestone": "0.66.0",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "11246",
+          "title": "LingoHub based on develop",
+          "userLogin": "engelgabriel",
+          "milestone": "0.66.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "11247",
+          "title": "Update Meteor to 1.6.1.3",
+          "userLogin": "rodrigok",
+          "milestone": "0.66.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "11237",
+          "title": "New history source format & add Node and NPM versions",
+          "userLogin": "rodrigok",
+          "milestone": "0.66.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        }
+      ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 93d6f81f4386..6b2e3cccd065 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appTitle = (defaultText = "Rocket.Chat"),
 
-		appVersion = 73,  # Increment this for every release.
+		appVersion = 74,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.66.0-rc.1"),
+		appMarketingVersion = (defaultText = "0.66.0-rc.2"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 0a5fa8c0ada5..179245374d85 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.66.0-rc.1
+    RC_VERSION=0.66.0-rc.2
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 324bde0e944a..3e429683a743 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,233 @@
 
+# 0.66.0 (Under Release Candidate Process)
+
+## 0.66.0-rc.2
+`2018-06-25  ·  6 🔍  ·  3 👩‍💻👨‍💻`
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- Regression: Prometheus was not being enabled in some cases ([#11249](https://github.com/RocketChat/Rocket.Chat/pull/11249))
+- Regression: Skip operations if no actions on livechat migration ([#11232](https://github.com/RocketChat/Rocket.Chat/pull/11232))
+- Regression: Directory sort users, fix null results, text for empty results ([#11224](https://github.com/RocketChat/Rocket.Chat/pull/11224))
+- LingoHub based on develop ([#11246](https://github.com/RocketChat/Rocket.Chat/pull/11246))
+- Update Meteor to 1.6.1.3 ([#11247](https://github.com/RocketChat/Rocket.Chat/pull/11247))
+- New history source format & add Node and NPM versions ([#11237](https://github.com/RocketChat/Rocket.Chat/pull/11237))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
+## 0.66.0-rc.1
+`2018-06-21  ·  2 🐛  ·  4 🔍  ·  4 👩‍💻👨‍💻`
+
+### 🐛 Bug fixes
+
+- "blank messages" on iOS < 11 ([#11221](https://github.com/RocketChat/Rocket.Chat/pull/11221))
+- "blank" screen on iOS < 11 ([#11199](https://github.com/RocketChat/Rocket.Chat/pull/11199))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- Regression: Fix directory table loading ([#11223](https://github.com/RocketChat/Rocket.Chat/pull/11223))
+- Regression: Fix latest and release-candidate docker images building ([#11215](https://github.com/RocketChat/Rocket.Chat/pull/11215))
+- Regression: check username or usersCount on browseChannels ([#11216](https://github.com/RocketChat/Rocket.Chat/pull/11216))
+- Regression: Sending message with a mention is not showing to sender ([#11211](https://github.com/RocketChat/Rocket.Chat/pull/11211))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+- [@karlprieb](https://github.com/karlprieb)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
+## 0.66.0-rc.0
+`2018-06-20  ·  1 ️️️⚠️  ·  23 🎉  ·  52 🐛  ·  36 🔍  ·  45 👩‍💻👨‍💻`
+
+### ⚠️ BREAKING CHANGES
+
+- Always remove the field `services` from user data responses in REST API ([#10799](https://github.com/RocketChat/Rocket.Chat/pull/10799))
+
+### 🎉 New features
+
+- Youtube Broadcasting ([#10127](https://github.com/RocketChat/Rocket.Chat/pull/10127))
+- REST API endpoints `permissions.list` and `permissions.update`. Deprecated endpoint `permissions` ([#10975](https://github.com/RocketChat/Rocket.Chat/pull/10975) by [@vynmera](https://github.com/vynmera))
+- REST API endpoint `channels.setDefault` ([#10941](https://github.com/RocketChat/Rocket.Chat/pull/10941) by [@vynmera](https://github.com/vynmera))
+- Set Document Domain property in IFrame ([#9751](https://github.com/RocketChat/Rocket.Chat/pull/9751) by [@kb0304](https://github.com/kb0304))
+- Custom login wallpapers ([#11025](https://github.com/RocketChat/Rocket.Chat/pull/11025) by [@vynmera](https://github.com/vynmera))
+- Support for dynamic slack and rocket.chat channels ([#10205](https://github.com/RocketChat/Rocket.Chat/pull/10205) by [@kable-wilmoth](https://github.com/kable-wilmoth))
+- Add prometheus port config ([#11115](https://github.com/RocketChat/Rocket.Chat/pull/11115) by [@brylie](https://github.com/brylie) & [@stuartpb](https://github.com/stuartpb) & [@thaiphv](https://github.com/thaiphv))
+- Button to remove closed LiveChat rooms ([#10301](https://github.com/RocketChat/Rocket.Chat/pull/10301))
+- Update katex to v0.9.0 ([#8402](https://github.com/RocketChat/Rocket.Chat/pull/8402) by [@pitamar](https://github.com/pitamar))
+- WebDAV(Nextcloud/ownCloud) Storage Server Option ([#11027](https://github.com/RocketChat/Rocket.Chat/pull/11027) by [@karakayasemi](https://github.com/karakayasemi))
+- Don't ask me again checkbox on hide room modal ([#10973](https://github.com/RocketChat/Rocket.Chat/pull/10973))
+- Add input to set time for avatar cache control ([#10958](https://github.com/RocketChat/Rocket.Chat/pull/10958))
+- Command /hide to hide channels ([#10727](https://github.com/RocketChat/Rocket.Chat/pull/10727) by [@mikaelmello](https://github.com/mikaelmello))
+- Do not wait method calls response on websocket before next method call ([#11087](https://github.com/RocketChat/Rocket.Chat/pull/11087))
+- Disconnect users from websocket when away from the login screen for 10min ([#11086](https://github.com/RocketChat/Rocket.Chat/pull/11086))
+- Reduce the amount of DDP API calls on login screen ([#11083](https://github.com/RocketChat/Rocket.Chat/pull/11083))
+- Option to trace Methods and Subscription calls ([#11085](https://github.com/RocketChat/Rocket.Chat/pull/11085))
+- Replace variable 'mergeChannels' with 'groupByType'. ([#10954](https://github.com/RocketChat/Rocket.Chat/pull/10954) by [@mikaelmello](https://github.com/mikaelmello))
+- Send LiveChat visitor navigation history as messages ([#10091](https://github.com/RocketChat/Rocket.Chat/pull/10091))
+- Make supplying an AWS access key and secret optional for S3 uploads ([#10673](https://github.com/RocketChat/Rocket.Chat/pull/10673) by [@saplla](https://github.com/saplla))
+- Direct Reply: separate Reply-To email from account username field ([#10988](https://github.com/RocketChat/Rocket.Chat/pull/10988) by [@pkgodara](https://github.com/pkgodara))
+- Changes all 'mergeChannels' to 'groupByType'. ([#10055](https://github.com/RocketChat/Rocket.Chat/pull/10055) by [@mikaelmello](https://github.com/mikaelmello))
+- Update WeDeploy deployment ([#10841](https://github.com/RocketChat/Rocket.Chat/pull/10841) by [@jonnilundy](https://github.com/jonnilundy))
+
+### 🐛 Bug fixes
+
+- Wordpress oauth configuration not loading properly ([#11187](https://github.com/RocketChat/Rocket.Chat/pull/11187))
+- REST API: Add more test cases for `/login` ([#10999](https://github.com/RocketChat/Rocket.Chat/pull/10999))
+- Wrong font-family order ([#11191](https://github.com/RocketChat/Rocket.Chat/pull/11191) by [@myfonj](https://github.com/myfonj))
+- REST endpoint `users.updateOwnBasicInfo` was not returning errors for invalid names and trying to save custom fields when empty ([#11204](https://github.com/RocketChat/Rocket.Chat/pull/11204))
+- Livechat visitor not being prompted for transcript when himself is closing the chat ([#10767](https://github.com/RocketChat/Rocket.Chat/pull/10767))
+- HipChat Cloud import fails to import rooms ([#11188](https://github.com/RocketChat/Rocket.Chat/pull/11188))
+- Failure to download user data ([#11190](https://github.com/RocketChat/Rocket.Chat/pull/11190))
+- Add parameter to REST chat.react endpoint, to make it work like a setter ([#10447](https://github.com/RocketChat/Rocket.Chat/pull/10447))
+- Default selected language ([#11150](https://github.com/RocketChat/Rocket.Chat/pull/11150))
+- Rendering of emails and mentions in messages ([#11165](https://github.com/RocketChat/Rocket.Chat/pull/11165))
+- Livechat icon with status ([#11177](https://github.com/RocketChat/Rocket.Chat/pull/11177))
+- remove sidebar on embedded view ([#11183](https://github.com/RocketChat/Rocket.Chat/pull/11183))
+- Missing language constants ([#11173](https://github.com/RocketChat/Rocket.Chat/pull/11173) by [@rw4lll](https://github.com/rw4lll))
+- Room creation error due absence of subscriptions ([#11178](https://github.com/RocketChat/Rocket.Chat/pull/11178))
+- Remove failed upload messages when switching rooms ([#11132](https://github.com/RocketChat/Rocket.Chat/pull/11132))
+- Wordpress OAuth not providing enough info to log in  ([#11152](https://github.com/RocketChat/Rocket.Chat/pull/11152))
+- /groups.invite not allow a user to invite even with permission ([#11010](https://github.com/RocketChat/Rocket.Chat/pull/11010))
+- Various lang fixes [RU] ([#10095](https://github.com/RocketChat/Rocket.Chat/pull/10095) by [@rw4lll](https://github.com/rw4lll))
+- set-toolbar-items postMessage ([#11109](https://github.com/RocketChat/Rocket.Chat/pull/11109))
+- title and value attachments are optionals on sendMessage method ([#11021](https://github.com/RocketChat/Rocket.Chat/pull/11021))
+- Some typos in the error message names ([#11136](https://github.com/RocketChat/Rocket.Chat/pull/11136) by [@vynmera](https://github.com/vynmera))
+- open conversation from room info ([#11050](https://github.com/RocketChat/Rocket.Chat/pull/11050))
+- Users model was not receiving options ([#11129](https://github.com/RocketChat/Rocket.Chat/pull/11129))
+- Popover position ([#11113](https://github.com/RocketChat/Rocket.Chat/pull/11113))
+- Generated random password visible to the user ([#11096](https://github.com/RocketChat/Rocket.Chat/pull/11096))
+- LiveChat appearance changes not being saved ([#11111](https://github.com/RocketChat/Rocket.Chat/pull/11111))
+- Confirm password on set new password user profile ([#11095](https://github.com/RocketChat/Rocket.Chat/pull/11095))
+- Message_AllowedMaxSize fails for emoji sequences ([#10431](https://github.com/RocketChat/Rocket.Chat/pull/10431) by [@c0dzilla](https://github.com/c0dzilla))
+- Can't access the `/account/profile` ([#11089](https://github.com/RocketChat/Rocket.Chat/pull/11089))
+- Idle time limit wasn’t working as expected ([#11084](https://github.com/RocketChat/Rocket.Chat/pull/11084))
+- Rooms list sorting by activity multiple re-renders and case sensitive sorting alphabetically ([#9959](https://github.com/RocketChat/Rocket.Chat/pull/9959) by [@JoseRenan](https://github.com/JoseRenan))
+- Notification not working for group mentions and not respecting ignored users ([#11024](https://github.com/RocketChat/Rocket.Chat/pull/11024))
+- Overlapping of search text and cancel search icon (X) ([#10294](https://github.com/RocketChat/Rocket.Chat/pull/10294) by [@taeven](https://github.com/taeven))
+- Link previews not being removed from messages after removed on editing ([#11063](https://github.com/RocketChat/Rocket.Chat/pull/11063))
+- avoid send presence without login ([#11074](https://github.com/RocketChat/Rocket.Chat/pull/11074))
+- Exception in metrics generation ([#11072](https://github.com/RocketChat/Rocket.Chat/pull/11072))
+- Build for Sandstorm missing dependence for capnp ([#11056](https://github.com/RocketChat/Rocket.Chat/pull/11056) by [@peterlee0127](https://github.com/peterlee0127))
+- flex-tab icons missing ([#11049](https://github.com/RocketChat/Rocket.Chat/pull/11049))
+- Update ja.i18n.json ([#11020](https://github.com/RocketChat/Rocket.Chat/pull/11020) by [@noobbbbb](https://github.com/noobbbbb))
+- Strange msg when setting room announcement, topic or description to be empty ([#11012](https://github.com/RocketChat/Rocket.Chat/pull/11012) by [@vynmera](https://github.com/vynmera))
+- Exception thrown on avatar validation ([#11009](https://github.com/RocketChat/Rocket.Chat/pull/11009))
+- Preview of large images not resizing to fit the area and having scrollbars ([#10998](https://github.com/RocketChat/Rocket.Chat/pull/10998) by [@vynmera](https://github.com/vynmera))
+- Allow inviting livechat managers to the same LiveChat room ([#10956](https://github.com/RocketChat/Rocket.Chat/pull/10956))
+- Cannot read property 'debug' of undefined when trying to use REST API ([#10805](https://github.com/RocketChat/Rocket.Chat/pull/10805) by [@haffla](https://github.com/haffla))
+- Icons svg xml structure ([#10771](https://github.com/RocketChat/Rocket.Chat/pull/10771))
+- Leave room wasn't working as expected ([#10851](https://github.com/RocketChat/Rocket.Chat/pull/10851))
+- Application crashing on startup when trying to log errors to `exceptions` channel ([#10934](https://github.com/RocketChat/Rocket.Chat/pull/10934))
+- Image lazy load was breaking attachments ([#10904](https://github.com/RocketChat/Rocket.Chat/pull/10904))
+- Incomplete email notification link ([#10928](https://github.com/RocketChat/Rocket.Chat/pull/10928))
+- Remove outdated 2FA warning for mobile clients ([#10916](https://github.com/RocketChat/Rocket.Chat/pull/10916))
+- Update Sandstorm build config ([#10867](https://github.com/RocketChat/Rocket.Chat/pull/10867) by [@ocdtrekkie](https://github.com/ocdtrekkie))
+- i18n - add semantic markup ([#9534](https://github.com/RocketChat/Rocket.Chat/pull/9534) by [@brylie](https://github.com/brylie))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- [IMPROVE] Listing of apps in the admin page ([#11166](https://github.com/RocketChat/Rocket.Chat/pull/11166))
+- Regression: Directory css ([#11206](https://github.com/RocketChat/Rocket.Chat/pull/11206))
+- LingoHub based on develop ([#11208](https://github.com/RocketChat/Rocket.Chat/pull/11208))
+- IRC Federation: RFC2813 implementation (ngIRCd) ([#10113](https://github.com/RocketChat/Rocket.Chat/pull/10113) by [@cpitman](https://github.com/cpitman) & [@lindoelio](https://github.com/lindoelio))
+- Add verification to make sure the user exists in REST  insert object helper ([#11008](https://github.com/RocketChat/Rocket.Chat/pull/11008))
+- Regression: Directory user table infinite scroll doesn't working ([#11200](https://github.com/RocketChat/Rocket.Chat/pull/11200))
+- [IMPROVE] UI design for Tables and tabs component on Directory ([#11026](https://github.com/RocketChat/Rocket.Chat/pull/11026))
+- [FIX Readme] Nodejs + Python version spicifications ([#11181](https://github.com/RocketChat/Rocket.Chat/pull/11181) by [@mahdiyari](https://github.com/mahdiyari))
+- Regression: sorting direct message by asc on favorites group ([#11090](https://github.com/RocketChat/Rocket.Chat/pull/11090))
+- [IMPROVE] User mentions ([#11001](https://github.com/RocketChat/Rocket.Chat/pull/11001) by [@vynmera](https://github.com/vynmera))
+- Fix PR Docker image creation by splitting in two build jobs ([#11107](https://github.com/RocketChat/Rocket.Chat/pull/11107))
+- Update v126.js ([#11103](https://github.com/RocketChat/Rocket.Chat/pull/11103))
+- Speed up the build time by removing JSON Minify from i18n package ([#11097](https://github.com/RocketChat/Rocket.Chat/pull/11097))
+- Fix Docker image for develop commits ([#11093](https://github.com/RocketChat/Rocket.Chat/pull/11093))
+- Build Docker image on CI ([#11076](https://github.com/RocketChat/Rocket.Chat/pull/11076))
+- Update issue templates ([#11070](https://github.com/RocketChat/Rocket.Chat/pull/11070))
+- LingoHub based on develop ([#11062](https://github.com/RocketChat/Rocket.Chat/pull/11062))
+- LingoHub based on develop ([#11054](https://github.com/RocketChat/Rocket.Chat/pull/11054))
+- LingoHub based on develop ([#11053](https://github.com/RocketChat/Rocket.Chat/pull/11053))
+- LingoHub based on develop ([#11051](https://github.com/RocketChat/Rocket.Chat/pull/11051))
+- LingoHub based on develop ([#11045](https://github.com/RocketChat/Rocket.Chat/pull/11045))
+- LingoHub based on develop ([#11044](https://github.com/RocketChat/Rocket.Chat/pull/11044))
+- LingoHub based on develop ([#11043](https://github.com/RocketChat/Rocket.Chat/pull/11043))
+- LingoHub based on develop ([#11042](https://github.com/RocketChat/Rocket.Chat/pull/11042))
+- Changed 'confirm password' placeholder text on user registration form ([#9969](https://github.com/RocketChat/Rocket.Chat/pull/9969) by [@kumarnitj](https://github.com/kumarnitj))
+- LingoHub based on develop ([#11039](https://github.com/RocketChat/Rocket.Chat/pull/11039))
+- LingoHub based on develop ([#11035](https://github.com/RocketChat/Rocket.Chat/pull/11035))
+- Update Documentation: README.md ([#10207](https://github.com/RocketChat/Rocket.Chat/pull/10207) by [@rakhi2104](https://github.com/rakhi2104))
+- NPM Dependencies Update ([#10913](https://github.com/RocketChat/Rocket.Chat/pull/10913))
+- update meteor to 1.6.1 for sandstorm build ([#10131](https://github.com/RocketChat/Rocket.Chat/pull/10131) by [@peterlee0127](https://github.com/peterlee0127))
+- Renaming username.username to username.value for clarity ([#10986](https://github.com/RocketChat/Rocket.Chat/pull/10986))
+- Fix readme typo ([#5](https://github.com/RocketChat/Rocket.Chat/pull/5))
+- Remove wrong and not needed time unit ([#10807](https://github.com/RocketChat/Rocket.Chat/pull/10807) by [@cliffparnitzky](https://github.com/cliffparnitzky))
+- Develop sync commits ([#10909](https://github.com/RocketChat/Rocket.Chat/pull/10909) by [@nsuchy](https://github.com/nsuchy))
+- Develop sync2 ([#10908](https://github.com/RocketChat/Rocket.Chat/pull/10908) by [@nsuchy](https://github.com/nsuchy))
+- Merge master into develop & Set version to 0.66.0-develop ([#10903](https://github.com/RocketChat/Rocket.Chat/pull/10903) by [@nsuchy](https://github.com/nsuchy))
+
+</details>
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@JoseRenan](https://github.com/JoseRenan)
+- [@brylie](https://github.com/brylie)
+- [@c0dzilla](https://github.com/c0dzilla)
+- [@cliffparnitzky](https://github.com/cliffparnitzky)
+- [@cpitman](https://github.com/cpitman)
+- [@haffla](https://github.com/haffla)
+- [@jonnilundy](https://github.com/jonnilundy)
+- [@kable-wilmoth](https://github.com/kable-wilmoth)
+- [@karakayasemi](https://github.com/karakayasemi)
+- [@kb0304](https://github.com/kb0304)
+- [@kumarnitj](https://github.com/kumarnitj)
+- [@lindoelio](https://github.com/lindoelio)
+- [@mahdiyari](https://github.com/mahdiyari)
+- [@mikaelmello](https://github.com/mikaelmello)
+- [@myfonj](https://github.com/myfonj)
+- [@noobbbbb](https://github.com/noobbbbb)
+- [@nsuchy](https://github.com/nsuchy)
+- [@ocdtrekkie](https://github.com/ocdtrekkie)
+- [@peterlee0127](https://github.com/peterlee0127)
+- [@pitamar](https://github.com/pitamar)
+- [@pkgodara](https://github.com/pkgodara)
+- [@rakhi2104](https://github.com/rakhi2104)
+- [@rw4lll](https://github.com/rw4lll)
+- [@saplla](https://github.com/saplla)
+- [@stuartpb](https://github.com/stuartpb)
+- [@taeven](https://github.com/taeven)
+- [@thaiphv](https://github.com/thaiphv)
+- [@vynmera](https://github.com/vynmera)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@Hudell](https://github.com/Hudell)
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@alansikora](https://github.com/alansikora)
+- [@cardoso](https://github.com/cardoso)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@filipealva](https://github.com/filipealva)
+- [@gdelavald](https://github.com/gdelavald)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@ggazzo](https://github.com/ggazzo)
+- [@graywolf336](https://github.com/graywolf336)
+- [@karlprieb](https://github.com/karlprieb)
+- [@rafaelks](https://github.com/rafaelks)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@tassoevan](https://github.com/tassoevan)
+- [@timkinnane](https://github.com/timkinnane)
+
 # 0.65.2
 `2018-06-16  ·  1 🐛  ·  1 🔍  ·  4 👩‍💻👨‍💻`
 
diff --git a/package.json b/package.json
index b0a8a1a49286..3ef71127318f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.66.0-rc.1",
+	"version": "0.66.0-rc.2",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 3a95a1da8986..444b545cd6a1 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.66.0-rc.1"
+	"version": "0.66.0-rc.2"
 }

From 602c24f63706ba34cfe4657e87bad373a31394fc Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 26 Jun 2018 15:37:07 -0300
Subject: [PATCH 12/29] [FIX] LDAP was accepting login with empty passwords for
 certain AD configurations (#11264)

---
 packages/rocketchat-i18n/i18n/en.i18n.json      |  4 +++-
 packages/rocketchat-ldap/server/ldap.js         | 13 ++++++++++++-
 packages/rocketchat-ldap/server/loginHandler.js |  2 +-
 packages/rocketchat-ldap/server/settings.js     |  1 +
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 622e715153ff..4c8582bfa328 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1499,6 +1499,8 @@
   "LDAP_Enable_Description": "Attempt to utilize LDAP for authentication.",
   "LDAP_Encryption": "Encryption",
   "LDAP_Encryption_Description": "The encryption method used to secure communications to the LDAP server. Examples include `plain` (no encryption), `SSL/LDAPS` (encrypted from the start), and `StartTLS` (upgrade to encrypted communication once connected).",
+  "LDAP_Find_User_After_Login": "Find user after login",
+  "LDAP_Find_User_After_Login_Description": "Will perform a search of the user's DN after bind to ensure the bind was successful preventing login with empty passwords when allowed by the AD configuration.",
   "LDAP_Group_Filter_Enable": "Enable LDAP User Group Filter",
   "LDAP_Group_Filter_Enable_Description": "Restrict access to users in a LDAP group<br/>Useful for OpenLDAP servers without overlays that not permit *memberOf* filter",
   "LDAP_Group_Filter_Group_Id_Attribute": "Group ID Attribute",
@@ -2738,4 +2740,4 @@
   "Your_push_was_sent_to_s_devices": "Your push was sent to %s devices",
   "Your_server_link": "Your server link",
   "Your_workspace_is_ready": "Your workspace is ready to use 🎉"
-}
\ No newline at end of file
+}
diff --git a/packages/rocketchat-ldap/server/ldap.js b/packages/rocketchat-ldap/server/ldap.js
index 894d00264bed..0f48a486ffc0 100644
--- a/packages/rocketchat-ldap/server/ldap.js
+++ b/packages/rocketchat-ldap/server/ldap.js
@@ -41,7 +41,8 @@ export default class LDAP {
 			group_filter_group_id_attribute: RocketChat.settings.get('LDAP_Group_Filter_Group_Id_Attribute'),
 			group_filter_group_member_attribute: RocketChat.settings.get('LDAP_Group_Filter_Group_Member_Attribute'),
 			group_filter_group_member_format: RocketChat.settings.get('LDAP_Group_Filter_Group_Member_Format'),
-			group_filter_group_name: RocketChat.settings.get('LDAP_Group_Filter_Group_Name')
+			group_filter_group_name: RocketChat.settings.get('LDAP_Group_Filter_Group_Name'),
+			find_user_after_login: RocketChat.settings.get('LDAP_Find_User_After_Login')
 		};
 	}
 
@@ -479,6 +480,16 @@ export default class LDAP {
 
 		try {
 			this.bindSync(dn, password);
+			if (this.options.find_user_after_login) {
+				const searchOptions = {
+					scope: this.options.User_Search_Scope || 'sub'
+				};
+				const result = this.searchAllSync(dn, searchOptions);
+				if (result.length === 0) {
+					logger.auth.info('Bind successful but user was not found via search', dn, searchOptions);
+					return false;
+				}
+			}
 			logger.auth.info('Authenticated', dn);
 			return true;
 		} catch (error) {
diff --git a/packages/rocketchat-ldap/server/loginHandler.js b/packages/rocketchat-ldap/server/loginHandler.js
index 85fbdd87fe0f..b7fc71589fe7 100644
--- a/packages/rocketchat-ldap/server/loginHandler.js
+++ b/packages/rocketchat-ldap/server/loginHandler.js
@@ -126,7 +126,7 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
 
 		syncUserData(user, ldapUser);
 
-		if (RocketChat.settings.get('LDAP_Login_Fallback') === true) {
+		if (RocketChat.settings.get('LDAP_Login_Fallback') === true && typeof loginRequest.ldapPass === 'string' && loginRequest.ldapPass.trim() !== '') {
 			Accounts.setPassword(user._id, loginRequest.ldapPass, {logout: false});
 		}
 
diff --git a/packages/rocketchat-ldap/server/settings.js b/packages/rocketchat-ldap/server/settings.js
index b51d0549f2c5..df61a2ad5fea 100644
--- a/packages/rocketchat-ldap/server/settings.js
+++ b/packages/rocketchat-ldap/server/settings.js
@@ -23,6 +23,7 @@ RocketChat.settings.addGroup('LDAP', function() {
 
 	this.add('LDAP_Enable', false, { type: 'boolean', public: true });
 	this.add('LDAP_Login_Fallback', true, { type: 'boolean', enableQuery });
+	this.add('LDAP_Find_User_After_Login', true, { type: 'boolean', enableQuery });
 	this.add('LDAP_Host', '', { type: 'string', enableQuery });
 	this.add('LDAP_Port', '389', { type: 'string', enableQuery });
 	this.add('LDAP_Reconnect', false, { type: 'boolean', enableQuery });

From fdf221f2477bcab553571b44999ce92e17979f5f Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 26 Jun 2018 17:19:48 -0300
Subject: [PATCH 13/29] [FIX] The process was freezing in some cases when HTTP
 calls exceeds timeout on integrations (#11253)

* [FIX] Integration scripts were freezing the process some times

* Add catch to vm script's Promise

* Force script to time out
---
 .../rocketchat-integrations/server/api/api.js | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-integrations/server/api/api.js b/packages/rocketchat-integrations/server/api/api.js
index bbd9efa92b63..2d78933c2274 100644
--- a/packages/rocketchat-integrations/server/api/api.js
+++ b/packages/rocketchat-integrations/server/api/api.js
@@ -1,6 +1,8 @@
 /* globals Meteor Restivus logger processWebhookMessage*/
 // TODO: remove globals
 
+import Fiber from 'fibers';
+import Future from 'fibers/future';
 import _ from 'underscore';
 import s from 'underscore.string';
 import vm from 'vm';
@@ -60,10 +62,15 @@ const Api = new Restivus({
 const compiledScripts = {};
 function buildSandbox(store = {}) {
 	const sandbox = {
+		scriptTimeout(reject) {
+			return setTimeout(() => reject('timed out'), 3000);
+		},
 		_,
 		s,
 		console,
 		moment,
+		Fiber,
+		Promise,
 		Livechat: RocketChat.Livechat,
 		Store: {
 			set(key, val) {
@@ -236,9 +243,20 @@ function executeIntegrationRest() {
 			sandbox.script = script;
 			sandbox.request = request;
 
-			const result = vm.runInNewContext('script.process_incoming_request({ request: request })', sandbox, {
+			const result = Future.fromPromise(vm.runInNewContext(`
+				new Promise((resolve, reject) => {
+					Fiber(() => {
+						scriptTimeout(reject);
+						try {
+							resolve(script.process_incoming_request({ request: request }));
+						} catch(e) {
+							reject(e);
+						}
+					}).run();
+				}).catch((error) => { throw new Error(error); });
+			`, sandbox, {
 				timeout: 3000
-			});
+			})).wait();
 
 			if (!result) {
 				logger.incoming.debug('[Process Incoming Request result of Trigger', this.integration.name, ':] No data');

From 92526f5930c5bf63548a10b9d40554dfeba3b1ed Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 26 Jun 2018 21:50:04 -0300
Subject: [PATCH 14/29] Add Dockerfile with MongoDB (#10971)

* Add Dockerfile with MongoDB

* Added "--smallfiles --storageEngine=mmapv1"

* Add preview Docker image to CI

* Add preview message on startup

* Remove user from Preview Docker Image
---
 .circleci/config.yml           | 32 +++++++++++++++++++++++++--
 .docker-mongo/Dockerfile       | 40 ++++++++++++++++++++++++++++++++++
 .docker-mongo/entrypoint.sh    | 19 ++++++++++++++++
 .docker-mongo/licenses/LICENSE | 22 +++++++++++++++++++
 4 files changed, 111 insertions(+), 2 deletions(-)
 create mode 100644 .docker-mongo/Dockerfile
 create mode 100644 .docker-mongo/entrypoint.sh
 create mode 100644 .docker-mongo/licenses/LICENSE

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a47db9b5ed10..07e8adc24471 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -276,7 +276,6 @@ jobs:
           name: Build Docker image
           command: |
             cd /tmp/build
-            cp ~/repo/.docker/Dockerfile .
             tar xzf Rocket.Chat.tar.gz
             rm Rocket.Chat.tar.gz
 
@@ -284,15 +283,29 @@ jobs:
             if [[ $CIRCLE_TAG ]]; then
               docker login -u $DOCKER_USER -p $DOCKER_PASS
 
+              echo "Build official Docker image"
+              cp ~/repo/.docker/Dockerfile .
               docker build -t rocketchat/rocket.chat:$CIRCLE_TAG .
               docker push rocketchat/rocket.chat:$CIRCLE_TAG
 
+              echo "Build preview Docker image"
+              cp ~/repo/.docker-mongo/Dockerfile .
+              cp ~/repo/.docker-mongo/entrypoint.sh .
+              docker build -t rocketchat/rocket.chat-preview:$CIRCLE_TAG .
+              docker push rocketchat/rocket.chat-preview:$CIRCLE_TAG
+
               if [[ $CIRCLE_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
                 docker tag rocketchat/rocket.chat:$CIRCLE_TAG rocketchat/rocket.chat:latest
                 docker push rocketchat/rocket.chat:latest
+
+                docker tag rocketchat/rocket.chat.preview:$CIRCLE_TAG rocketchat/rocket.chat.preview:latest
+                docker push rocketchat/rocket.chat.preview:latest
               else
                 docker tag rocketchat/rocket.chat:$CIRCLE_TAG rocketchat/rocket.chat:release-candidate
                 docker push rocketchat/rocket.chat:release-candidate
+
+                docker tag rocketchat/rocket.chat.preview:$CIRCLE_TAG rocketchat/rocket.chat.preview:release-candidate
+                docker push rocketchat/rocket.chat.preview:release-candidate
               fi
 
               exit 0
@@ -301,9 +314,17 @@ jobs:
             if [[ $CIRCLE_BRANCH == 'develop' ]]; then
               docker login -u $DOCKER_USER -p $DOCKER_PASS
 
+              echo "Build official Docker image"
+              cp ~/repo/.docker/Dockerfile .
               docker build -t rocketchat/rocket.chat:develop .
               docker push rocketchat/rocket.chat:develop
 
+              echo "Build preview Docker image"
+              cp ~/repo/.docker-mongo/Dockerfile .
+              cp ~/repo/.docker-mongo/entrypoint.sh .
+              docker build -t rocketchat/rocket.chat.preview:develop .
+              docker push rocketchat/rocket.chat.preview:develop
+
               exit 0
             fi;
 
@@ -330,15 +351,22 @@ jobs:
             fi;
 
             cd /tmp/build
-            cp ~/repo/.docker/Dockerfile .
             tar xzf Rocket.Chat.tar.gz
             rm Rocket.Chat.tar.gz
 
             docker login -u $DOCKER_USER -p $DOCKER_PASS
 
+            echo "Build official Docker image"
+            cp ~/repo/.docker/Dockerfile .
             docker build -t rocketchat/rocket.chat:pr-$CIRCLE_PR_NUMBER .
             docker push rocketchat/rocket.chat:pr-$CIRCLE_PR_NUMBER
 
+            echo "Build preview Docker image"
+            cp ~/repo/.docker-mongo/Dockerfile .
+            cp ~/repo/.docker-mongo/entrypoint.sh .
+            docker build -t rocketchat/rocket.chat.preview:pr-$CIRCLE_PR_NUMBER .
+            docker push rocketchat/rocket.chat.preview:pr-$CIRCLE_PR_NUMBER
+
 workflows:
   version: 2
   build-and-test:
diff --git a/.docker-mongo/Dockerfile b/.docker-mongo/Dockerfile
new file mode 100644
index 000000000000..8a5faf28da37
--- /dev/null
+++ b/.docker-mongo/Dockerfile
@@ -0,0 +1,40 @@
+FROM rocketchat/base:8
+
+ADD . /app
+ADD entrypoint.sh /app/bundle/
+
+MAINTAINER buildmaster@rocket.chat
+
+RUN set -x \
+ && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+ && echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" | tee /etc/apt/sources.list.d/mongodb-org-3.6.list \
+ && apt-get update \
+ && apt-get install -y --force-yes pwgen mongodb-org \
+ && echo "mongodb-org hold" | dpkg --set-selections \
+ && echo "mongodb-org-server hold" | dpkg --set-selections \
+ && echo "mongodb-org-shell hold" | dpkg --set-selections \
+ && echo "mongodb-org-mongos hold" | dpkg --set-selections \
+ && echo "mongodb-org-tools hold" | dpkg --set-selections \
+ && cd /app/bundle/programs/server \
+ && npm install \
+ && npm cache clear --force \
+ && rm -rf /var/lib/apt/lists/*
+
+VOLUME /app/uploads
+
+WORKDIR /app/bundle
+
+# needs a mongoinstance - defaults to container linking with alias 'mongo'
+ENV DEPLOY_METHOD=docker-preview \
+    NODE_ENV=production \
+    MONGO_URL=mongodb://localhost:27017/rocketchat \
+    HOME=/tmp \
+    PORT=3000 \
+    ROOT_URL=http://localhost:3000 \
+    Accounts_AvatarStorePath=/app/uploads
+
+EXPOSE 3000
+
+RUN chmod +x /app/bundle/entrypoint.sh
+
+ENTRYPOINT /app/bundle/entrypoint.sh
diff --git a/.docker-mongo/entrypoint.sh b/.docker-mongo/entrypoint.sh
new file mode 100644
index 000000000000..89a347637ac1
--- /dev/null
+++ b/.docker-mongo/entrypoint.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+echo """
+██████╗  ██████╗  ██████╗██╗  ██╗███████╗████████╗ ██████╗██╗  ██╗ █████╗ ████████╗    ██████╗ ██████╗ ███████╗██╗   ██╗██╗███████╗██╗    ██╗
+██╔══██╗██╔═══██╗██╔════╝██║ ██╔╝██╔════╝╚══██╔══╝██╔════╝██║  ██║██╔══██╗╚══██╔══╝    ██╔══██╗██╔══██╗██╔════╝██║   ██║██║██╔════╝██║    ██║
+██████╔╝██║   ██║██║     █████╔╝ █████╗     ██║   ██║     ███████║███████║   ██║       ██████╔╝██████╔╝█████╗  ██║   ██║██║█████╗  ██║ █╗ ██║
+██╔══██╗██║   ██║██║     ██╔═██╗ ██╔══╝     ██║   ██║     ██╔══██║██╔══██║   ██║       ██╔═══╝ ██╔══██╗██╔══╝  ╚██╗ ██╔╝██║██╔══╝  ██║███╗██║
+██║  ██║╚██████╔╝╚██████╗██║  ██╗███████╗   ██║██╗╚██████╗██║  ██║██║  ██║   ██║       ██║     ██║  ██║███████╗ ╚████╔╝ ██║███████╗╚███╔███╔╝
+╚═╝  ╚═╝ ╚═════╝  ╚═════╝╚═╝  ╚═╝╚══════╝   ╚═╝╚═╝ ╚═════╝╚═╝  ╚═╝╚═╝  ╚═╝   ╚═╝       ╚═╝     ╚═╝  ╚═╝╚══════╝  ╚═══╝  ╚═╝╚══════╝ ╚══╝╚══╝
+"""
+
+mongod --smallfiles --storageEngine=mmapv1 --fork --config /etc/mongod.conf
+
+until mongo --eval "db" &> /dev/null; do
+	echo "MongoDB still not ready, sleeping"
+	sleep 1
+done
+
+node main.js
diff --git a/.docker-mongo/licenses/LICENSE b/.docker-mongo/licenses/LICENSE
new file mode 100644
index 000000000000..b3435a104885
--- /dev/null
+++ b/.docker-mongo/licenses/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015-2017 Rocket.Chat Technologies Corp.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

From 20e73ce84b3aad2517c33c1d825e9fbaad273046 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 26 Jun 2018 21:51:04 -0300
Subject: [PATCH 15/29] Bump version to 0.66.0-rc.3

---
 .docker/Dockerfile.rhel                 |  2 +-
 .github/history.json                    | 55 +++++++++++++++++++++++++
 .sandstorm/sandstorm-pkgdef.capnp       |  4 +-
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 28 +++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 7 files changed, 89 insertions(+), 6 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index a40870767bc6..0e5fed1438b1 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 0.66.0-rc.2
+ENV RC_VERSION 0.66.0-rc.3
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 0588c1a74e57..7a6cff92f6d2 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -16598,6 +16598,61 @@
           ]
         }
       ]
+    },
+    "0.66.0-rc.3": {
+      "node_version": "8.11.3",
+      "npm_version": "5.6.0",
+      "pull_requests": [
+        {
+          "pr": "10971",
+          "title": "Add Dockerfile with MongoDB",
+          "userLogin": "rodrigok",
+          "milestone": "0.66.0",
+          "contributors": [
+            "rodrigok",
+            "engelgabriel",
+            "web-flow",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "11253",
+          "title": "[FIX] The process was freezing in some cases when HTTP calls exceeds timeout on integrations",
+          "userLogin": "rodrigok",
+          "milestone": "0.66.0",
+          "contributors": [
+            "rodrigok",
+            "sampaiodiego",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11264",
+          "title": "[FIX] LDAP was accepting login with empty passwords for certain AD configurations",
+          "userLogin": "rodrigok",
+          "milestone": "0.66.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "11263",
+          "title": "[FIX] Update capnproto dependence for Sandstorm Build",
+          "userLogin": "peterlee0127",
+          "contributors": [
+            "peterlee0127"
+          ]
+        },
+        {
+          "pr": "11257",
+          "title": "[FIX] Internal Server Error on first login with CAS integration",
+          "userLogin": "Hudell",
+          "milestone": "0.66.0",
+          "contributors": [
+            "Hudell"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 6b2e3cccd065..dc96add9843c 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appTitle = (defaultText = "Rocket.Chat"),
 
-		appVersion = 74,  # Increment this for every release.
+		appVersion = 75,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.66.0-rc.2"),
+		appMarketingVersion = (defaultText = "0.66.0-rc.3"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 179245374d85..f2cf401ede20 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.66.0-rc.2
+    RC_VERSION=0.66.0-rc.3
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 3e429683a743..79e579ca4e24 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,34 @@
 
 # 0.66.0 (Under Release Candidate Process)
 
+## 0.66.0-rc.3
+`2018-06-26  ·  4 🐛  ·  1 🔍  ·  5 👩‍💻👨‍💻`
+
+### 🐛 Bug fixes
+
+- The process was freezing in some cases when HTTP calls exceeds timeout on integrations ([#11253](https://github.com/RocketChat/Rocket.Chat/pull/11253))
+- LDAP was accepting login with empty passwords for certain AD configurations ([#11264](https://github.com/RocketChat/Rocket.Chat/pull/11264))
+- Update capnproto dependence for Sandstorm Build ([#11263](https://github.com/RocketChat/Rocket.Chat/pull/11263) by [@peterlee0127](https://github.com/peterlee0127))
+- Internal Server Error on first login with CAS integration ([#11257](https://github.com/RocketChat/Rocket.Chat/pull/11257))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- Add Dockerfile with MongoDB ([#10971](https://github.com/RocketChat/Rocket.Chat/pull/10971))
+
+</details>
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@peterlee0127](https://github.com/peterlee0127)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@Hudell](https://github.com/Hudell)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 ## 0.66.0-rc.2
 `2018-06-25  ·  6 🔍  ·  3 👩‍💻👨‍💻`
 
diff --git a/package.json b/package.json
index 3ef71127318f..3934c670305a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.66.0-rc.2",
+	"version": "0.66.0-rc.3",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 444b545cd6a1..811ec38986e6 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.66.0-rc.2"
+	"version": "0.66.0-rc.3"
 }

From c06a73092fe0ce02b4fcf5dccacd44465d1ca68e Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Wed, 27 Jun 2018 19:34:31 -0300
Subject: [PATCH 16/29] Fix image build on tags (#11271)

---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 07e8adc24471..55c71b9fd7eb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -291,16 +291,16 @@ jobs:
               echo "Build preview Docker image"
               cp ~/repo/.docker-mongo/Dockerfile .
               cp ~/repo/.docker-mongo/entrypoint.sh .
-              docker build -t rocketchat/rocket.chat-preview:$CIRCLE_TAG .
-              docker push rocketchat/rocket.chat-preview:$CIRCLE_TAG
+              docker build -t rocketchat/rocket.chat.preview:$CIRCLE_TAG .
+              docker push rocketchat/rocket.chat.preview:$CIRCLE_TAG
 
-              if [[ $CIRCLE_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+              if echo "$CIRCLE_TAG" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+$' ; then
                 docker tag rocketchat/rocket.chat:$CIRCLE_TAG rocketchat/rocket.chat:latest
                 docker push rocketchat/rocket.chat:latest
 
                 docker tag rocketchat/rocket.chat.preview:$CIRCLE_TAG rocketchat/rocket.chat.preview:latest
                 docker push rocketchat/rocket.chat.preview:latest
-              else
+              elif echo "$CIRCLE_TAG" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$' ; then
                 docker tag rocketchat/rocket.chat:$CIRCLE_TAG rocketchat/rocket.chat:release-candidate
                 docker push rocketchat/rocket.chat:release-candidate
 

From 7233097d3ce8f2b86f89cc9718f54fabd5930262 Mon Sep 17 00:00:00 2001
From: "Pierre H. Lehnen" <Hudell@users.noreply.github.com>
Date: Wed, 27 Jun 2018 19:49:13 -0300
Subject: [PATCH 17/29] Fixed reactions when shouldReact param is omitted
 (#11276)

[FIX] Reaction Toggle was not working when omitting the last parameter from the API (DDP and REST)
---
 packages/rocketchat-reactions/setReaction.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-reactions/setReaction.js b/packages/rocketchat-reactions/setReaction.js
index 2cf5a8c7bdc7..cdbb3f3f334c 100644
--- a/packages/rocketchat-reactions/setReaction.js
+++ b/packages/rocketchat-reactions/setReaction.js
@@ -47,7 +47,12 @@ Meteor.methods({
 			return false;
 		}
 
-		const userAlreadyReacted = Boolean(message.reactions) && message.reactions[reaction] && message.reactions[reaction].usernames.indexOf(user.username) !== -1;
+		const userAlreadyReacted = Boolean(message.reactions) && Boolean(message.reactions[reaction]) && message.reactions[reaction].usernames.indexOf(user.username) !== -1;
+		// When shouldReact was not informed, toggle the reaction.
+		if (shouldReact === undefined) {
+			shouldReact = !userAlreadyReacted;
+		}
+
 		if (userAlreadyReacted === shouldReact) {
 			return;
 		}

From 204baf68460171f4b3278698d586b58a6e15a6e0 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed, 27 Jun 2018 20:19:57 -0300
Subject: [PATCH 18/29] Regression: sidebar sorting was being wrong in some
 cases where the rooms records were returned before the subscriptions (#11273)

* fix sort sidebar

* fix review

* Update roomList.js

* Update cachedCollection.js
---
 .../rocketchat-ui-sidenav/client/roomList.js  | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/packages/rocketchat-ui-sidenav/client/roomList.js b/packages/rocketchat-ui-sidenav/client/roomList.js
index fcb0116a6b77..8088f8d67376 100644
--- a/packages/rocketchat-ui-sidenav/client/roomList.js
+++ b/packages/rocketchat-ui-sidenav/client/roomList.js
@@ -1,6 +1,5 @@
 /* globals RocketChat */
 import { UiTextContext } from 'meteor/rocketchat:lib';
-import _ from 'underscore';
 
 Template.roomList.helpers({
 	rooms() {
@@ -110,26 +109,35 @@ const getLowerCaseNames = (room, nameDefault = '') => {
 	};
 };
 
-// RocketChat.Notifications['onUser']('rooms-changed', );
-
-const mergeSubRoom = (record/*, t*/) => {
-	const room = Tracker.nonreactive(() => RocketChat.models.Rooms.findOne({ _id: record.rid }));
-	if (!room) {
-		return record;
-	}
-	record.lastMessage = room.lastMessage;
-	record.lm = room._updatedAt;
-	return _.extend(record, getLowerCaseNames(record));
+const mergeSubRoom = subscription => {
+	const room = RocketChat.models.Rooms.findOne(subscription.rid) || { _updatedAt: subscription.ts };
+	subscription.lastMessage = room.lastMessage;
+	subscription.lm = room._updatedAt;
+	return Object.assign(subscription, getLowerCaseNames(subscription));
 };
 
-RocketChat.callbacks.add('cachedCollection-received-rooms', (room) => {
+const mergeRoomSub = room => {
 	const sub = RocketChat.models.Subscriptions.findOne({ rid: room._id });
 	if (!sub) {
-		return;
+		return room;
 	}
-	const $set = {lastMessage : room.lastMessage, lm: room._updatedAt, ...getLowerCaseNames(room, sub.name)};
-	RocketChat.models.Subscriptions.update({ rid: room._id }, {$set});
-});
+
+	RocketChat.models.Subscriptions.update({
+		rid: room._id
+	}, {
+		$set: {
+			lastMessage: room.lastMessage,
+			lm: room._updatedAt,
+			...getLowerCaseNames(room, sub.name)
+		}
+	});
+
+	return room;
+};
+
+RocketChat.callbacks.add('cachedCollection-received-rooms', mergeRoomSub);
+RocketChat.callbacks.add('cachedCollection-sync-rooms', mergeRoomSub);
+RocketChat.callbacks.add('cachedCollection-loadFromServer-rooms', mergeRoomSub);
 
 RocketChat.callbacks.add('cachedCollection-received-subscriptions', mergeSubRoom);
 RocketChat.callbacks.add('cachedCollection-sync-subscriptions', mergeSubRoom);

From 445ef8bb92f802c50df2cd9cb26c1e206f993d2e Mon Sep 17 00:00:00 2001
From: Aaron Ogle <geekgonecrazy@users.noreply.github.com>
Date: Wed, 27 Jun 2018 18:34:16 -0500
Subject: [PATCH 19/29] [FIX] Armhf snap build (#11268)

* Update snapcraft.yaml

* Add node prep script

* Make executable

* Remove devDependency that caused arm failure.  Also removed packaged binary for sharp for arm

* dev/null tar stdout.  Remove sharp vendor folder only for arm so it will download and build

* add missing slash

* fix arm check to catch armv7l also

* remove /dev/null and verbose flag.

* Move extract to new line
---
 .snapcraft/README.md                   | 61 --------------------------
 .snapcraft/resources/prepareRocketChat | 14 ++++--
 .snapcraft/resources/preparenode       | 23 ++++++++++
 .snapcraft/snapcraft.yaml              |  2 +-
 4 files changed, 35 insertions(+), 65 deletions(-)
 delete mode 100644 .snapcraft/README.md
 create mode 100755 .snapcraft/resources/preparenode

diff --git a/.snapcraft/README.md b/.snapcraft/README.md
deleted file mode 100644
index f0197f2dc65b..000000000000
--- a/.snapcraft/README.md
+++ /dev/null
@@ -1,61 +0,0 @@
-![Rocket.Chat logo](https://rocket.chat/images/logo/logo-dark.svg?v3)
-
-# rocketchat-server snap for Ubuntu Core  (all arch)
-
-Features:
-* bundles ubuntu distribution specific and RC compatible mongodb version
-* oplog tailing for mongo by default
-* mongodb backup command  
-* mongodb restore command
-* caddy reverse proxy built-in - capable of handling free lestencrypt ssl
-
-Note:
-
-Currently, this repository is mirrored on launchpad, and used to build latest ARMHF and i386 snaps.   
-
-You can download recent builds here:
-https://code.launchpad.net/~sing-li/+snap/rocketchat-server
-
-Due an issue with the existing installed base of amd64 users (existing snap always installed mongodb 3.2  [#issue](https://github.com/RocketChat/rocketchat-server-snap/issues/3)), this snap is not currently used for amd64 builds.
-
-### Test installation 
-
-Download the latest snap file of the corresponding architecture to your Ubuntu Core 16 or 16.04LTS server.
-
-`sudo snap install ./rocketchat-server-xxxxxxxx.snap  --dangerous`
-
-
-### Development or compile your own snap
-
-Make sure you have `snapcraft` installed.
-
-```
-git clone https://github.com/RocketChat/rocketchat-server-snap
-cd rocketchat-server-snap
-snapcraft snap
-```
-
-### Regression tests (run for amd64, i386 and armhf):
-- snapcraft runs properly
-- snap installs properly
-- all services start automatically
-- rc service shows a 5-second restart delay while waiting for mongo
-	- to test manually, stop rc, stop mongo, start rc, wait 20s or so, start mongo
-- rc can be successfully restarted via the "Restart the server" button under Admin > Settings > General
-- rc service shows a 5-second delay when restarted via this button
-- all commands execute successfully:
-	- initcaddy
-		- modify the Caddyfile to test:
-			- self-signed TLS certificate (use the "tls self_signed" caddy directive)
-			- changing ports (with and without TLS)
-			- using IP address (only works without TLS)
-			- successfully acquiring a Let's Encrypt certificate (requires a registered domain)
-	- backupdb
-		- should run only with sudo
-	- restoredb
-		- ideally, stop rc service prior to running this (mongo must be running)
-		- should run only with sudo
-		- use any file outside of $snap_common (should fail)
-		- use the file created with backupdb
-		- use a dummy .tgz file without actual data
-			- with and without a "parties" directory in the archive
diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat
index 882998b9f82a..2251551e6d0b 100755
--- a/.snapcraft/resources/prepareRocketChat
+++ b/.snapcraft/resources/prepareRocketChat
@@ -2,11 +2,18 @@
 
 curl -SLf "https://releases.rocket.chat/#{RC_VERSION}/download/" -o rocket.chat.tgz
 
-tar xvf rocket.chat.tgz --strip 1
+tar xf rocket.chat.tgz --strip 1
 
 cd programs/server
+rm -rf npm/node_modules/meteor/emojione_emojione/node_modules/grunt-contrib-qunit
 
-npm install
+if [[ $(uname -m) == *armv6l* ]] || [[ $(uname -m) == *armv7l* ]]
+then
+  rm -rf npm/node_modules/sharp/vendor
+fi
+
+export NODE_ENV=production
+npm i
 
 # Ideally this will go away.  For some reason on install its installing node-v57-linux-x64-glibc but when actually running it is looking for node-v57-linux-x64-unknown
 if [[ $(uname -m) == "x86_64" ]]
@@ -15,4 +22,5 @@ then
 fi
 
 # sharp needs execution stack removed - https://forum.snapcraft.io/t/snap-and-executable-stacks/1812
-execstack --clear-execstack npm/node_modules/sharp/vendor/lib/librsvg-2.so.2.42.0
+ls -l npm/node_modules/sharp/vendor
+execstack --clear-execstack npm/node_modules/sharp/vendor/lib/librsvg-2.so*
diff --git a/.snapcraft/resources/preparenode b/.snapcraft/resources/preparenode
new file mode 100755
index 000000000000..f6e0c58d3cc5
--- /dev/null
+++ b/.snapcraft/resources/preparenode
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+node_version="v8.11.3"
+
+unamem="$(uname -m)"
+if [[ $unamem == *aarch64* ]]; then
+        node_arch="arm64"
+elif [[ $unamem == *64* ]]; then
+        node_arch="x64"
+elif [[ $unamem == *86* ]]; then
+        node_arch="x86"
+elif [[ $unamem == *armv6l* ]]; then
+        node_arch="armv6l"
+elif [[ $unamem == *armv7l* ]]; then
+        node_arch="armv7l"
+else
+        echo "Aborted, unsupported or unknown architecture: $unamem"
+        return 2
+fi
+
+
+wget https://nodejs.org/dist/$node_version/node-$node_version-linux-$node_arch.tar.xz
+tar xf node-$node_version-linux-$node_arch.tar.xz --strip 1
diff --git a/.snapcraft/snapcraft.yaml b/.snapcraft/snapcraft.yaml
index 48378873580c..77bd479d66e9 100644
--- a/.snapcraft/snapcraft.yaml
+++ b/.snapcraft/snapcraft.yaml
@@ -39,7 +39,7 @@ apps:
 parts:
     node:
         plugin: dump 
-        prepare: wget https://nodejs.org/dist/v8.11.2/node-v8.11.2-linux-x64.tar.xz; tar xvf node-v8.11.2-linux-x64.tar.xz --strip 1; 
+        prepare: ./resources/preparenode  
         build-packages:
             # For fibers
             - python

From 1c108ae0ea0344c2eed024c714d7232d9db755f1 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 27 Jun 2018 21:38:16 -0300
Subject: [PATCH 20/29] Bump version to 0.66.0-rc.4

---
 .docker/Dockerfile.rhel                 |  2 +-
 .github/history.json                    | 44 +++++++++++++++++++++++++
 .sandstorm/sandstorm-pkgdef.capnp       |  4 +--
 .travis/snap.sh                         |  2 +-
 HISTORY.md                              | 24 ++++++++++++++
 package.json                            |  2 +-
 packages/rocketchat-lib/rocketchat.info |  2 +-
 7 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 0e5fed1438b1..328e919f91fc 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 0.66.0-rc.3
+ENV RC_VERSION 0.66.0-rc.4
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 7a6cff92f6d2..30d7f81b1cbe 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -16653,6 +16653,50 @@
           ]
         }
       ]
+    },
+    "0.66.0-rc.4": {
+      "node_version": "8.11.3",
+      "npm_version": "5.6.0",
+      "pull_requests": [
+        {
+          "pr": "11268",
+          "title": "[FIX] Armhf snap build",
+          "userLogin": "geekgonecrazy",
+          "contributors": [
+            "geekgonecrazy",
+            "web-flow",
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "11273",
+          "title": "Regression: sidebar sorting was being wrong in some cases where the rooms records were returned before the subscriptions",
+          "userLogin": "ggazzo",
+          "milestone": "0.66.0",
+          "contributors": [
+            "ggazzo",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "11276",
+          "title": "[FIX] Reaction Toggle was not working when omitting the last parameter from the API (DDP and REST)",
+          "userLogin": "Hudell",
+          "milestone": "0.66.0",
+          "contributors": [
+            "Hudell"
+          ]
+        },
+        {
+          "pr": "11271",
+          "title": "Fix Docker image build on tags",
+          "userLogin": "sampaiodiego",
+          "milestone": "0.66.0",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index dc96add9843c..7a09c3a8e3be 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appTitle = (defaultText = "Rocket.Chat"),
 
-		appVersion = 75,  # Increment this for every release.
+		appVersion = 76,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.66.0-rc.3"),
+		appMarketingVersion = (defaultText = "0.66.0-rc.4"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index f2cf401ede20..53113436e837 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.66.0-rc.3
+    RC_VERSION=0.66.0-rc.4
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 79e579ca4e24..6307ebc788e1 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,30 @@
 
 # 0.66.0 (Under Release Candidate Process)
 
+## 0.66.0-rc.4
+`2018-06-27  ·  2 🐛  ·  2 🔍  ·  5 👩‍💻👨‍💻`
+
+### 🐛 Bug fixes
+
+- Armhf snap build ([#11268](https://github.com/RocketChat/Rocket.Chat/pull/11268))
+- Reaction Toggle was not working when omitting the last parameter from the API (DDP and REST) ([#11276](https://github.com/RocketChat/Rocket.Chat/pull/11276))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- Regression: sidebar sorting was being wrong in some cases where the rooms records were returned before the subscriptions ([#11273](https://github.com/RocketChat/Rocket.Chat/pull/11273))
+- Fix Docker image build on tags ([#11271](https://github.com/RocketChat/Rocket.Chat/pull/11271))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@Hudell](https://github.com/Hudell)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@ggazzo](https://github.com/ggazzo)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 ## 0.66.0-rc.3
 `2018-06-26  ·  4 🐛  ·  1 🔍  ·  5 👩‍💻👨‍💻`
 
diff --git a/package.json b/package.json
index 3934c670305a..7ba9e0cff0a8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.66.0-rc.3",
+	"version": "0.66.0-rc.4",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 811ec38986e6..dc1ae39608e3 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.66.0-rc.3"
+	"version": "0.66.0-rc.4"
 }

From 4f6c331441b574f088147f325e756143c74ff9a0 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 27 Jun 2018 21:49:01 -0300
Subject: [PATCH 21/29] Bump version to 0.66.0-develop

---
 .sandstorm/sandstorm-pkgdef.capnp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 0ce57d6f7aa0..4b175a86b356 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -19,7 +19,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appTitle = (defaultText = "Rocket.Chat"),
 
-		appVersion = 72,  # Increment this for every release.
+		appVersion = 73,  # Increment this for every release.
 
 		appMarketingVersion = (defaultText = "0.66.0-develop"),
 		# Human-readable representation of appVersion. Should match the way you

From 0800ab07d5f014f535d70cabd835e17836ea8de6 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 27 Jun 2018 21:51:55 -0300
Subject: [PATCH 22/29] Bump version to 0.66.0

---
 .docker/Dockerfile.rhel                 |   2 +-
 .github/history.json                    |  30 ++++++
 .sandstorm/sandstorm-pkgdef.capnp       |   4 +-
 .travis/snap.sh                         |   2 +-
 HISTORY.md                              | 129 +++++-------------------
 package.json                            |   2 +-
 packages/rocketchat-lib/rocketchat.info |   2 +-
 7 files changed, 64 insertions(+), 107 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 328e919f91fc..48af2bb2ed9a 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 0.66.0-rc.4
+ENV RC_VERSION 0.66.0
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 30d7f81b1cbe..21cfa973438b 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -16697,6 +16697,36 @@
           ]
         }
       ]
+    },
+    "0.66.0": {
+      "node_version": "8.11.3",
+      "npm_version": "5.6.0",
+      "pull_requests": [
+        {
+          "pr": "11277",
+          "title": "Merge master into develop & Set version to 0.66.0-develop",
+          "userLogin": "rodrigok",
+          "contributors": [
+            "brylie",
+            "web-flow",
+            "stuartpb",
+            "engelgabriel",
+            "Hudell",
+            "sampaiodiego",
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "9534",
+          "title": "[FIX] i18n - add semantic markup",
+          "userLogin": "brylie",
+          "contributors": [
+            "brylie",
+            "web-flow",
+            "engelgabriel"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 7a09c3a8e3be..dc00db9464e0 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appTitle = (defaultText = "Rocket.Chat"),
 
-		appVersion = 76,  # Increment this for every release.
+		appVersion = 77,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.66.0-rc.4"),
+		appMarketingVersion = (defaultText = "0.66.0"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 53113436e837..7f1e84ea2daf 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.66.0-rc.4
+    RC_VERSION=0.66.0
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 6307ebc788e1..f7da984a470e 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,106 +1,10 @@
 
-# 0.66.0 (Under Release Candidate Process)
+# 0.66.0
+`2018-06-27  ·  1 ️️️⚠️  ·  23 🎉  ·  61 🐛  ·  50 🔍  ·  45 👩‍💻👨‍💻`
 
-## 0.66.0-rc.4
-`2018-06-27  ·  2 🐛  ·  2 🔍  ·  5 👩‍💻👨‍💻`
-
-### 🐛 Bug fixes
-
-- Armhf snap build ([#11268](https://github.com/RocketChat/Rocket.Chat/pull/11268))
-- Reaction Toggle was not working when omitting the last parameter from the API (DDP and REST) ([#11276](https://github.com/RocketChat/Rocket.Chat/pull/11276))
-
-<details>
-<summary>🔍 Minor changes</summary>
-
-- Regression: sidebar sorting was being wrong in some cases where the rooms records were returned before the subscriptions ([#11273](https://github.com/RocketChat/Rocket.Chat/pull/11273))
-- Fix Docker image build on tags ([#11271](https://github.com/RocketChat/Rocket.Chat/pull/11271))
-
-</details>
-
-### 👩‍💻👨‍💻 Core Team 🤓
-
-- [@Hudell](https://github.com/Hudell)
-- [@geekgonecrazy](https://github.com/geekgonecrazy)
-- [@ggazzo](https://github.com/ggazzo)
-- [@rodrigok](https://github.com/rodrigok)
-- [@sampaiodiego](https://github.com/sampaiodiego)
-
-## 0.66.0-rc.3
-`2018-06-26  ·  4 🐛  ·  1 🔍  ·  5 👩‍💻👨‍💻`
-
-### 🐛 Bug fixes
-
-- The process was freezing in some cases when HTTP calls exceeds timeout on integrations ([#11253](https://github.com/RocketChat/Rocket.Chat/pull/11253))
-- LDAP was accepting login with empty passwords for certain AD configurations ([#11264](https://github.com/RocketChat/Rocket.Chat/pull/11264))
-- Update capnproto dependence for Sandstorm Build ([#11263](https://github.com/RocketChat/Rocket.Chat/pull/11263) by [@peterlee0127](https://github.com/peterlee0127))
-- Internal Server Error on first login with CAS integration ([#11257](https://github.com/RocketChat/Rocket.Chat/pull/11257))
-
-<details>
-<summary>🔍 Minor changes</summary>
-
-- Add Dockerfile with MongoDB ([#10971](https://github.com/RocketChat/Rocket.Chat/pull/10971))
-
-</details>
-
-### 👩‍💻👨‍💻 Contributors 😍
-
-- [@peterlee0127](https://github.com/peterlee0127)
-
-### 👩‍💻👨‍💻 Core Team 🤓
-
-- [@Hudell](https://github.com/Hudell)
-- [@engelgabriel](https://github.com/engelgabriel)
-- [@rodrigok](https://github.com/rodrigok)
-- [@sampaiodiego](https://github.com/sampaiodiego)
-
-## 0.66.0-rc.2
-`2018-06-25  ·  6 🔍  ·  3 👩‍💻👨‍💻`
-
-<details>
-<summary>🔍 Minor changes</summary>
-
-- Regression: Prometheus was not being enabled in some cases ([#11249](https://github.com/RocketChat/Rocket.Chat/pull/11249))
-- Regression: Skip operations if no actions on livechat migration ([#11232](https://github.com/RocketChat/Rocket.Chat/pull/11232))
-- Regression: Directory sort users, fix null results, text for empty results ([#11224](https://github.com/RocketChat/Rocket.Chat/pull/11224))
-- LingoHub based on develop ([#11246](https://github.com/RocketChat/Rocket.Chat/pull/11246))
-- Update Meteor to 1.6.1.3 ([#11247](https://github.com/RocketChat/Rocket.Chat/pull/11247))
-- New history source format & add Node and NPM versions ([#11237](https://github.com/RocketChat/Rocket.Chat/pull/11237))
-
-</details>
-
-### 👩‍💻👨‍💻 Core Team 🤓
-
-- [@ggazzo](https://github.com/ggazzo)
-- [@rodrigok](https://github.com/rodrigok)
-- [@sampaiodiego](https://github.com/sampaiodiego)
-
-## 0.66.0-rc.1
-`2018-06-21  ·  2 🐛  ·  4 🔍  ·  4 👩‍💻👨‍💻`
-
-### 🐛 Bug fixes
-
-- "blank messages" on iOS < 11 ([#11221](https://github.com/RocketChat/Rocket.Chat/pull/11221))
-- "blank" screen on iOS < 11 ([#11199](https://github.com/RocketChat/Rocket.Chat/pull/11199))
-
-<details>
-<summary>🔍 Minor changes</summary>
-
-- Regression: Fix directory table loading ([#11223](https://github.com/RocketChat/Rocket.Chat/pull/11223))
-- Regression: Fix latest and release-candidate docker images building ([#11215](https://github.com/RocketChat/Rocket.Chat/pull/11215))
-- Regression: check username or usersCount on browseChannels ([#11216](https://github.com/RocketChat/Rocket.Chat/pull/11216))
-- Regression: Sending message with a mention is not showing to sender ([#11211](https://github.com/RocketChat/Rocket.Chat/pull/11211))
-
-</details>
-
-### 👩‍💻👨‍💻 Core Team 🤓
-
-- [@ggazzo](https://github.com/ggazzo)
-- [@karlprieb](https://github.com/karlprieb)
-- [@rodrigok](https://github.com/rodrigok)
-- [@sampaiodiego](https://github.com/sampaiodiego)
-
-## 0.66.0-rc.0
-`2018-06-20  ·  1 ️️️⚠️  ·  23 🎉  ·  52 🐛  ·  36 🔍  ·  45 👩‍💻👨‍💻`
+### Engine versions
+- Node: `8.11.3`
+- NPM: `5.6.0`
 
 ### ⚠️ BREAKING CHANGES
 
@@ -134,6 +38,7 @@
 
 ### 🐛 Bug fixes
 
+- i18n - add semantic markup ([#9534](https://github.com/RocketChat/Rocket.Chat/pull/9534) by [@brylie](https://github.com/brylie))
 - Wordpress oauth configuration not loading properly ([#11187](https://github.com/RocketChat/Rocket.Chat/pull/11187))
 - REST API: Add more test cases for `/login` ([#10999](https://github.com/RocketChat/Rocket.Chat/pull/10999))
 - Wrong font-family order ([#11191](https://github.com/RocketChat/Rocket.Chat/pull/11191) by [@myfonj](https://github.com/myfonj))
@@ -186,10 +91,19 @@
 - Remove outdated 2FA warning for mobile clients ([#10916](https://github.com/RocketChat/Rocket.Chat/pull/10916))
 - Update Sandstorm build config ([#10867](https://github.com/RocketChat/Rocket.Chat/pull/10867) by [@ocdtrekkie](https://github.com/ocdtrekkie))
 - i18n - add semantic markup ([#9534](https://github.com/RocketChat/Rocket.Chat/pull/9534) by [@brylie](https://github.com/brylie))
+- "blank messages" on iOS < 11 ([#11221](https://github.com/RocketChat/Rocket.Chat/pull/11221))
+- "blank" screen on iOS < 11 ([#11199](https://github.com/RocketChat/Rocket.Chat/pull/11199))
+- The process was freezing in some cases when HTTP calls exceeds timeout on integrations ([#11253](https://github.com/RocketChat/Rocket.Chat/pull/11253))
+- LDAP was accepting login with empty passwords for certain AD configurations ([#11264](https://github.com/RocketChat/Rocket.Chat/pull/11264))
+- Update capnproto dependence for Sandstorm Build ([#11263](https://github.com/RocketChat/Rocket.Chat/pull/11263) by [@peterlee0127](https://github.com/peterlee0127))
+- Internal Server Error on first login with CAS integration ([#11257](https://github.com/RocketChat/Rocket.Chat/pull/11257))
+- Armhf snap build ([#11268](https://github.com/RocketChat/Rocket.Chat/pull/11268))
+- Reaction Toggle was not working when omitting the last parameter from the API (DDP and REST) ([#11276](https://github.com/RocketChat/Rocket.Chat/pull/11276))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+- Merge master into develop & Set version to 0.66.0-develop ([#11277](https://github.com/RocketChat/Rocket.Chat/pull/11277) by [@brylie](https://github.com/brylie) & [@stuartpb](https://github.com/stuartpb))
 - [IMPROVE] Listing of apps in the admin page ([#11166](https://github.com/RocketChat/Rocket.Chat/pull/11166))
 - Regression: Directory css ([#11206](https://github.com/RocketChat/Rocket.Chat/pull/11206))
 - LingoHub based on develop ([#11208](https://github.com/RocketChat/Rocket.Chat/pull/11208))
@@ -226,6 +140,19 @@
 - Develop sync commits ([#10909](https://github.com/RocketChat/Rocket.Chat/pull/10909) by [@nsuchy](https://github.com/nsuchy))
 - Develop sync2 ([#10908](https://github.com/RocketChat/Rocket.Chat/pull/10908) by [@nsuchy](https://github.com/nsuchy))
 - Merge master into develop & Set version to 0.66.0-develop ([#10903](https://github.com/RocketChat/Rocket.Chat/pull/10903) by [@nsuchy](https://github.com/nsuchy))
+- Regression: Fix directory table loading ([#11223](https://github.com/RocketChat/Rocket.Chat/pull/11223))
+- Regression: Fix latest and release-candidate docker images building ([#11215](https://github.com/RocketChat/Rocket.Chat/pull/11215))
+- Regression: check username or usersCount on browseChannels ([#11216](https://github.com/RocketChat/Rocket.Chat/pull/11216))
+- Regression: Sending message with a mention is not showing to sender ([#11211](https://github.com/RocketChat/Rocket.Chat/pull/11211))
+- Regression: Prometheus was not being enabled in some cases ([#11249](https://github.com/RocketChat/Rocket.Chat/pull/11249))
+- Regression: Skip operations if no actions on livechat migration ([#11232](https://github.com/RocketChat/Rocket.Chat/pull/11232))
+- Regression: Directory sort users, fix null results, text for empty results ([#11224](https://github.com/RocketChat/Rocket.Chat/pull/11224))
+- LingoHub based on develop ([#11246](https://github.com/RocketChat/Rocket.Chat/pull/11246))
+- Update Meteor to 1.6.1.3 ([#11247](https://github.com/RocketChat/Rocket.Chat/pull/11247))
+- New history source format & add Node and NPM versions ([#11237](https://github.com/RocketChat/Rocket.Chat/pull/11237))
+- Add Dockerfile with MongoDB ([#10971](https://github.com/RocketChat/Rocket.Chat/pull/10971))
+- Regression: sidebar sorting was being wrong in some cases where the rooms records were returned before the subscriptions ([#11273](https://github.com/RocketChat/Rocket.Chat/pull/11273))
+- Fix Docker image build on tags ([#11271](https://github.com/RocketChat/Rocket.Chat/pull/11271))
 
 </details>
 
diff --git a/package.json b/package.json
index 7ba9e0cff0a8..0844c1edd671 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.66.0-rc.4",
+	"version": "0.66.0",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index dc1ae39608e3..e04e03c812a5 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.66.0-rc.4"
+	"version": "0.66.0"
 }

From 2e958cace723cb78c8a6459becd543db3e3ec532 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 28 Jun 2018 17:41:10 -0300
Subject: [PATCH 23/29] Bump version to 0.67.0-develop

---
 .docker/Dockerfile.rhel                 | 2 +-
 .sandstorm/sandstorm-pkgdef.capnp       | 4 ++--
 .travis/snap.sh                         | 2 +-
 package.json                            | 2 +-
 packages/rocketchat-lib/rocketchat.info | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 48af2bb2ed9a..3cdb4e368b78 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 0.66.0
+ENV RC_VERSION 0.67.0-develop
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index dc00db9464e0..b8b8cabc1b77 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appTitle = (defaultText = "Rocket.Chat"),
 
-		appVersion = 77,  # Increment this for every release.
+		appVersion = 78,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.66.0"),
+		appMarketingVersion = (defaultText = "0.67.0-develop"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 7f1e84ea2daf..6e54bc03d119 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.66.0
+    RC_VERSION=0.67.0-develop
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/package.json b/package.json
index 0844c1edd671..1d369b2de64f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.66.0",
+	"version": "0.67.0-develop",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index e04e03c812a5..301d768313e5 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.66.0"
+	"version": "0.67.0-develop"
 }

From fe4290be1b9e2d581b1d52ddf06a15905d8b5b07 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 3 Jul 2018 09:02:04 -0300
Subject: [PATCH 24/29] [FIX] Notification preferences being lost when
 switching view mode (#11295)

---
 package-lock.json                     | 65 ++++++++++++++++++---------
 server/methods/saveUserPreferences.js |  6 +--
 server/startup/migrations/v129.js     | 60 +++++++++++++++++++++++++
 3 files changed, 106 insertions(+), 25 deletions(-)
 create mode 100644 server/startup/migrations/v129.js

diff --git a/package-lock.json b/package-lock.json
index e696dd348d37..1587fdbdda34 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "Rocket.Chat",
-	"version": "0.66.0-develop",
+	"version": "0.67.0-develop",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -742,7 +742,7 @@
 		"autolinker": {
 			"version": "1.6.2",
 			"resolved": "https://registry.npmjs.org/autolinker/-/autolinker-1.6.2.tgz",
-			"integrity": "sha1-Z66donLoCODY644Cy8jN4wOUdFc="
+			"integrity": "sha512-IKLGtYFb3jzGTtgCpb4bm//1sXmmmgmr0msKshhYoc7EsWmLCFvuyxLcEIfcZ5gbCgZGXrnXkOkcBblOFEnlog=="
 		},
 		"autoprefixer": {
 			"version": "8.6.0",
@@ -2957,7 +2957,7 @@
 				"debug": {
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
 					"dev": true,
 					"requires": {
 						"ms": "2.0.0"
@@ -3002,7 +3002,7 @@
 				"mocha": {
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz",
-					"integrity": "sha1-fYbPvPNcuCnidUwy4XNV7AUzh5Q=",
+					"integrity": "sha512-0RVnjg1HJsXY2YFDoTNzcc1NKhYuXKRrBAG2gDygmJJA136Cs2QlRliZG1mA0ap7cuaT30mw16luAeln+4RiNA==",
 					"dev": true,
 					"requires": {
 						"browser-stdout": "1.3.0",
@@ -3020,13 +3020,13 @@
 						"commander": {
 							"version": "2.11.0",
 							"resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-							"integrity": "sha1-FXFS/R56bI2YpbcVzzdt+SgARWM=",
+							"integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
 							"dev": true
 						},
 						"glob": {
 							"version": "7.1.2",
 							"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-							"integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
+							"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
 							"dev": true,
 							"requires": {
 								"fs.realpath": "1.0.0",
@@ -3054,7 +3054,7 @@
 				"supports-color": {
 					"version": "4.4.0",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-					"integrity": "sha1-iD992rwWUUKyphQn8zUt7RldGj4=",
+					"integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
 					"dev": true,
 					"requires": {
 						"has-flag": "2.0.0"
@@ -4024,6 +4024,14 @@
 			"integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
 			"dev": true
 		},
+		"dbly-linked-list": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/dbly-linked-list/-/dbly-linked-list-0.2.0.tgz",
+			"integrity": "sha512-Ool7y15f6JRDs0YKx7Dh9uiTb1jS1SZLNdT3Y2q16DlaEghXbMsmODS/XittjR2xztt1gJUpz7jVxpqAPF8VGg==",
+			"requires": {
+				"lodash.isequal": "4.5.0"
+			}
+		},
 		"ddp-ejson": {
 			"version": "0.8.1-3",
 			"resolved": "https://registry.npmjs.org/ddp-ejson/-/ddp-ejson-0.8.1-3.tgz",
@@ -6218,7 +6226,7 @@
 		"glob": {
 			"version": "7.1.2",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-			"integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
+			"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
 			"requires": {
 				"fs.realpath": "1.0.0",
 				"inflight": "1.0.6",
@@ -8178,7 +8186,7 @@
 		"is-resolvable": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-			"integrity": "sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg=",
+			"integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
 			"dev": true
 		},
 		"is-retry-allowed": {
@@ -8753,6 +8761,11 @@
 			"resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
 			"integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY="
 		},
+		"lodash.isequal": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+			"integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
+		},
 		"lodash.isinteger": {
 			"version": "4.0.4",
 			"resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
@@ -8776,7 +8789,7 @@
 		"lodash.merge": {
 			"version": "4.6.1",
 			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
-			"integrity": "sha1-rcJdnLmbk5HFliTzefu6YNcRHVQ="
+			"integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ=="
 		},
 		"lodash.once": {
 			"version": "4.1.1",
@@ -8944,7 +8957,7 @@
 		"mailsplit": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/mailsplit/-/mailsplit-4.1.2.tgz",
-			"integrity": "sha1-xhi8MRpM/IOyJqHtwbUD9akk0IM=",
+			"integrity": "sha512-5UWjUfhKlC4OR5PqZKcl4h7vnz2EP4M3Zg2SBbrztvAYX5lM/rA7tvaXkZ6zRcvK32Uul0GkRA037icDbiJIOw==",
 			"requires": {
 				"libbase64": "1.0.2",
 				"libmime": "3.1.0",
@@ -8954,7 +8967,7 @@
 				"libbase64": {
 					"version": "1.0.2",
 					"resolved": "https://registry.npmjs.org/libbase64/-/libbase64-1.0.2.tgz",
-					"integrity": "sha1-L/E//mmx5AFZ9JNo4w0N2LsWNbU="
+					"integrity": "sha512-CyPjvTFbsGps2Sdvy9GVjSRPvUGpji8Hxb+iunp466guzxcd3QaK0k8Hur1sPkgD9FonW8V1z2F1y066YiliEg=="
 				}
 			}
 		},
@@ -9195,7 +9208,7 @@
 		"minimatch": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-			"integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
+			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
 			"requires": {
 				"brace-expansion": "1.1.11"
 			}
@@ -9601,7 +9614,7 @@
 		"npmlog": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-			"integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
+			"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
 			"requires": {
 				"are-we-there-yet": "1.1.5",
 				"console-control-strings": "1.1.0",
@@ -10006,7 +10019,7 @@
 		"path-type": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-			"integrity": "sha1-zvMdyOCho7sNEFwM2Xzzv0f0428=",
+			"integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
 			"requires": {
 				"pify": "3.0.0"
 			}
@@ -10338,7 +10351,7 @@
 		"postcss-import": {
 			"version": "11.1.0",
 			"resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-11.1.0.tgz",
-			"integrity": "sha1-Vck2LJGSmU7GiGXSJEGd8dspgfA=",
+			"integrity": "sha512-5l327iI75POonjxkXgdRCUS+AlzAdBx4pOvMEhTKTCjb1p8IEeVR9yx3cPbmN7LIWJLbfnIXxAhoB4jpD0c/Cw==",
 			"dev": true,
 			"requires": {
 				"postcss": "6.0.22",
@@ -10387,7 +10400,7 @@
 				"source-map": {
 					"version": "0.6.1",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 					"dev": true
 				},
 				"supports-color": {
@@ -11275,6 +11288,14 @@
 			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-1.0.0.tgz",
 			"integrity": "sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs="
 		},
+		"queue-fifo": {
+			"version": "0.2.5",
+			"resolved": "https://registry.npmjs.org/queue-fifo/-/queue-fifo-0.2.5.tgz",
+			"integrity": "sha512-GrHy3RDy0BOEVjelr+htts/QJyZAJr+7m4TisCA+RlUSsegQT6EGOf+NyxLDhSRflFI5vq3aADFOR/tNZCasxg==",
+			"requires": {
+				"dbly-linked-list": "0.2.0"
+			}
+		},
 		"quick-lru": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
@@ -11814,7 +11835,7 @@
 		"retry-request": {
 			"version": "3.3.1",
 			"resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.3.1.tgz",
-			"integrity": "sha1-+3EnYjWmF+l1Uem+c3q1uRWR+54=",
+			"integrity": "sha512-PjAmtWIxjNj4Co/6FRtBl8afRP3CxrrIAnUzb1dzydfROd+6xt7xAebFeskgQgkfFf8NmzrXIoaB3HxmswXyxw==",
 			"requires": {
 				"request": "2.87.0",
 				"through2": "2.0.3"
@@ -13014,7 +13035,7 @@
 		"stylelint-order": {
 			"version": "0.8.1",
 			"resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-0.8.1.tgz",
-			"integrity": "sha1-Nfca86FZVBVODpnlZGuj1vvjT40=",
+			"integrity": "sha512-8mp1P2wnI9XShYXVXDsxVigE2eXnc0C2O4ktbwUvTBwjCP4xZskIbUVxp1evSG3OK4R7hXVNl/2BnJCZkrcc/w==",
 			"dev": true,
 			"requires": {
 				"lodash": "4.17.10",
@@ -13062,7 +13083,7 @@
 				"source-map": {
 					"version": "0.6.1",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 					"dev": true
 				},
 				"supports-color": {
@@ -13632,7 +13653,7 @@
 		"uc.micro": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.5.tgz",
-			"integrity": "sha1-DGXxX4FaoItWCmHOi023/8P0U3Y="
+			"integrity": "sha512-JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg=="
 		},
 		"uglify-js": {
 			"version": "2.8.29",
@@ -14429,7 +14450,7 @@
 		"xml2js": {
 			"version": "0.4.19",
 			"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
-			"integrity": "sha1-aGwg8hMgnpSr8NG88e+qKRx4J6c=",
+			"integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
 			"requires": {
 				"sax": "1.2.1",
 				"xmlbuilder": "9.0.7"
diff --git a/server/methods/saveUserPreferences.js b/server/methods/saveUserPreferences.js
index f0516a11cf9f..b13ecc3d41bc 100644
--- a/server/methods/saveUserPreferences.js
+++ b/server/methods/saveUserPreferences.js
@@ -69,7 +69,7 @@ Meteor.methods({
 
 		// propagate changed notification preferences
 		Meteor.defer(() => {
-			if (oldDesktopNotifications !== settings.desktopNotifications) {
+			if (settings.desktopNotifications && oldDesktopNotifications !== settings.desktopNotifications) {
 				if (settings.desktopNotifications === 'default') {
 					RocketChat.models.Subscriptions.clearDesktopNotificationUserPreferences(user._id);
 				} else {
@@ -77,7 +77,7 @@ Meteor.methods({
 				}
 			}
 
-			if (oldMobileNotifications !== settings.mobileNotifications) {
+			if (settings.mobileNotifications && oldMobileNotifications !== settings.mobileNotifications) {
 				if (settings.mobileNotifications === 'default') {
 					RocketChat.models.Subscriptions.clearMobileNotificationUserPreferences(user._id);
 				} else {
@@ -85,7 +85,7 @@ Meteor.methods({
 				}
 			}
 
-			if (oldEmailNotifications !== settings.emailNotificationMode) {
+			if (settings.emailNotificationMode && oldEmailNotifications !== settings.emailNotificationMode) {
 				if (settings.emailNotificationMode === 'default') {
 					RocketChat.models.Subscriptions.clearEmailNotificationUserPreferences(user._id);
 				} else {
diff --git a/server/startup/migrations/v129.js b/server/startup/migrations/v129.js
new file mode 100644
index 000000000000..17a92c8a7ceb
--- /dev/null
+++ b/server/startup/migrations/v129.js
@@ -0,0 +1,60 @@
+RocketChat.Migrations.add({
+	version: 129,
+	up() {
+		RocketChat.models.Users.find({
+			$or: [
+				{ 'settings.preferences.desktopNotifications': { $exists: true, $ne: 'default' } },
+				{ 'settings.preferences.mobileNotifications': { $exists: true, $ne: 'default' } },
+				{ 'settings.preferences.emailNotificationMode': { $exists: true, $ne: 'default' } }
+			]
+		}, {
+			fields: {
+				'settings.preferences.desktopNotifications': 1,
+				'settings.preferences.mobileNotifications': 1,
+				'settings.preferences.emailNotificationMode': 1
+			}
+		}).forEach(user => {
+			if (user.settings.preferences.desktopNotifications && user.settings.preferences.desktopNotifications !== 'default') {
+				RocketChat.models.Subscriptions.update({
+					'u._id': user._id,
+					desktopPrefOrigin: 'user',
+					desktopNotifications: null
+				}, {
+					$set: {
+						desktopNotifications: user.settings.preferences.desktopNotifications
+					}
+				}, {
+					multi: true
+				});
+			}
+
+			if (user.settings.preferences.mobileNotifications && user.settings.preferences.mobileNotifications !== 'default') {
+				RocketChat.models.Subscriptions.update({
+					'u._id': user._id,
+					mobilePrefOrigin: 'user',
+					mobilePushNotifications: null
+				}, {
+					$set: {
+						mobilePushNotifications: user.settings.preferences.mobileNotifications
+					}
+				}, {
+					multi: true
+				});
+			}
+
+			if (user.settings.preferences.emailNotificationMode && user.settings.preferences.emailNotificationMode !== 'default') {
+				RocketChat.models.Subscriptions.update({
+					'u._id': user._id,
+					emailPrefOrigin: 'user',
+					emailNotifications: null
+				}, {
+					$set: {
+						emailNotifications: user.settings.preferences.emailNotificationMode === 'disabled' || user.settings.preferences.emailNotificationMode === 'nothing' ? 'nothing' : 'mentions'
+					}
+				}, {
+					multi: true
+				});
+			}
+		});
+	}
+});

From 8b908bad87f5578f2a9a982ffdf2e59f5df756c7 Mon Sep 17 00:00:00 2001
From: Gabriel Delavald <gdelavald@gmail.com>
Date: Tue, 3 Jul 2018 09:03:09 -0300
Subject: [PATCH 25/29] [FIX] Livestream muted when audio only option was
 enabled (#11267)

---
 .../client/views/liveStreamView.html                   | 10 ----------
 .../client/imports/components/popout.css               |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/packages/rocketchat-livestream/client/views/liveStreamView.html b/packages/rocketchat-livestream/client/views/liveStreamView.html
index 43bec7b18288..765b2b52bcf7 100644
--- a/packages/rocketchat-livestream/client/views/liveStreamView.html
+++ b/packages/rocketchat-livestream/client/views/liveStreamView.html
@@ -1,15 +1,5 @@
 <template name="liveStreamView">
   <div class="streaming-popup">
-    <!-- <iframe width="356" height="350" src="{{ streamingSource }}"
-      frameborder="0" gesture="media" allow="encrypted-media" allowfullscreen>
-    </iframe> -->
-
     <div id="ytplayer"></div>
-
-    <!-- <object width="356" height="350" class="streaming-object">
-      <param name="movie" value="{{ streamingSource }}" />
-      <param name="allowscriptaccess" value="always" />
-      <embed width="356" height="350" src="{{ streamingSource }}" class="youtube-player" type="text/html" allowscriptaccess="always" allowfullscreen="true" />
-    </object> -->
   </div>
 </template>
diff --git a/packages/rocketchat-theme/client/imports/components/popout.css b/packages/rocketchat-theme/client/imports/components/popout.css
index 96ba48dec29d..8b774f08bc5f 100644
--- a/packages/rocketchat-theme/client/imports/components/popout.css
+++ b/packages/rocketchat-theme/client/imports/components/popout.css
@@ -180,7 +180,7 @@
 
 		&.rc-popout__content {
 			height: 0px;
-			visibility: hidden;
+			overflow: hidden;
 
 			& .streaming-object {
 				visibility: 'hidden';

From c37a90aabea2ca986219dd12b67d61df2e2d867e Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso@tassoevan.me>
Date: Tue, 3 Jul 2018 17:39:29 -0300
Subject: [PATCH 26/29] [IMPROVE] Setup Wizard username validation, step
 progress and optin/optout (#11254)

Closes #11198

- [x] Show all steps on info box
- [x] Properly display errors in registration process of admin user
- [x] Break steps in subtemplates
- [x] Redesign "Register Server" step
      ![Register Server](https://user-images.githubusercontent.com/2263066/42013253-cd691bc2-7a72-11e8-8832-fe9ccd9e89b4.png)
- [x] Update end-to-end tests
---
 packages/rocketchat-i18n/i18n/en.i18n.json    |  14 +
 .../rocketchat-lib/server/startup/settings.js |   3 +
 .../rocketchat-setup-wizard/client/final.html |  18 +
 .../rocketchat-setup-wizard/client/final.js   |  51 ++
 .../client/setupWizard.html                   | 360 +++++++------
 .../client/setupWizard.js                     | 509 ++++++++++--------
 packages/rocketchat-setup-wizard/package.js   |   4 +-
 .../server/getSetupWizardParameters.js        |  18 +
 .../server/lib/getWizardSettings.js           |   9 -
 .../imports/components/setup-wizard.css       | 143 ++++-
 tests/end-to-end/ui/00-login.js               |  18 +
 tests/pageobjects/setup-wizard.page.js        |   2 +
 12 files changed, 713 insertions(+), 436 deletions(-)
 create mode 100644 packages/rocketchat-setup-wizard/client/final.html
 create mode 100644 packages/rocketchat-setup-wizard/client/final.js
 create mode 100644 packages/rocketchat-setup-wizard/server/getSetupWizardParameters.js
 delete mode 100644 packages/rocketchat-setup-wizard/server/lib/getWizardSettings.js

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 4c8582bfa328..96b4e6c56eee 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -234,6 +234,7 @@
   "Allow_Invalid_SelfSigned_Certs": "Allow Invalid Self-Signed Certs",
   "Allow_Invalid_SelfSigned_Certs_Description": "Allow invalid and self-signed SSL certificate's for link validation and previews.",
   "Allow_switching_departments": "Allow Visitor to Switch Departments",
+  "Allow_Marketing_Emails": "Allow Marketing Emails",
   "Alphabetical": "Alphabetical",
   "Always_open_in_new_window": "Always Open in New Window",
   "Analytics_features_enabled": "Features Enabled",
@@ -1370,6 +1371,7 @@
   "InternalHubot_Username_Description": "This must be a valid username of a bot registered on your server.",
   "Invalid_confirm_pass": "The password confirmation does not match password",
   "Invalid_email": "The email entered is invalid",
+  "Invalid_username": "The username entered is invalid",
   "Invalid_Export_File": "The file uploaded isn't a valid %s export file.",
   "Invalid_Import_File_Type": "Invalid Import file type.",
   "Invalid_name": "The name must not be empty",
@@ -2035,6 +2037,17 @@
   "Regenerate_codes": "Regenerate codes",
   "Register": "Register a new account",
   "Register_Server": "Register Server",
+  "Register_Server_Info": "Use the preconfigured gateways and proxies provided by Rocket.Chat Technologies Corp.",
+  "Register_Server_Registered": "Register to access",
+  "Register_Server_Registered_Push_Notifications": "Mobile push notifications gateway",
+  "Register_Server_Registered_Livechat": "Livechat omnichannel proxy",
+  "Register_Server_Registered_OAuth": "OAuth proxy for social network",
+  "Register_Server_Registered_Marketplace": "Apps Marketplace",
+  "Register_Server_Opt_In": "Newsletter, offers and product updates",
+  "Register_Server_Standalone": "Keep standalone, you'll need to",
+  "Register_Server_Standalone_Service_Providers": "Create accounts with service providers",
+  "Register_Server_Standalone_Update_Settings": "Update the preconfigured settings",
+  "Register_Server_Standalone_Own_Certificates": "Recompile the mobile apps with your own certificates",
   "Registration": "Registration",
   "Registration_Succeeded": "Registration Succeeded",
   "Registration_via_Admin": "Registration via Admin",
@@ -2215,6 +2228,7 @@
   "Shared_Location": "Shared Location",
   "Should_be_a_URL_of_an_image": "Should be a URL of an image.",
   "Should_exists_a_user_with_this_username": "The user must already exist.",
+  "Show_Setup_Wizard": "Show Setup Wizard",
   "Show_agent_email": "Show agent email",
   "Show_all": "Show All",
   "Show_Avatars": "Show Avatars",
diff --git a/packages/rocketchat-lib/server/startup/settings.js b/packages/rocketchat-lib/server/startup/settings.js
index 4d8a0e329f3f..cd870f383ef4 100644
--- a/packages/rocketchat-lib/server/startup/settings.js
+++ b/packages/rocketchat-lib/server/startup/settings.js
@@ -2902,6 +2902,9 @@ RocketChat.settings.addGroup('Setup_Wizard', function() {
 				order: 2
 			}
 		});
+		this.add('Allow_Marketing_Emails', true, {
+			type: 'boolean'
+		});
 	});
 });
 
diff --git a/packages/rocketchat-setup-wizard/client/final.html b/packages/rocketchat-setup-wizard/client/final.html
new file mode 100644
index 000000000000..f44289e9b1c5
--- /dev/null
+++ b/packages/rocketchat-setup-wizard/client/final.html
@@ -0,0 +1,18 @@
+<template name="setupWizardFinal">
+	<div class="setup-wizard">
+		<div class="setup-wizard-final">
+			<header class="setup-wizard-info__header setup-wizard-final__header">
+				<img class="setup-wizard-info__header-logo" src="images/logo/logo-black.svg">
+			</header>
+			<main class="setup-wizard-final__box">
+					<span class="setup-wizard-forms__header-step">{{_ "Launched_successfully"}}</span>
+					<h1 class="setup-wizard-info__content-title setup-wizard-final__box-title">{{_ "Your_workspace_is_ready"}}</h1>
+					<span class="setup-wizard-final__link-text">{{_ "Your_server_link"}}</span>
+					<span class="setup-wizard-final__link">{{siteUrl}}</span>
+					<button class="rc-button rc-button--primary js-finish">
+						<span>{{_ "Go_to_your_workspace"}}</span>
+					</button>
+			</main>
+		</div>
+	</div>
+</template>
diff --git a/packages/rocketchat-setup-wizard/client/final.js b/packages/rocketchat-setup-wizard/client/final.js
new file mode 100644
index 000000000000..3fea0f68212c
--- /dev/null
+++ b/packages/rocketchat-setup-wizard/client/final.js
@@ -0,0 +1,51 @@
+Template.setupWizardFinal.onCreated(function() {
+	const isSetupWizardDone = localStorage.getItem('wizardFinal');
+	if (isSetupWizardDone === null) {
+		FlowRouter.go('setup-wizard');
+	}
+
+	this.autorun(c => {
+		const showSetupWizard = RocketChat.settings.get('Show_Setup_Wizard');
+		if (!showSetupWizard) {
+			// Setup Wizard state is not defined yet
+			return;
+		}
+
+		const userId = Meteor.userId();
+		const user = userId && RocketChat.models.Users.findOne(userId, { fields: { status: true } });
+		if (userId && (!user || !user.status)) {
+			// User and its status are not defined yet
+			return;
+		}
+
+		c.stop();
+
+		const isComplete = showSetupWizard === 'completed';
+		const noUserLoggedInAndIsNotPending = !userId && showSetupWizard !== 'pending';
+		const userIsLoggedButIsNotAdmin = userId && !RocketChat.authz.hasRole(userId, 'admin');
+		if (isComplete || noUserLoggedInAndIsNotPending || userIsLoggedButIsNotAdmin) {
+			FlowRouter.go('home');
+			return;
+		}
+	});
+});
+
+Template.setupWizardFinal.onRendered(function() {
+	$('#initial-page-loading').remove();
+});
+
+Template.setupWizardFinal.events({
+	'click .js-finish'() {
+		RocketChat.settings.set('Show_Setup_Wizard', 'completed', function() {
+			localStorage.removeItem('wizard');
+			localStorage.removeItem('wizardFinal');
+			FlowRouter.go('home');
+		});
+	}
+});
+
+Template.setupWizardFinal.helpers({
+	siteUrl() {
+		return RocketChat.settings.get('Site_Url');
+	}
+});
diff --git a/packages/rocketchat-setup-wizard/client/setupWizard.html b/packages/rocketchat-setup-wizard/client/setupWizard.html
index 6f082939f37c..26a4613d4f3b 100644
--- a/packages/rocketchat-setup-wizard/client/setupWizard.html
+++ b/packages/rocketchat-setup-wizard/client/setupWizard.html
@@ -1,196 +1,214 @@
-<template name="setupWizardFinal">
-	<div class="setup-wizard">
-		<div class="setup-wizard-final">
-			<header class="setup-wizard-info__header setup-wizard-final__header">
-				<img class="setup-wizard-info__header-logo" src="images/logo/logo-black.svg">
-			</header>
-			<main class="setup-wizard-final__box">
-					<span class="setup-wizard-forms__header-step">{{_ "Launched_successfully"}}</span>
-					<h1 class="setup-wizard-info__content-title setup-wizard-final__box-title">{{_ "Your_workspace_is_ready"}}</h1>
-					<span class="setup-wizard-final__link-text">{{_ "Your_server_link"}}</span>
-					<span class="setup-wizard-final__link">{{siteUrl}}</span>
-					<button class="rc-button rc-button--primary js-finish">
-						<span>{{_ "Go_to_your_workspace"}}</span>
-					</button>
-			</main>
-		</div>
-	</div>
-</template>
-
 <template name="setupWizard">
 	<div class="rc-old connection-status">
 		{{> status}}
 	</div>
 	<div class="setup-wizard">
-		<section class="setup-wizard-info">
-			<header class="setup-wizard-info__header">
-				<img class="setup-wizard-info__header-logo" src="images/logo/logo-black.svg">
-				<span class="setup-wizard-info__header-tag">{{_ "Setup_Wizard"}}</span>
-			</header>
-			<div class="setup-wizard-info__content">
-				<h1 class="setup-wizard-info__content-title">{{_ "Setup_Wizard"}}</h1>
-				<p class="setup-wizard-info__content-text">{{_ "Setup_Wizard_Info"}}</p>
-				<ol class="setup-wizard-info__steps">
-					{{#unless hasAdmin}}<li class="setup-wizard-info__steps-item {{itemModifier 1}}">{{headerTitle 1}}</li>{{/unless}}
-					<li class="setup-wizard-info__steps-item {{itemModifier 2}}">{{headerTitle 2}}{{#unless hasAdmin}}<span class="setup-wizard-info__steps-item-bonding"></span>{{/unless}}</li>
-					<li class="setup-wizard-info__steps-item {{itemModifier 3}}">{{headerTitle 3}}<span class="setup-wizard-info__steps-item-bonding"></span></li>
-					{{#unless hasAdmin}}<li class="setup-wizard-info__steps-item {{itemModifier 4}}">{{headerTitle 4}}<span class="setup-wizard-info__steps-item-bonding"></span></li>{{/unless}}
-				</ol>
-			</div>
-		</section>
+		{{> setupWizardInfo infoArgs}}
+
 		<section class="setup-wizard-forms">
 			<div class="setup-wizard-forms__wrapper">
-				<div class="setup-wizard-forms__box">
+				<form class="setup-wizard-forms__box {{formLoadStateClass}}" novalidate>
 					<header class="setup-wizard-forms__header">
 						<span class="setup-wizard-forms__header-step">{{_ "Step"}} {{currentStep}}</span>
-						<h1 class="setup-wizard-forms__header-title">{{headerTitle}}</h1>
+						<h1 class="setup-wizard-forms__header-title">{{_ currentStepTitle}}</h1>
 					</header>
-					<main class="setup-wizard-forms__content">
-						<div class="setup-wizard-forms__content-step {{#if $eq currentStep 1}}setup-wizard-forms__content-step--active{{/if}}">
-							<div class="rc-input">
-								<label class="rc-input__label">
-									<div class="rc-input__title">{{_ "Name"}}</div>
-									<div class="rc-input__wrapper">
-										<div class="rc-input__icon">
-											{{> icon block="rc-input__icon-sv" icon="user"}}
-										</div>
-										<input type="text" class="rc-input__element js-setting-data" name="registration-name" placeholder="{{_ 'Type_your_name'}}" value="{{getValue 'registration-name'}}">
-									</div>
-								</label>
-							</div>
-							<div class="rc-input">
-								<label class="rc-input__label">
-									<div class="rc-input__title">{{_ "Username"}}</div>
-									<div class="rc-input__wrapper">
-										<div class="rc-input__icon">
-											{{> icon block="rc-input__icon-sv" icon="at"}}
-										</div>
-										<input type="text" class="rc-input__element js-setting-data" name="registration-username" placeholder="{{_ 'Type_your_username'}}" value="{{getValue 'registration-username'}}">
-									</div>
-								</label>
-							</div>
-							<div class="rc-input">
-								<label class="rc-input__label">
-									<div class="rc-input__title">{{_ "Organization_Email"}}</div>
-									<div class="rc-input__wrapper">
-										<div class="rc-input__icon">
-											{{> icon block="rc-input__icon-sv" icon="mail"}}
-										</div>
-										<input type="email" class="rc-input__element js-setting-data" name="registration-email" placeholder="{{_ 'Type_your_email'}}" value="{{getValue 'registration-email'}}">
-									</div>
-								</label>
-								{{#if invalidEmail}}
-									<div class="rc-input__error">
-										<div class="rc-input__error-icon">
-											{{> icon block="rc-input__error-icon" icon="warning" classes="rc-input__error-icon-svg"}}
-										</div>
-										<div class="rc-input__error-message">{{_ "Invalid_email"}}</div>
-									</div>
-								{{/if}}
-							</div>
-							<div class="rc-input">
-								<label class="rc-input__label">
-									<div class="rc-input__title">{{_ "Password"}}</div>
-									<div class="rc-input__wrapper">
-										<div class="rc-input__icon">
-											{{> icon block="rc-input__icon-sv" icon="key"}}
-										</div>
-										<input type="password" class="rc-input__element js-setting-data" name="registration-pass" placeholder="{{_ 'Type_your_password'}}">
-									</div>
-								</label>
-							</div>
-						</div>
-						<div class="setup-wizard-forms__content-step {{showStep}}">
-							{{#each getSettings currentStep}}
-								{{#if $eq type 'select'}}
-									<div class="rc-input">
-										<label class="rc-input__label">
-											<div class="rc-input__title">{{_ i18nLabel}}</div>
-											<div class="rc-select">
-												<select class="rc-select__element js-setting-data" name="{{_id}}">
-													<option value="" disabled selected="{{selectedValue _id undefined}}">{{_ "Select_an_option"}}</option>
-													{{#each values}}
-														<option class="rc-select__option" value="{{key}}" selected="{{selectedValue ../_id key}}">{{_ i18nLabel}}</option>
-													{{/each}}
-												</select>
-												{{> icon block="rc-select__arrow" icon="arrow-down" }}
-											</div>
-										</label>
-									</div>
-								{{/if}}
 
-								{{#if $eq type 'string'}}
-									<div class="rc-input">
-										<label class="rc-input__label">
-											<div class="rc-input__title">{{_ i18nLabel}}</div>
-											<div class="rc-input__wrapper">
-												<input type="text" class="rc-input__element js-setting-data" name="{{_id}}" value="{{getValue _id}}">
-											</div>
-										</label>
-									</div>
-								{{/if}}
-
-								{{#if $eq type 'language'}}
-									<div class="rc-input">
-										<label class="rc-input__label">
-											<div class="rc-input__title">{{_ i18nLabel}}</div>
-											<div class="rc-select">
-												<select class="rc-select__element js-setting-data" name="{{_id}}">
-													{{#each languages}}
-														<option class="rc-select__option" value="{{key}}" selected="{{selectedValue ../_id key}}" dir="auto">{{name}}</option>
-													{{/each}}
-												</select>
-												{{> icon block="rc-select__arrow" icon="arrow-down" }}
-											</div>
-										</label>
-									</div>
-								{{/if}}
-							{{/each}}
-						</div>
-						<div class="setup-wizard-forms__content-step {{#if $eq currentStep 4}}setup-wizard-forms__content-step--active{{/if}}">
-							<p class="setup-wizard-forms__content-text">To receive free Rocket.Chat supplied features you need to register your server.</p>
-							<form class="setup-wizard-forms__content-register">
-								<label class="setup-wizard-forms__content-register-option">
-									<div class="setup-wizard-forms__content-register-radio">
-										<input type="radio" name="registerServer" value="true" class="setup-wizard-forms__content-register-radio-element js-setting-data" checked>
-										<span class="setup-wizard-forms__content-register-radio-fake"></span>
-										<span class="setup-wizard-forms__content-register-radio-text">Registered Server</span>
-									</div>
-									<ul>
-										<li class="setup-wizard-forms__content-register-item">{{> icon block="setup-wizard-forms__content-register-radio-icon" icon="check"}}Mobile push notifications</li>
-										<li class="setup-wizard-forms__content-register-item">{{> icon block="setup-wizard-forms__content-register-radio-icon" icon="check"}}Omnichannel proxy</li>
-										<li class="setup-wizard-forms__content-register-item">{{> icon block="setup-wizard-forms__content-register-radio-icon" icon="check"}}Social Network oAuth proxy</li>
-										<li class="setup-wizard-forms__content-register-item">{{> icon block="setup-wizard-forms__content-register-radio-icon" icon="check"}}Apps Marketplace</li>
-									</ul>
-								</label>
-								<label class="setup-wizard-forms__content-register-option">
-										<div class="setup-wizard-forms__content-register-radio">
-											<input type="radio" name="registerServer" value="false" class="setup-wizard-forms__content-register-radio-element js-setting-data">
-											<span class="setup-wizard-forms__content-register-radio-fake"></span>
-											<span class="setup-wizard-forms__content-register-radio-text">Standalone Server</span>
-										</div>
-										<ul>
-											<li class="setup-wizard-forms__content-register-item">{{> icon block="setup-wizard-forms__content-register-radio-icon" icon="cross"}}Mobile push notifications</li>
-											<li class="setup-wizard-forms__content-register-item">{{> icon block="setup-wizard-forms__content-register-radio-icon" icon="cross"}}Omnichannel proxy</li>
-											<li class="setup-wizard-forms__content-register-item">{{> icon block="setup-wizard-forms__content-register-radio-icon" icon="cross"}}Social Network oAuth proxy</li>
-											<li class="setup-wizard-forms__content-register-item">{{> icon block="setup-wizard-forms__content-register-radio-icon" icon="cross"}}Apps Marketplace</li>
-										</ul>
-									</label>
-							</form>
-						</div>
+					<main class="setup-wizard-forms__content">
+						{{> setupWizardAdminInfo adminInfoArgs}}
+						{{> setupWizardCustomStep (customStepArgs 2)}}
+						{{> setupWizardCustomStep (customStepArgs 3)}}
+						{{> setupWizardRegisterServer registerServerArgs}}
 					</main>
+
 					<footer class="setup-wizard-forms__footer">
 						{{#if showBackButton}}
 							<button class="rc-button rc-button--secondary setup-wizard-forms__footer-back">
 								<span>{{_ "Back"}}</span>
 							</button>
 						{{/if}}
-						<button class="rc-button rc-button--primary setup-wizard-forms__footer-next" {{isDisabled}}>
+						<button type="submit" class="rc-button rc-button--primary setup-wizard-forms__footer-next" disabled={{isContinueDisabled}}>
 							<span>{{_ "Continue"}}</span>
 						</button>
 					</footer>
-				</div>
+				</form>
 			</div>
 		</section>
 	</div>
 </template>
+
+<template name="setupWizardInfo">
+	<section class="setup-wizard-info">
+		<header class="setup-wizard-info__header">
+			<img class="setup-wizard-info__header-logo" src="images/logo/logo-black.svg">
+			<span class="setup-wizard-info__header-tag">{{_ "Setup Wizard"}}</span>
+		</header>
+		<div class="setup-wizard-info__content">
+			<h1 class="setup-wizard-info__content-title">{{_ "Setup_Wizard"}}</h1>
+			<p class="setup-wizard-info__content-text">{{_ "Setup_Wizard_Info"}}</p>
+			<ol class="setup-wizard-info__steps">
+				<li class="setup-wizard-info__steps-item {{stepItemModifier 1}}">{{_ (stepTitle 1)}}</li>
+				<li class="setup-wizard-info__steps-item {{stepItemModifier 2}}">{{_ (stepTitle 2)}}<span class="setup-wizard-info__steps-item-bonding"></span></li>
+				<li class="setup-wizard-info__steps-item {{stepItemModifier 3}}">{{_ (stepTitle 3)}}<span class="setup-wizard-info__steps-item-bonding"></span></li>
+				<li class="setup-wizard-info__steps-item {{stepItemModifier 4}}">{{_ (stepTitle 4)}}<span class="setup-wizard-info__steps-item-bonding"></span></li>
+			</ol>
+		</div>
+	</section>
+</template>
+
+<template name="setupWizardAdminInfo">
+	<div class="setup-wizard-forms__content-step {{#if $eq currentStep 1}}setup-wizard-forms__content-step--active{{/if}}">
+		<div class="rc-input">
+			<label class="rc-input__label">
+				<div class="rc-input__title">{{_ "Name"}}</div>
+				<div class="rc-input__wrapper">
+					<div class="rc-input__icon">
+						{{> icon block="rc-input__icon-sv" icon="user"}}
+					</div>
+					<input type="text" class="rc-input__element js-setting-data" name="registration-name" placeholder="{{_ 'Type_your_name'}}" value="{{name}}">
+				</div>
+			</label>
+		</div>
+		<div class="rc-input {{#if invalidUsername}}rc-input--error{{/if}}">
+			<label class="rc-input__label">
+				<div class="rc-input__title">{{_ "Username"}}</div>
+				<div class="rc-input__wrapper">
+					<div class="rc-input__icon">
+						{{> icon block="rc-input__icon-sv" icon="at"}}
+					</div>
+					<input type="text" class="rc-input__element js-setting-data" name="registration-username" placeholder="{{_ 'Type_your_username'}}" value="{{username}}">
+				</div>
+			</label>
+			{{#if invalidUsername}}
+				<div class="rc-input__error">
+					<div class="rc-input__error-icon">
+						{{> icon block="rc-input__error-icon" icon="warning" classes="rc-input__error-icon-svg"}}
+					</div>
+					<div class="rc-input__error-message">{{_ "Invalid_username"}}</div>
+				</div>
+			{{/if}}
+		</div>
+		<div class="rc-input {{#if invalidEmail}}rc-input--error{{/if}}">
+			<label class="rc-input__label">
+				<div class="rc-input__title">{{_ "Organization_Email"}}</div>
+				<div class="rc-input__wrapper">
+					<div class="rc-input__icon">
+						{{> icon block="rc-input__icon-sv" icon="mail"}}
+					</div>
+					<input type="email" class="rc-input__element js-setting-data" name="registration-email" placeholder="{{_ 'Type_your_email'}}" value="{{email}}">
+				</div>
+			</label>
+			{{#if invalidEmail}}
+				<div class="rc-input__error">
+					<div class="rc-input__error-icon">
+						{{> icon block="rc-input__error-icon" icon="warning" classes="rc-input__error-icon-svg"}}
+					</div>
+					<div class="rc-input__error-message">{{_ "Invalid_email"}}</div>
+				</div>
+			{{/if}}
+		</div>
+		<div class="rc-input">
+			<label class="rc-input__label">
+				<div class="rc-input__title">{{_ "Password"}}</div>
+				<div class="rc-input__wrapper">
+					<div class="rc-input__icon">
+						{{> icon block="rc-input__icon-sv" icon="key"}}
+					</div>
+					<input type="password" class="rc-input__element js-setting-data" name="registration-pass" placeholder="{{_ 'Type_your_password'}}" value="{{password}}">
+				</div>
+			</label>
+		</div>
+	</div>
+</template>
+
+<template name="setupWizardRegisterServer">
+	<div class="setup-wizard-forms__content-step {{#if $eq currentStep 4}}setup-wizard-forms__content-step--active{{/if}}">
+		<p class="setup-wizard-forms__content-text">{{_ "Register_Server_Info"}}</p>
+		<form class="setup-wizard-forms__content-register">
+			<label class="setup-wizard-forms__content-register-option {{#if registerServer}}setup-wizard-forms__content-register-option--selected{{/if}}">
+				<div class="setup-wizard-forms__content-register-radio">
+					<input type="radio" name="registerServer" value="true" class="setup-wizard-forms__content-register-radio-element" checked="{{registerServer}}">
+					<span class="setup-wizard-forms__content-register-radio-fake"></span>
+					<span class="setup-wizard-forms__content-register-radio-text">{{_ "Register_Server_Registered"}}</span>
+				</div>
+				<ul class="setup-wizard-forms__content-register-items">
+					<li class="setup-wizard-forms__content-register-item">{{> icon block="setup-wizard-forms__content-register-radio-icon" icon="check"}}{{_ "Register_Server_Registered_Push_Notifications"}}</li>
+					<li class="setup-wizard-forms__content-register-item">{{> icon block="setup-wizard-forms__content-register-radio-icon" icon="check"}}{{_ "Register_Server_Registered_Livechat"}}</li>
+					<li class="setup-wizard-forms__content-register-item">{{> icon block="setup-wizard-forms__content-register-radio-icon" icon="check"}}{{_ "Register_Server_Registered_OAuth"}}</li>
+					<li class="setup-wizard-forms__content-register-item">{{> icon block="setup-wizard-forms__content-register-radio-icon" icon="check"}}{{_ "Register_Server_Registered_Marketplace"}}</li>
+				</ul>
+				<div>
+					<label class="setup-wizard-forms__content-register-checkbox">
+						<input type="checkbox" name="optIn" value="true" class="setup-wizard-forms__content-register-checkbox-element" checked="{{optIn}}" disabled={{$not registerServer}}>
+						<span class="setup-wizard-forms__content-register-checkbox-fake">
+								{{> icon block="setup-wizard-forms__content-register-checkbox-fake-icon" icon="check"}}
+						</span>
+						<span class="setup-wizard-forms__content-register-checkbox-text">{{_ "Register_Server_Opt_In"}}</span>
+					</label>
+				</div>
+			</label>
+			<label class="setup-wizard-forms__content-register-option {{#if $not registerServer}}setup-wizard-forms__content-register-option--selected{{/if}} {{#if $not allowStandaloneServer}}setup-wizard-forms__content-register-option--disabled{{/if}}">
+				<div class="setup-wizard-forms__content-register-radio">
+					<input type="radio" name="registerServer" value="false" class="setup-wizard-forms__content-register-radio-element" checked="{{$not registerServer}}" disabled={{$not allowStandaloneServer}}>
+					<span class="setup-wizard-forms__content-register-radio-fake"></span>
+					<span class="setup-wizard-forms__content-register-radio-text">{{_ "Register_Server_Standalone"}}</span>
+				</div>
+				<ul class="setup-wizard-forms__content-register-items">
+					<li class="setup-wizard-forms__content-register-item">{{> icon block="setup-wizard-forms__content-register-radio-icon" icon="circle"}}{{_ "Register_Server_Standalone_Service_Providers"}}</li>
+					<li class="setup-wizard-forms__content-register-item">{{> icon block="setup-wizard-forms__content-register-radio-icon" icon="circle"}}{{_ "Register_Server_Standalone_Update_Settings"}}</li>
+					<li class="setup-wizard-forms__content-register-item">{{> icon block="setup-wizard-forms__content-register-radio-icon" icon="circle"}}{{_ "Register_Server_Standalone_Own_Certificates"}}</li>
+				</ul>
+			</label>
+		</form>
+	</div>
+</template>
+
+<template name="setupWizardCustomStep">
+	<div class="setup-wizard-forms__content-step {{#if $eq currentStep step}}setup-wizard-forms__content-step--active{{/if}}">
+		{{#each settings}}
+			{{#if $eq type 'string'}}
+				<div class="rc-input">
+					<label class="rc-input__label">
+						<div class="rc-input__title">{{_ label}}</div>
+						<div class="rc-input__wrapper">
+							<input type="text" class="rc-input__element js-setting-data" name="{{id}}" value="{{value}}">
+						</div>
+					</label>
+				</div>
+			{{/if}}
+
+			{{#if $eq type 'select'}}
+				<div class="rc-input">
+					<label class="rc-input__label">
+						<div class="rc-input__title">{{_ label}}</div>
+						<div class="rc-select">
+							<select class="rc-select__element js-setting-data" name="{{id}}">
+								<option value="" disabled selected="{{this.isValueSelected undefined}}">{{_ "Select_an_option"}}</option>
+								{{#each options}}
+									<option class="rc-select__option" value="{{optionValue}}" selected="{{this.isValueSelected optionValue}}">{{_ optionLabel}}</option>
+								{{/each}}
+							</select>
+							{{> icon block="rc-select__arrow" icon="arrow-down" }}
+						</div>
+					</label>
+				</div>
+			{{/if}}
+
+			{{#if $eq type 'language'}}
+				<div class="rc-input">
+					<label class="rc-input__label">
+						<div class="rc-input__title">{{_ label}}</div>
+						<div class="rc-select">
+							<select class="rc-select__element js-setting-data" name="{{id}}">
+								<option value="" disabled selected="{{this.isValueSelected undefined}}">{{_ "Default"}}</option>
+								{{#each options}}
+									<option class="rc-select__option" value="{{optionValue}}" selected="{{this.isValueSelected optionValue}}" dir="auto">{{_ optionLabel}}</option>
+								{{/each}}
+							</select>
+							{{> icon block="rc-select__arrow" icon="arrow-down" }}
+						</div>
+					</label>
+				</div>
+			{{/if}}
+		{{/each}}
+	</div>
+</template>
diff --git a/packages/rocketchat-setup-wizard/client/setupWizard.js b/packages/rocketchat-setup-wizard/client/setupWizard.js
index 445cb3b504c9..715ea2e83518 100644
--- a/packages/rocketchat-setup-wizard/client/setupWizard.js
+++ b/packages/rocketchat-setup-wizard/client/setupWizard.js
@@ -1,90 +1,135 @@
-import s from 'underscore.string';
+const cannotSetup = () => {
+	const showSetupWizard = RocketChat.settings.get('Show_Setup_Wizard');
+	if (!showSetupWizard) {
+		// Setup Wizard state is not defined yet
+		return;
+	}
 
-const setSettingsAndGo = (settings, registerServer = true) => {
-	const settingsFilter = Object.entries(settings)
-		.filter(([key]) => !/registration-|registerServer|currentStep/.test(key))
-		.map(([_id, value]) => ({_id, value}));
+	const userId = Meteor.userId();
+	const user = userId && RocketChat.models.Users.findOne(userId, { fields: { status: true } });
+	if (userId && (!user || !user.status)) {
+		// User and its status are not defined yet
+		return;
+	}
 
-	settingsFilter.push({
-		_id: 'Statistics_reporting',
-		value: registerServer
-	});
+	const isComplete = showSetupWizard === 'completed';
+	const noUserLoggedInAndIsNotPending = !userId && showSetupWizard !== 'pending';
+	const userIsLoggedButIsNotAdmin = userId && !RocketChat.authz.hasRole(userId, 'admin');
 
-	RocketChat.settings.batchSet(settingsFilter, function(err) {
-		if (err) {
-			return handleError(err);
+	return isComplete || noUserLoggedInAndIsNotPending || userIsLoggedButIsNotAdmin;
+};
+
+const registerAdminUser = (state, callback) => {
+	const registrationData = Object.entries(state)
+		.filter(([ key ]) => /registration-/.test(key))
+		.map(([ key, value ]) => ([ key.replace('registration-', ''), value ]))
+		.reduce((o, [ key, value ]) => ({ ...o, [key]: value }), {});
+
+	Meteor.call('registerUser', registrationData, error => {
+		if (error) {
+			return handleError(error);
 		}
 
-		localStorage.setItem('wizardFinal', true);
-		FlowRouter.go('setup-wizard-final');
+		RocketChat.callbacks.run('userRegistered');
+		Meteor.loginWithPassword(registrationData.email, registrationData.pass, error => {
+			if (error) {
+				if (error.error === 'error-invalid-email') {
+					toastr.success(t('We_have_sent_registration_email'));
+					return false;
+				} else {
+					return handleError(error);
+				}
+			}
+
+			Session.set('forceLogin', false);
+			Meteor.call('setUsername', registrationData.username, error => {
+				if (error) {
+					return handleError(error);
+				}
+
+				RocketChat.callbacks.run('usernameSet');
+				callback && callback();
+			});
+		});
 	});
 };
 
-Template.setupWizard.onCreated(function() {
-	const userId = Meteor.userId();
-
-	this.autorun((c) => {
-		const Show_Setup_Wizard = RocketChat.settings.get('Show_Setup_Wizard');
-		const user = Meteor.user();
+const persistSettings = (state, callback) => {
+	const settings = Object.entries(state)
+		.filter(([ key ]) => !/registration-|registerServer|optIn|currentStep|invalidUsername|invalidEmail/.test(key))
+		.map(([ _id, value ]) => ({ _id, value }))
+		.concat([
+			{
+				_id: 'Statistics_reporting',
+				value: state['registerServer']
+			},
+			{
+				_id: 'Allow_Marketing_Emails',
+				value: state['optIn']
+			}
+		]);
 
-		// Wait for roles and setup wizard setting
-		if ((userId && (!user || !user.status)) || !Show_Setup_Wizard) {
-			return;
+	RocketChat.settings.batchSet(settings, error => {
+		if (error) {
+			return handleError(error);
 		}
 
-		c.stop();
-
-		if ((!userId && Show_Setup_Wizard !== 'pending') || Show_Setup_Wizard === 'completed' || (userId && !RocketChat.authz.hasRole(userId, 'admin'))) {
-			FlowRouter.go('home');
-		}
+		callback && callback();
 	});
+};
+
+Template.setupWizard.onCreated(function() {
+	this.state = new ReactiveDict();
+	this.state.set('currentStep', 1);
+	this.state.set('registerServer', true);
+	this.state.set('optIn', true);
+
+	this.wizardSettings = new ReactiveVar([]);
+	this.allowStandaloneServer = new ReactiveVar(false);
 
 	if (localStorage.getItem('wizardFinal')) {
 		FlowRouter.go('setup-wizard-final');
+		return;
 	}
 
-	this.hasAdmin = new ReactiveVar(false);
-	this.state = new ReactiveDict();
-	this.wizardSettings = new ReactiveVar([]);
-	this.invalidEmail = new ReactiveVar(false);
+	const jsonString = localStorage.getItem('wizard');
+	const state = jsonString && JSON.parse(jsonString) || {};
+	Object.entries(state).forEach(entry => this.state.set(...entry));
 
-	const storage = JSON.parse(localStorage.getItem('wizard'));
-	if (storage) {
-		Object.entries(storage).forEach(([key, value]) => {
-			this.state.set(key, value);
-		});
-	}
+	this.autorun(c => {
+		const cantSetup = cannotSetup();
+		if (typeof cantSetup === 'undefined') {
+			return;
+		}
 
-	this.autorun(() => {
-		const user = Meteor.user();
-		if (user) {
-			if (!this.hasAdmin.get()) {
-				if (user.roles && user.roles.includes('admin')) {
-					this.state.set('currentStep', 2);
-					this.hasAdmin.set(true);
-				} else {
-					this.hasAdmin.set(false);
-				}
-			}
+		if (cantSetup) {
+			c.stop();
+			FlowRouter.go('home');
+			return;
+		}
+
+		const state = this.state.all();
+		state['registration-pass'] = '';
+		localStorage.setItem('wizard', JSON.stringify(state));
 
-			Meteor.call('getWizardSettings', (error, result) => {
+		if (Meteor.userId()) {
+			Meteor.call('getSetupWizardParameters', (error, { settings, allowStandaloneServer }) => {
 				if (error) {
 					return handleError(error);
 				}
 
-				this.wizardSettings.set(result);
+				this.wizardSettings.set(settings);
+				this.allowStandaloneServer.set(allowStandaloneServer);
 			});
-		} else {
-			this.state.set('currentStep', 1);
-		}
 
-		if (RocketChat.settings.get('Show_Setup_Wizard') === 'completed') {
-			FlowRouter.go('home');
+			if (this.state.get('currentStep') === 1) {
+				this.state.set('currentStep', 2);
+			} else {
+				this.state.set('registration-pass', '');
+			}
+		} else if (this.state.get('currentStep') !== 1) {
+			this.state.set('currentStep', 1);
 		}
-
-		const states = this.state.all();
-		states['registration-pass'] = '';
-		localStorage.setItem('wizard', JSON.stringify(states));
 	});
 });
 
@@ -93,67 +138,83 @@ Template.setupWizard.onRendered(function() {
 });
 
 Template.setupWizard.events({
+	'submit .setup-wizard-forms__box'() {
+		return false;
+	},
 	'click .setup-wizard-forms__footer-next'(e, t) {
-		const currentStep = t.state.get('currentStep');
-		const hasAdmin = t.hasAdmin.get();
-
-		if (!hasAdmin && currentStep === 1) {
-			const emailValue = t.state.get('registration-email');
-			const invalidEmail = !/\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]+\b/i.test(emailValue);
-			t.invalidEmail.set(invalidEmail);
+		switch (t.state.get('currentStep')) {
+			case 1: {
+				const usernameValue = t.state.get('registration-username');
+				const usernameRegex = new RegExp(`^${ RocketChat.settings.get('UTF8_Names_Validation') }$`);
+				t.state.set('invalidUsername', !usernameRegex.test(usernameValue));
+
+				const emailValue = t.state.get('registration-email');
+				const emailRegex = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]+$/i;
+				t.state.set('invalidEmail', !emailRegex.test(emailValue));
+
+				if (t.state.get('invalidUsername') || t.state.get('invalidEmail')) {
+					return false;
+				}
 
-			if (invalidEmail) {
+				registerAdminUser(t.state.all(), () => t.state.set('currentStep', 2));
 				return false;
 			}
-
-			const state = t.state.all();
-			const registration = Object.entries(state).filter(([key]) => /registration-/.test(key));
-			const registrationData = Object.assign(...registration.map(d => ({[d[0].replace('registration-', '')]: d[1]})));
-
-			Meteor.call('registerUser', registrationData, error => {
-				if (error) {
-					return handleError(error);
-				}
-
-				RocketChat.callbacks.run('userRegistered');
-
-				Meteor.loginWithPassword(s.trim(registrationData.email), registrationData.pass, error => {
-					if (error && error.error === 'error-invalid-email') {
-						toastr.success(t('We_have_sent_registration_email'));
-						return false;
-					}
-
-					Session.set('forceLogin', false);
-
-					Meteor.call('setUsername', registrationData.username, error => {
-						if (error) {
-							return handleError(error);
-						}
-
-						RocketChat.callbacks.run('usernameSet');
-					});
+			case 2: {
+				t.state.set('currentStep', 3);
+				return false;
+			}
+			case 3: {
+				t.state.set('currentStep', 4);
+				return false;
+			}
+			case 4: {
+				persistSettings(t.state.all(), () => {
+					localStorage.removeItem('wizard');
+					localStorage.setItem('wizardFinal', true);
+					FlowRouter.go('setup-wizard-final');
 				});
-			});
+				return false;
+			}
 		}
 
-		if (hasAdmin && currentStep === 3) {
-			setSettingsAndGo(t.state.all());
-			return false;
+		return false;
+	},
+	'click .setup-wizard-forms__footer-back'(e, t) {
+		switch (t.state.get('currentStep')) {
+			case 2:
+				t.state.set('currentStep', 1);
+				break;
+			case 3:
+				t.state.set('currentStep', 2);
+				break;
+			case 4:
+				t.state.set('currentStep', 3);
+				break;
 		}
 
-		if (currentStep === 4) {
-			setSettingsAndGo(t.state.all(), JSON.parse(t.state.get('registerServer') || true));
+		return false;
+	},
+	'input .js-setting-data'({ currentTarget: { name, value } }, t) {
+		t.state.set(name, value);
+	},
+	'click input[name="registerServer"]'({ currentTarget: { value } }, t) {
+		const oldValue = t.state.get('registerServer');
+		const newValue = value === 'true';
+		t.state.set('registerServer', newValue);
 
-			return false;
+		if (!oldValue && newValue) {
+			t.state.set('optIn', true);
 		}
 
-		t.state.set('currentStep', currentStep + 1);
-	},
-	'click .setup-wizard-forms__footer-back'(e, t) {
-		t.state.set('currentStep', t.state.get('currentStep') - 1);
+		if (!newValue) {
+			t.state.set('optIn', false);
+		}
+
+		return false;
 	},
-	'input .js-setting-data'(e, t) {
-		t.state.set(e.currentTarget.name, e.currentTarget.value);
+	'click input[name="optIn"]'({ currentTarget: { checked } }, t) {
+		t.state.set('optIn', checked);
+		return false;
 	}
 });
 
@@ -161,144 +222,138 @@ Template.setupWizard.helpers({
 	currentStep() {
 		return Template.instance().state.get('currentStep');
 	},
-	itemModifier(step) {
-		const current = Template.instance().state.get('currentStep');
-
-		if (current === step) {
-			return 'setup-wizard-info__steps-item--active';
-		}
-
-		if (current > step) {
-			return 'setup-wizard-info__steps-item--past';
+	currentStepTitle() {
+		switch (Template.instance().state.get('currentStep')) {
+			case 1:
+				return 'Admin_Info';
+			case 2:
+				return 'Organization_Info';
+			case 3:
+				return 'Server_Info';
+			case 4:
+				return 'Register_Server';
 		}
-
-		return '';
-	},
-	getValue(name) {
-		return Template.instance().state.get(name);
-	},
-	selectedValue(setting, optionValue) {
-		return Template.instance().state.get(setting) === optionValue;
 	},
-	isDisabled() {
-		const user = Meteor.user();
-		if (user && user.roles && !user.roles.includes('admin')) {
-			return 'disabled';
-		}
-
-		if (Template.instance().state.get('currentStep') === 1) {
-			const state = Template.instance().state.all();
-
-			if (Object.entries(state).filter(([key, value]) => /registration-/.test(key) && !value).length) {
-				return 'disabled';
-			}
+	formLoadStateClass() {
+		switch (Template.instance().state.get('currentStep')) {
+			case 1:
+				return RocketChat.settings.get('Show_Setup_Wizard') === 'pending' && 'setup-wizard-forms__box--loaded';
+			case 2:
+			case 3:
+				return Template.instance().wizardSettings.get().length > 0 && 'setup-wizard-forms__box--loaded';
+			case 4:
+				return 'setup-wizard-forms__box--loaded';
 		}
-
-		return '';
 	},
-	headerTitle(step) {
-		if (!step) {
-			step = Template.instance().state.get('currentStep');
+	showBackButton() {
+		switch (Template.instance().state.get('currentStep')) {
+			case 3:
+				return true;
+			case 4:
+				return true;
 		}
 
-		switch (step) {
-			case 1: return t('Admin_Info');
-			case 2: return t('Organization_Info');
-			case 3: return t('Server_Info');
-			case 4: return t('Register_Server');
-		}
+		return false;
 	},
-	showStep() {
-		const currentStep = Template.instance().state.get('currentStep');
-		if (currentStep === 2 || currentStep === 3) {
-			return 'setup-wizard-forms__content-step--active';
+	isContinueDisabled() {
+		switch (Template.instance().state.get('currentStep')) {
+			case 1:
+				return Object.entries(Template.instance().state.all())
+					.filter(([key, value]) => /registration-/.test(key) && !value)
+					.length !== 0;
 		}
 
-		return '';
-	},
-	getSettings(step) {
-		return Template.instance().wizardSettings.get()
-			.filter(setting => setting.wizard.step === step)
-			.sort((a, b) => a.wizard.order - b.wizard.order);
+		return false;
 	},
-	languages() {
-		const languages = TAPi18n.getLanguages();
-
-		const result = Object.entries(languages).map(language => {
-			const obj = language[1];
-			obj.key = language[0];
-			return obj;
-		}).sort((a, b) => a.key - b.key);
-
-		result.unshift({
-			'name': 'Default',
-			'en': 'Default',
-			'key': ''
-		});
+	infoArgs() {
+		const t = Template.instance();
 
-		return result;
+		return {
+			currentStep: t.state.get('currentStep')
+		};
 	},
-	hasAdmin() {
-		return Template.instance().hasAdmin.get();
+	adminInfoArgs() {
+		const t = Template.instance();
+
+		return {
+			currentStep: t.state.get('currentStep'),
+			name: t.state.get('registration-name'),
+			username: t.state.get('registration-username'),
+			email: t.state.get('registration-email'),
+			password: t.state.get('registration-pass'),
+			invalidUsername: t.state.get('invalidUsername'),
+			invalidEmail: t.state.get('invalidEmail')
+		};
 	},
-	invalidEmail() {
-		return Template.instance().invalidEmail.get();
+	registerServerArgs() {
+		const t = Template.instance();
+
+		return {
+			currentStep: t.state.get('currentStep'),
+			allowStandaloneServer: t.allowStandaloneServer.get(),
+			registerServer: t.allowStandaloneServer.get() ? t.state.get('registerServer') : true,
+			optIn: t.state.get('optIn')
+		};
 	},
-	showBackButton() {
-		if (Template.instance().hasAdmin.get()) {
-			if (Template.instance().state.get('currentStep') > 2) {
-				return true;
-			}
-
-			return false;
-		}
-
-		if (Template.instance().state.get('currentStep') > 1) {
-			return true;
-		}
-
-		return false;
+	customStepArgs(step) {
+		const t = Template.instance();
+
+		return {
+			currentStep: t.state.get('currentStep'),
+			step,
+			settings: t.wizardSettings.get()
+				.filter(setting => setting.wizard.step === step)
+				.sort((a, b) => a.wizard.order - b.wizard.order)
+				.map(({ type, _id, i18nLabel, values }) => ({
+					type,
+					id: _id,
+					label: i18nLabel,
+					value: t.state.get(_id),
+					options: (
+						type === 'select' &&
+						values &&
+						values.map(({ i18nLabel, key }) => ({ optionLabel: i18nLabel, optionValue: key }))
+					) || (
+						type === 'language' &&
+						([{
+							optionLabel: 'Default',
+							optionValue: ''
+						}].concat(
+							Object.entries(TAPi18n.getLanguages())
+								.map(([ key, { name } ]) => ({ optionLabel: name, optionValue: key }))
+								.sort((a, b) => a.key - b.key)
+						))
+					),
+					isValueSelected: (value) => value === t.state.get(_id)
+				}))
+		};
 	}
 });
 
-Template.setupWizardFinal.onCreated(function() {
-	this.autorun(() => {
-		const userId = Meteor.userId();
-
-		this.autorun((c) => {
-			const Show_Setup_Wizard = RocketChat.settings.get('Show_Setup_Wizard');
-			const user = Meteor.user();
-
-			// Wait for roles and setup wizard setting
-			if ((userId && (!user || !user.status)) || !Show_Setup_Wizard) {
-				return;
-			}
-
-			c.stop();
-
-			if ((!userId && Show_Setup_Wizard !== 'pending') || Show_Setup_Wizard === 'completed' || (userId && !RocketChat.authz.hasRole(userId, 'admin'))) {
-				FlowRouter.go('home');
-			}
-		});
-	});
-});
+Template.setupWizardInfo.helpers({
+	stepItemModifier(step) {
+		const { currentStep } = Template.currentData();
 
-Template.setupWizardFinal.onRendered(function() {
-	$('#initial-page-loading').remove();
-});
+		if (currentStep === step) {
+			return 'setup-wizard-info__steps-item--active';
+		}
 
-Template.setupWizardFinal.events({
-	'click .js-finish'() {
-		RocketChat.settings.set('Show_Setup_Wizard', 'completed', function() {
-			localStorage.removeItem('wizard');
-			localStorage.removeItem('wizardFinal');
-			FlowRouter.go('home');
-		});
-	}
-});
+		if (currentStep > step) {
+			return 'setup-wizard-info__steps-item--past';
+		}
 
-Template.setupWizardFinal.helpers({
-	siteUrl() {
-		return RocketChat.settings.get('Site_Url');
+		return '';
+	},
+	stepTitle(step) {
+		switch (step) {
+			case 1:
+				return 'Admin_Info';
+			case 2:
+				return 'Organization_Info';
+			case 3:
+				return 'Server_Info';
+			case 4:
+				return 'Register_Server';
+		}
 	}
 });
diff --git a/packages/rocketchat-setup-wizard/package.js b/packages/rocketchat-setup-wizard/package.js
index b9d07f3caeb3..ba70d31fd112 100644
--- a/packages/rocketchat-setup-wizard/package.js
+++ b/packages/rocketchat-setup-wizard/package.js
@@ -12,6 +12,8 @@ Package.onUse(function(api) {
 
 	api.addFiles('client/setupWizard.html', 'client');
 	api.addFiles('client/setupWizard.js', 'client');
+	api.addFiles('client/final.html', 'client');
+	api.addFiles('client/final.js', 'client');
 
-	api.addFiles('server/lib/getWizardSettings.js', 'server');
+	api.addFiles('server/getSetupWizardParameters.js', 'server');
 });
diff --git a/packages/rocketchat-setup-wizard/server/getSetupWizardParameters.js b/packages/rocketchat-setup-wizard/server/getSetupWizardParameters.js
new file mode 100644
index 000000000000..910947c0418e
--- /dev/null
+++ b/packages/rocketchat-setup-wizard/server/getSetupWizardParameters.js
@@ -0,0 +1,18 @@
+Meteor.methods({
+	getSetupWizardParameters() {
+		const userId = Meteor.userId();
+		const userHasAdminRole = userId && RocketChat.authz.hasRole(userId, 'admin');
+
+		if (!userHasAdminRole) {
+			throw new Meteor.Error('error-not-allowed');
+		}
+
+		const settings = RocketChat.models.Settings.findSetupWizardSettings().fetch();
+		const allowStandaloneServer = process.env.DEPLOY_PLATFORM !== 'rocket-cloud';
+
+		return {
+			settings,
+			allowStandaloneServer
+		};
+	}
+});
diff --git a/packages/rocketchat-setup-wizard/server/lib/getWizardSettings.js b/packages/rocketchat-setup-wizard/server/lib/getWizardSettings.js
deleted file mode 100644
index 918c3225bd23..000000000000
--- a/packages/rocketchat-setup-wizard/server/lib/getWizardSettings.js
+++ /dev/null
@@ -1,9 +0,0 @@
-Meteor.methods({
-	getWizardSettings() {
-		if (RocketChat.authz.hasRole(Meteor.userId(), 'admin') && RocketChat.models && RocketChat.models.Settings) {
-			return RocketChat.models.Settings.findSetupWizardSettings().fetch();
-		}
-
-		throw new Meteor.Error('settings-are-not-ready', 'Settings are not ready');
-	}
-});
diff --git a/packages/rocketchat-theme/client/imports/components/setup-wizard.css b/packages/rocketchat-theme/client/imports/components/setup-wizard.css
index fa2825348d28..3dea99d8cd8d 100644
--- a/packages/rocketchat-theme/client/imports/components/setup-wizard.css
+++ b/packages/rocketchat-theme/client/imports/components/setup-wizard.css
@@ -1,4 +1,7 @@
 .setup-wizard {
+	--step-color: var(--rc-color-button-primary);
+	--highlight-color: var(--rc-color-button-primary);
+
 	display: flex;
 
 	width: 100%;
@@ -12,6 +15,7 @@
 		flex: 0 1 350px;
 
 		margin: 55px 65px 30px 80px;
+		overflow: hidden;
 
 		&__header{
 			display: flex;
@@ -125,28 +129,30 @@
 				}
 
 				&--active {
-					color: #1d74f5;
+					color: var(--rc-color-button-primary);
 
 					&::before {
-						color: #1d74f5;
-						border-color: #1d74f5;
+						color: var(--rc-color-button-primary);
+						background-color: transparent;
+						border-color: var(--rc-color-button-primary);
 					}
 				}
 
 				&--past {
-					color: #2f343d;
+					color: var(--rc-color-primary);
 
 					&::before {
-						color: #ffffff;
-						background-color: #1d74f5;
+						color: var(--rc-color-content);
+						background-color: var(--rc-color-button-primary);
+						border-color: var(--rc-color-button-primary);
 					}
 
 					&::after {
-						background-color: #1d74f5 !important;
+						background-color: var(--rc-color-button-primary) !important;
 					}
 
 					& .setup-wizard-info__steps-item-bonding {
-						background-color: #1d74f5;
+						background-color: var(--rc-color-button-primary);
 					}
 				}
 
@@ -177,8 +183,6 @@
 			height: calc(100% - 2rem);
 			margin: 1rem 1rem 1rem 0;
 
-			padding: 3rem;
-
 			border-radius: 2px;
 			background: #ffffff;
 			box-shadow: 0 2px 4px 0 rgba(0,0,0,0.08);
@@ -190,6 +194,17 @@
 			flex-direction: column;
 
 			width: 350px;
+			min-height: min-content;
+			margin: 3rem;
+
+			visibility: hidden;
+			opacity: 0;
+			transition: opacity 1s linear;
+
+			&--loaded {
+				visibility: visible;
+				opacity: 1;
+			}
 		}
 
 		&__header {
@@ -259,7 +274,7 @@
 					cursor: pointer;
 
 					color: #2f343d;
-					border: 1px solid #e7ebf2;
+					border: 2px solid #e7ebf2;
 
 					border-radius: 2px;
 
@@ -267,6 +282,14 @@
 
 					line-height: 1.25rem;
 
+					&--selected {
+						border-color: var(--highlight-color);
+					}
+
+					&--disabled {
+						opacity: 0.25;
+					}
+
 					&:first-child {
 						margin-bottom: 1rem;
 					}
@@ -292,22 +315,21 @@
 
 							position: relative;
 
-							border-color: #1d74f5;
+							border-color: var(--highlight-color);
 
 							&::before {
-								position: absolute;
-
-								top: 3px;
-								left: 3px;
+								content: "";
 
-								width: 12px;
-								height: 12px;
+								position: absolute;
 
-								content: "";
+								width: 100%;
+								height: 100%;
 
+								background-clip: padding-box;
 								border-radius: 50%;
+								border: 2px solid transparent;
 
-								background-color: #1d74f5;
+								background-color: var(--highlight-color);
 							}
 						}
 					}
@@ -319,7 +341,7 @@
 						height: 20px;
 						margin: 0 0.5rem;
 
-						border: 1px solid #cfd8e6;
+						border: 2px solid #cfd8e6;
 						border-radius: 50px;
 					}
 
@@ -328,6 +350,63 @@
 					}
 				}
 
+				&-checkbox {
+					position: relative;
+
+					display: flex;
+
+					margin: 0 -0.5rem 1rem;
+
+					cursor: inherit;
+
+					&-element {
+						position: absolute;
+						z-index: -1;
+						top: 0;
+						left: 0;
+
+						width: 0;
+						height: 0;
+
+						&:checked + .setup-wizard-forms__content-register-checkbox-fake {
+							position: relative;
+
+							border-color: var(--highlight-color);
+							background-color: var(--highlight-color);
+							color: var(--rc-color-content);
+
+							.setup-wizard-forms__content-register-checkbox-fake-icon {
+								display: block;
+							}
+						}
+					}
+
+					&-fake {
+						display: block;
+
+						width: 16px;
+						height: 16px;
+						margin: 2px 0.5rem;
+
+						border: 2px solid #cfd8e6;
+						border-radius: 2px;
+
+						&-icon {
+							width: 100%;
+							height: 100%;
+							display: none;
+						}
+					}
+
+					&-text {
+						color: #666666;
+					}
+				}
+
+				&-items + * {
+					margin-top: 1rem;
+				}
+
 				&-item {
 
 					display: flex;
@@ -340,13 +419,20 @@
 					}
 
 					& .setup-wizard-forms__content-register-radio-icon {
-						margin: 0 calc(4px + 0.5rem);
+						min-width: 20px;
+						width: 20px;
+						height: 20px;
+						margin: 0 0.5rem;
+						align-self: baseline;
 
-						font-size: 10px;
-					}
+						&--check {
+							color: var(--highlight-color);
+						}
 
-					& .setup-wizard-forms__content-register-radio-icon--check {
-						color: #1d74f5;
+						&--circle {
+							height: 6px;
+							margin: 7px 0.5rem;
+						}
 					}
 				}
 			}
@@ -354,8 +440,9 @@
 
 		&__footer {
 			display: flex;
+			flex-direction: row;
 
-			margin: 0 -0.5rem;
+			margin: 0 -0.5rem 2rem -0.5rem;
 
 			& .rc-button {
 				margin: 0 0.5rem;
@@ -390,7 +477,7 @@
 
 			letter-spacing: 0;
 
-			color: #1d74f5;
+			color: var(--highlight-color);
 
 			font-size: 1rem;
 
diff --git a/tests/end-to-end/ui/00-login.js b/tests/end-to-end/ui/00-login.js
index 4cd6c69f86e6..3934bfb9da9e 100644
--- a/tests/end-to-end/ui/00-login.js
+++ b/tests/end-to-end/ui/00-login.js
@@ -123,6 +123,24 @@ describe('[Setup Wizard]', () => {
 		});
 	});
 
+	describe('[Render - Step 3]', () => {
+		it('it should have option for registered server', () => {
+			setupWizard.registeredServer.isExisting().should.be.true;
+		});
+
+		it('it should have option for standalone server', () => {
+			setupWizard.standaloneServer.isExisting().should.be.true;
+		});
+
+		it('it should check option for registered server by default', () => {
+			setupWizard.registeredServer.isSelected().should.be.true;
+		});
+
+		after(() => {
+			setupWizard.goNext();
+		});
+	});
+
 	describe('[Render - Final Step]', () => {
 		it('it should render "Go to your workspace button', () => {
 			setupWizard.goToWorkspace.waitForVisible(15000);
diff --git a/tests/pageobjects/setup-wizard.page.js b/tests/pageobjects/setup-wizard.page.js
index 593b9b646e75..f6a652fee44a 100644
--- a/tests/pageobjects/setup-wizard.page.js
+++ b/tests/pageobjects/setup-wizard.page.js
@@ -14,6 +14,8 @@ class SetupWizard extends Page {
 	get siteName() { return browser.element('input[name="Site_Name"]'); }
 	get language() { return browser.element('select[name="Language"]'); }
 	get serverType() { return browser.element('select[name="Server_Type"]'); }
+	get registeredServer() { return browser.element('input[name="registerServer"][value="true"]'); }
+	get standaloneServer() { return browser.element('input[name="registerServer"][value="false"]'); }
 
 	login() {
 		browser.execute(function(email, password) {

From 851c93d07b70f81b90047820419a2b9d273f89d8 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 4 Jul 2018 10:23:44 -0300
Subject: [PATCH 27/29] [FIX] Outgoing integrations were stopping the oplog
 tailing sometimes (#11333)

When the integrations has a script that access some kind of async (made sync by Fibers) method the VM timeout would be fired after the timeout time and would generate some zoombie fibers cousing the oplog tailing (that uses Fibers) to stop working util a cursor timeout.
---
 .../server/lib/triggerHandler.js              | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-integrations/server/lib/triggerHandler.js b/packages/rocketchat-integrations/server/lib/triggerHandler.js
index 887fada828bb..36a9b4777634 100644
--- a/packages/rocketchat-integrations/server/lib/triggerHandler.js
+++ b/packages/rocketchat-integrations/server/lib/triggerHandler.js
@@ -3,6 +3,8 @@ import _ from 'underscore';
 import s from 'underscore.string';
 import moment from 'moment';
 import vm from 'vm';
+import Fiber from 'fibers';
+import Future from 'fibers/future';
 
 RocketChat.integrations.triggerHandler = new class RocketChatIntegrationHandler {
 	constructor() {
@@ -202,7 +204,15 @@ RocketChat.integrations.triggerHandler = new class RocketChatIntegrationHandler
 
 	buildSandbox(store = {}) {
 		const sandbox = {
-			_, s, console, moment,
+			scriptTimeout(reject) {
+				return setTimeout(() => reject('timed out'), 3000);
+			},
+			_,
+			s,
+			console,
+			moment,
+			Fiber,
+			Promise,
 			Store: {
 				set: (key, val) => store[key] = val,
 				get: (key) => store[key]
@@ -303,7 +313,21 @@ RocketChat.integrations.triggerHandler = new class RocketChatIntegrationHandler
 			sandbox.params = params;
 
 			this.updateHistory({ historyId, step: `execute-script-before-running-${ method }` });
-			const result = this.vm.runInNewContext('script[method](params)', sandbox, { timeout: 3000 });
+
+			const result = Future.fromPromise(this.vm.runInNewContext(`
+				new Promise((resolve, reject) => {
+					Fiber(() => {
+						scriptTimeout(reject);
+						try {
+							resolve(script[method](params))
+						} catch(e) {
+							reject(e);
+						}
+					}).run();
+				}).catch((error) => { throw new Error(error); });
+			`, sandbox, {
+				timeout: 3000
+			})).wait();
 
 			logger.outgoing.debug(`Script method "${ method }" result of the Integration "${ integration.name }" is:`);
 			logger.outgoing.debug(result);

From ec377bde9252bd6fd1305fc4c1d5ea7512d37212 Mon Sep 17 00:00:00 2001
From: "Pierre H. Lehnen" <Hudell@users.noreply.github.com>
Date: Wed, 4 Jul 2018 14:02:16 -0300
Subject: [PATCH 28/29] Fixes issues with SAML attribute mapping (#11315)

---
 packages/meteor-accounts-saml/saml_utils.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/meteor-accounts-saml/saml_utils.js b/packages/meteor-accounts-saml/saml_utils.js
index e1274111ba67..d749f02e9ddc 100644
--- a/packages/meteor-accounts-saml/saml_utils.js
+++ b/packages/meteor-accounts-saml/saml_utils.js
@@ -395,8 +395,7 @@ SAML.prototype.validateResponse = function(samlResponse, relayState, callback) {
 				if (attributes) {
 					attributes.forEach(function(attribute) {
 						const value = self.getElement(attribute, 'AttributeValue');
-						let key = attribute.$.Name.value;
-						key=key.replace(/\./g, '-');
+						const key = attribute.$.Name.value;
 						if (typeof value[0] === 'string') {
 							profile[key] = value[0];
 						} else {
@@ -422,6 +421,16 @@ SAML.prototype.validateResponse = function(samlResponse, relayState, callback) {
 				console.log(`NameID: ${ JSON.stringify(profile) }`);
 			}
 
+			const profileKeys = Object.keys(profile);
+			for (let i = 0; i < profileKeys.length; i++) {
+				const key = profileKeys[i];
+
+				if (key.match(/\./)) {
+					profile[key.replace(/\./g, '-')] = profile[key];
+					delete profile[key];
+				}
+			}
+
 			callback(null, profile, false);
 		} else {
 			const logoutResponse = self.getElement(doc, 'LogoutResponse');

From 64d969f4c8bd905dd8a8f50f84bb78aef837a9a1 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 4 Jul 2018 14:02:43 -0300
Subject: [PATCH 29/29] [FIX] Some updates were returning errors when based on
 queries with position operators (#11335)

---
 packages/rocketchat-lib/server/models/_BaseDb.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-lib/server/models/_BaseDb.js b/packages/rocketchat-lib/server/models/_BaseDb.js
index 60dee3248d2b..b93f3e917701 100644
--- a/packages/rocketchat-lib/server/models/_BaseDb.js
+++ b/packages/rocketchat-lib/server/models/_BaseDb.js
@@ -160,7 +160,7 @@ class ModelsBaseDb extends EventEmitter {
 	}
 
 	updateHasPositionalOperator(update) {
-		return Object.keys(update).some(key => key.includes('.$') || (!Match.test(update[key], Object) && this.updateHasPositionalOperator(update[key])));
+		return Object.keys(update).some(key => key.includes('.$') || (Match.test(update[key], Object) && this.updateHasPositionalOperator(update[key])));
 	}
 
 	processOplogRecord(action) {