diff --git a/docs/labs.md b/docs/labs.md
index cb797b61ab..bce88b0e3b 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -81,3 +81,17 @@ that downloads, stores, and indexes room messages for E2E encrypted rooms.
 
 The existing search will transparently work for encrypted rooms just like it
 does for non-encrypted.
+
+## New DM invite dialog (`feature_ftue_dms`)
+
+An improved dialog for inviting users. Once finished, this will replace both the
+DM creation dialog and the 'invite user' dialog. This is a work in progress and
+as such not all functionality may be present until the feature replaces today's
+UX.
+
+## Bridge info tab (`feature_bridge_state`)
+
+Adds a "Bridge Info" tab to the Room Settings dialog, if a compatible bridge is
+present in the room. The Bridge info tab pulls information from the `m.bridge` state event ([MSC2346](https://github.com/matrix-org/matrix-doc/pull/2346)). Since the feature is based upon a MSC, most
+bridges are not expected to be compatible, and users should not rely on this
+tab as the single source of truth just yet.
diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js
index 453f2fe5e4..6e477f9015 100644
--- a/electron_app/src/electron-main.js
+++ b/electron_app/src/electron-main.js
@@ -63,7 +63,7 @@ if (argv["help"]) {
     console.log("  --hidden:             Start the application hidden in the system tray.");
     console.log("  --help:               Displays this help message.");
     console.log("And more such as --proxy, see:" +
-        "https://github.com/electron/electron/blob/master/docs/api/chrome-command-line-switches.md");
+        "https://electronjs.org/docs/api/chrome-command-line-switches#supported-chrome-command-line-switches");
     app.exit();
 }
 
diff --git a/package.json b/package.json
index 4454cd28c4..ddbca6140f 100644
--- a/package.json
+++ b/package.json
@@ -32,10 +32,14 @@
     "i18n": "matrix-gen-i18n",
     "prunei18n": "matrix-prune-i18n",
     "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && yarn i18n && node scripts/compare-file.js src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
+<<<<<<< HEAD
     "reskindex": "reskindex -h src/header",
     "reskindex:watch": "reskindex -h src/header -w",
     "clean": "rimraf lib webapp electron_app/dist",
     "build": "yarn clean && yarn build:res && yarn build:compile && yarn build:types && yarn build:bundle",
+=======
+    "postinstall": "node scripts/yarn-sub.js matrix-js-sdk install && node scripts/yarn-sub.js matrix-react-sdk install",
+>>>>>>> develop
     "build:res": "node scripts/copy-res.js",
     "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
     "build:compile": "yarn reskindex && babel -d lib --verbose --extensions \".ts,.js\" src",
@@ -158,7 +162,7 @@
   },
   "build": {
     "appId": "im.riot.app",
-    "electronVersion": "7.1.3",
+    "electronVersion": "7.1.7",
     "files": [
       "node_modules/**",
       "src/**"
diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json
index 16ebbc3a17..f3d5c1da59 100644
--- a/riot.im/develop/config.json
+++ b/riot.im/develop/config.json
@@ -21,7 +21,9 @@
         "feature_mjolnir": "labs",
         "feature_dm_verification": "labs",
         "feature_cross_signing": "labs",
-        "feature_event_indexing": "labs"
+        "feature_event_indexing": "labs",
+        "feature_ftue_dms": "labs",
+        "feature_bridge_state": "labs"
     },
     "welcomeUserId": "@riot-bot:matrix.org",
     "piwik": {
diff --git a/scripts/docker-write-version.sh b/scripts/docker-write-version.sh
index 0ca2a477ee..730f47af7b 100644
--- a/scripts/docker-write-version.sh
+++ b/scripts/docker-write-version.sh
@@ -2,14 +2,16 @@
 
 set -ex
 
-TAG=$(git describe --dirty --tags)
+TAG=$(git describe --tags)
 BRANCH=$(git rev-parse --abbrev-ref HEAD)
 DIST_VERSION=$TAG
 
 # If the branch comes out as HEAD then we're probably checked out to a tag, so if the thing is *not*
 # coming out as HEAD then we're on a branch. When we're on a branch, we want to resolve ourselves to
 # a few SHAs rather than a version.
-if [ $BRANCH != 'HEAD' ]
+# Docker Hub doesn't always check out the tag and sometimes checks out the branch, so we should look
+# for an appropriately tagged branch as well (heads/v1.2.3).
+if [ $BRANCH != 'HEAD' && $BRANCH != 'heads/v*' ]
 then
     REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD)
     JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
diff --git a/src/i18n/strings/az.json b/src/i18n/strings/az.json
index e9e16f50fb..9773436fa1 100644
--- a/src/i18n/strings/az.json
+++ b/src/i18n/strings/az.json
@@ -2,7 +2,7 @@
     "Riot Desktop on %(platformName)s": "%(platformName)s-da Riot Desktop",
     "Unknown device": "Naməlum qurğu",
     "You need to be using HTTPS to place a screen-sharing call.": "İş stolunun birgə istifadəsi üçün HTTPS-dan istifadə tələb olunur.",
-    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Riot konfiqurasiyanızda yanlış JSON var. Lütfən, xətanı düzəldin və səhifəni yeniləyin",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Riot konfiqurasiyanızda yanlış JSON var. Lütfən, xətanı düzəldin və səhifəni yeniləyin.",
     "Invalid JSON": "Yanlış JSON",
     "Sign In": "Daxil ol",
     "Create Account": "Hesab Aç",
@@ -10,8 +10,16 @@
     "Chat with Riot Bot": "Riot Bot-la söhbət edin",
     "Explore rooms": "Otaqları kəşf edin",
     "Your Riot is misconfigured": "Riot yanlış quraşdırılıb",
-    "Unexpected error preparing the app. See console for details.": "Proqramı başladarkən gözlənilməz xəta. Ətraflı məlumat üçün konsola baxın.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Yanlış konfiqurasiya: default_server_config, default_server_name, və ya default_hs_url-dən yalnız birini təyin etməlisiniz.",
-    "Invalid configuration: no default server specified.": "Yanlış konfiqurasiya: ilkin server təyin edilməyib.",
-    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s-da %(browserName)s ilə %(appName)s"
+    "Unexpected error preparing the app. See console for details.": "Proqramın başlanmasında gözlənilməz xəta. İzah üçün konsola baxın",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Yanlış konfiqurasiya: bunlardan yalnız birini təyin edin - default_server_config, default_server_name, və ya default_hs_url.",
+    "Invalid configuration: no default server specified.": "Yanlış konfiqurasiya: ilkin server təyin edilməyib",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s-da %(browserName)s ilə %(appName)s",
+    "The message from the parser is: %(message)s": "Sözügedən mesaj: %(message)s",
+    "powered by Matrix": "Matrix tərəfindən təchiz edilmişdir",
+    "Custom Server Options": "Fərdi Server Seçimləri",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Fərqli server URL-ni təyin etməklə digər Matrix serverlərinə daxil olmaq üçün fərdi server seçimlərini istifadə edə bilərsiniz. Bu sizə başqa serverdə qaldırılmış mövcud Matrix hesabınızla Riot-u işlətməyə imkan verir.",
+    "Dismiss": "Nəzərə almayın",
+    "Room Directory": "Otaq kataloqu",
+    "Welcome to Riot.im": "Riot.im-ə xoş gəlmişsiniz",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "[matrix] tərəfindən təchiz edilmiş mərkəziləşdirilməmiş, şifrələnmiş çat və əməkdaşlıq platforması"
 }
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index c2b0543da2..922610546e 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -14,5 +14,12 @@
     "Create Account": "Crear conta",
     "Need help?": "¿Precisas axuda?",
     "Explore rooms": "Explorar salas",
-    "Room Directory": "Directorio de salas"
+    "Room Directory": "Directorio de salas",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "A configuración de Riot contén JSON non válido. Corrixe o problema e recarga a páxina.",
+    "The message from the parser is: %(message)s": "A mensaxe desde o intérprete é: %(message)s",
+    "Invalid JSON": "JSON non válido",
+    "Your Riot is misconfigured": "Riot está mal configurado",
+    "Unexpected error preparing the app. See console for details.": "Fallo non agardado ao preparar a app. Detalles na consola.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuración non válida: só se pode indicar un de default_server_config, default_server_name, ou default_hs_url.",
+    "Invalid configuration: no default server specified.": "Configuración non válida: non se indicou servidor por omisión."
 }
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 43b1462f7a..71d1de1544 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -2,7 +2,7 @@
     "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s işletim sisteminde %(browserName)s ile %(appName)s",
     "Custom Server Options": "Özelleştirilebilir Sunucu Seçenekleri",
     "Dismiss": "Kapat",
-    "powered by Matrix": "Matrix'den besleniyor",
+    "powered by Matrix": "Matrix tarafından destekleniyor",
     "Riot Desktop on %(platformName)s": "%(platformName)s platformunda Riot Masaüstü",
     "Unknown device": "Bilinmeyen aygıt",
     "You need to be using HTTPS to place a screen-sharing call.": "Ekran paylaşımlı arama yapmak için HTTPS kullanıyor olmalısınız.",
@@ -14,5 +14,12 @@
     "Create Account": "Kayıt Ol",
     "Need help?": "Yardıma mı ihtiyacın var?",
     "Explore rooms": "Odaları keşfet",
-    "Room Directory": "Oda Dizini"
+    "Room Directory": "Oda Dizini",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Riot yapılandırmanız geçersiz JSON ifadesi içermektedir. Lütfen problemi düzeltin ve sayfayı yenileyin.",
+    "Invalid JSON": "Geçersiz JSON",
+    "Your Riot is misconfigured": "Rioutunuz hatalı yapılandırılmış",
+    "Unexpected error preparing the app. See console for details.": "Uygulamayı hazırlarken beklenmeyen hata oluştu. Lütfen detaylar için konsola bakınız.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Geçersiz yapılandırma: default_server_config, default_server_name, yada default_hs_url den sadece birisi seçilebilir.",
+    "Invalid configuration: no default server specified.": "Geçersiz yapılandırma: varsayılan sunucu seçilmemiş.",
+    "The message from the parser is: %(message)s": "Ayrıştırıcıdan gelen mesaj: %(message)s"
 }