diff --git a/fastlane/metadata/android/af-ZA/full_description.txt b/fastlane/metadata/android/af-ZA/full_description.txt
index f995a62fd7760a4704e0c2c4c4af976c48344e1f..53c6cb6c5d35df8e7a3ffdfa4c9e24f4ee7e05a9 100644
--- a/fastlane/metadata/android/af-ZA/full_description.txt
+++ b/fastlane/metadata/android/af-ZA/full_description.txt
@@ -39,4 +39,4 @@ The openHAB Foundation e.V. is a nonprofit organization with the mission to educ
 The app is flagged with the "NonFreeAsset" flag, because the openHAB icon is not under a free license.
 
 
-Privacy policy: https://www.openhabfoundation.org/privacy
\ No newline at end of file
+Privacy policy: https://www.openhabfoundation.org/privacy.html
\ No newline at end of file
diff --git a/fastlane/metadata/android/ar-SA/full_description.txt b/fastlane/metadata/android/ar-SA/full_description.txt
index 0d93bd01af2d9691079a40c6f8c94cd273dacf28..2b689a7aa6d816e1ffb06f3128b8f6341732574a 100644
--- a/fastlane/metadata/android/ar-SA/full_description.txt
+++ b/fastlane/metadata/android/ar-SA/full_description.txt
@@ -40,4 +40,4 @@ openHAB مبادرة المصدر المفتوح مدعومة بقوة من مج
 The app is flagged with the "NonFreeAsset" flag, because the openHAB icon is not under a free license.
 
 
-Privacy policy: https://www.openhabfoundation.org/privacy
\ No newline at end of file
+Privacy policy: https://www.openhabfoundation.org/privacy.html
\ No newline at end of file
diff --git a/fastlane/metadata/android/bg-BG/full_description.txt b/fastlane/metadata/android/bg-BG/full_description.txt
index f995a62fd7760a4704e0c2c4c4af976c48344e1f..53c6cb6c5d35df8e7a3ffdfa4c9e24f4ee7e05a9 100644
--- a/fastlane/metadata/android/bg-BG/full_description.txt
+++ b/fastlane/metadata/android/bg-BG/full_description.txt
@@ -39,4 +39,4 @@ The openHAB Foundation e.V. is a nonprofit organization with the mission to educ
 The app is flagged with the "NonFreeAsset" flag, because the openHAB icon is not under a free license.
 
 
-Privacy policy: https://www.openhabfoundation.org/privacy
\ No newline at end of file
+Privacy policy: https://www.openhabfoundation.org/privacy.html
\ No newline at end of file
diff --git a/fastlane/metadata/android/ca-ES/full_description.txt b/fastlane/metadata/android/ca-ES/full_description.txt
index f995a62fd7760a4704e0c2c4c4af976c48344e1f..53c6cb6c5d35df8e7a3ffdfa4c9e24f4ee7e05a9 100644
--- a/fastlane/metadata/android/ca-ES/full_description.txt
+++ b/fastlane/metadata/android/ca-ES/full_description.txt
@@ -39,4 +39,4 @@ The openHAB Foundation e.V. is a nonprofit organization with the mission to educ
 The app is flagged with the "NonFreeAsset" flag, because the openHAB icon is not under a free license.
 
 
-Privacy policy: https://www.openhabfoundation.org/privacy
\ No newline at end of file
+Privacy policy: https://www.openhabfoundation.org/privacy.html
\ No newline at end of file
diff --git a/fastlane/metadata/android/el-GR/full_description.txt b/fastlane/metadata/android/el-GR/full_description.txt
index f995a62fd7760a4704e0c2c4c4af976c48344e1f..53c6cb6c5d35df8e7a3ffdfa4c9e24f4ee7e05a9 100644
--- a/fastlane/metadata/android/el-GR/full_description.txt
+++ b/fastlane/metadata/android/el-GR/full_description.txt
@@ -39,4 +39,4 @@ The openHAB Foundation e.V. is a nonprofit organization with the mission to educ
 The app is flagged with the "NonFreeAsset" flag, because the openHAB icon is not under a free license.
 
 
-Privacy policy: https://www.openhabfoundation.org/privacy
\ No newline at end of file
+Privacy policy: https://www.openhabfoundation.org/privacy.html
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/85.txt b/fastlane/metadata/android/en-US/changelogs/85.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0cf19ef531af8effdf92621b737d9b9b0e630fea
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/85.txt
@@ -0,0 +1,3 @@
+## Fixed
+* Make beautifyUrl() null safe (#1021)
+* Change link to privacy policy (#1024)
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index f995a62fd7760a4704e0c2c4c4af976c48344e1f..53c6cb6c5d35df8e7a3ffdfa4c9e24f4ee7e05a9 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -39,4 +39,4 @@ The openHAB Foundation e.V. is a nonprofit organization with the mission to educ
 The app is flagged with the "NonFreeAsset" flag, because the openHAB icon is not under a free license.
 
 
-Privacy policy: https://www.openhabfoundation.org/privacy
\ No newline at end of file
+Privacy policy: https://www.openhabfoundation.org/privacy.html
\ No newline at end of file
diff --git a/fastlane/metadata/android/es-ES/full_description.txt b/fastlane/metadata/android/es-ES/full_description.txt
index f995a62fd7760a4704e0c2c4c4af976c48344e1f..53c6cb6c5d35df8e7a3ffdfa4c9e24f4ee7e05a9 100644
--- a/fastlane/metadata/android/es-ES/full_description.txt
+++ b/fastlane/metadata/android/es-ES/full_description.txt
@@ -39,4 +39,4 @@ The openHAB Foundation e.V. is a nonprofit organization with the mission to educ
 The app is flagged with the "NonFreeAsset" flag, because the openHAB icon is not under a free license.
 
 
-Privacy policy: https://www.openhabfoundation.org/privacy
\ No newline at end of file
+Privacy policy: https://www.openhabfoundation.org/privacy.html
\ No newline at end of file
diff --git a/fastlane/metadata/android/id-ID/full_description.txt b/fastlane/metadata/android/id-ID/full_description.txt
index f995a62fd7760a4704e0c2c4c4af976c48344e1f..53c6cb6c5d35df8e7a3ffdfa4c9e24f4ee7e05a9 100644
--- a/fastlane/metadata/android/id-ID/full_description.txt
+++ b/fastlane/metadata/android/id-ID/full_description.txt
@@ -39,4 +39,4 @@ The openHAB Foundation e.V. is a nonprofit organization with the mission to educ
 The app is flagged with the "NonFreeAsset" flag, because the openHAB icon is not under a free license.
 
 
-Privacy policy: https://www.openhabfoundation.org/privacy
\ No newline at end of file
+Privacy policy: https://www.openhabfoundation.org/privacy.html
\ No newline at end of file
diff --git a/fastlane/metadata/android/ko-KR/full_description.txt b/fastlane/metadata/android/ko-KR/full_description.txt
index f995a62fd7760a4704e0c2c4c4af976c48344e1f..53c6cb6c5d35df8e7a3ffdfa4c9e24f4ee7e05a9 100644
--- a/fastlane/metadata/android/ko-KR/full_description.txt
+++ b/fastlane/metadata/android/ko-KR/full_description.txt
@@ -39,4 +39,4 @@ The openHAB Foundation e.V. is a nonprofit organization with the mission to educ
 The app is flagged with the "NonFreeAsset" flag, because the openHAB icon is not under a free license.
 
 
-Privacy policy: https://www.openhabfoundation.org/privacy
\ No newline at end of file
+Privacy policy: https://www.openhabfoundation.org/privacy.html
\ No newline at end of file
diff --git a/fastlane/metadata/android/lt-LT/full_description.txt b/fastlane/metadata/android/lt-LT/full_description.txt
index f995a62fd7760a4704e0c2c4c4af976c48344e1f..53c6cb6c5d35df8e7a3ffdfa4c9e24f4ee7e05a9 100644
--- a/fastlane/metadata/android/lt-LT/full_description.txt
+++ b/fastlane/metadata/android/lt-LT/full_description.txt
@@ -39,4 +39,4 @@ The openHAB Foundation e.V. is a nonprofit organization with the mission to educ
 The app is flagged with the "NonFreeAsset" flag, because the openHAB icon is not under a free license.
 
 
-Privacy policy: https://www.openhabfoundation.org/privacy
\ No newline at end of file
+Privacy policy: https://www.openhabfoundation.org/privacy.html
\ No newline at end of file
diff --git a/fastlane/metadata/android/pl-PL/full_description.txt b/fastlane/metadata/android/pl-PL/full_description.txt
index f995a62fd7760a4704e0c2c4c4af976c48344e1f..53c6cb6c5d35df8e7a3ffdfa4c9e24f4ee7e05a9 100644
--- a/fastlane/metadata/android/pl-PL/full_description.txt
+++ b/fastlane/metadata/android/pl-PL/full_description.txt
@@ -39,4 +39,4 @@ The openHAB Foundation e.V. is a nonprofit organization with the mission to educ
 The app is flagged with the "NonFreeAsset" flag, because the openHAB icon is not under a free license.
 
 
-Privacy policy: https://www.openhabfoundation.org/privacy
\ No newline at end of file
+Privacy policy: https://www.openhabfoundation.org/privacy.html
\ No newline at end of file
diff --git a/fastlane/metadata/android/pt-PT/full_description.txt b/fastlane/metadata/android/pt-PT/full_description.txt
index f995a62fd7760a4704e0c2c4c4af976c48344e1f..53c6cb6c5d35df8e7a3ffdfa4c9e24f4ee7e05a9 100644
--- a/fastlane/metadata/android/pt-PT/full_description.txt
+++ b/fastlane/metadata/android/pt-PT/full_description.txt
@@ -39,4 +39,4 @@ The openHAB Foundation e.V. is a nonprofit organization with the mission to educ
 The app is flagged with the "NonFreeAsset" flag, because the openHAB icon is not under a free license.
 
 
-Privacy policy: https://www.openhabfoundation.org/privacy
\ No newline at end of file
+Privacy policy: https://www.openhabfoundation.org/privacy.html
\ No newline at end of file
diff --git a/fastlane/metadata/android/sr-SP/full_description.txt b/fastlane/metadata/android/sr-SP/full_description.txt
index f995a62fd7760a4704e0c2c4c4af976c48344e1f..53c6cb6c5d35df8e7a3ffdfa4c9e24f4ee7e05a9 100644
--- a/fastlane/metadata/android/sr-SP/full_description.txt
+++ b/fastlane/metadata/android/sr-SP/full_description.txt
@@ -39,4 +39,4 @@ The openHAB Foundation e.V. is a nonprofit organization with the mission to educ
 The app is flagged with the "NonFreeAsset" flag, because the openHAB icon is not under a free license.
 
 
-Privacy policy: https://www.openhabfoundation.org/privacy
\ No newline at end of file
+Privacy policy: https://www.openhabfoundation.org/privacy.html
\ No newline at end of file
diff --git a/fastlane/metadata/android/tl-PH/full_description.txt b/fastlane/metadata/android/tl-PH/full_description.txt
index f995a62fd7760a4704e0c2c4c4af976c48344e1f..53c6cb6c5d35df8e7a3ffdfa4c9e24f4ee7e05a9 100644
--- a/fastlane/metadata/android/tl-PH/full_description.txt
+++ b/fastlane/metadata/android/tl-PH/full_description.txt
@@ -39,4 +39,4 @@ The openHAB Foundation e.V. is a nonprofit organization with the mission to educ
 The app is flagged with the "NonFreeAsset" flag, because the openHAB icon is not under a free license.
 
 
-Privacy policy: https://www.openhabfoundation.org/privacy
\ No newline at end of file
+Privacy policy: https://www.openhabfoundation.org/privacy.html
\ No newline at end of file
diff --git a/fastlane/metadata/android/tr-TR/full_description.txt b/fastlane/metadata/android/tr-TR/full_description.txt
index f995a62fd7760a4704e0c2c4c4af976c48344e1f..53c6cb6c5d35df8e7a3ffdfa4c9e24f4ee7e05a9 100644
--- a/fastlane/metadata/android/tr-TR/full_description.txt
+++ b/fastlane/metadata/android/tr-TR/full_description.txt
@@ -39,4 +39,4 @@ The openHAB Foundation e.V. is a nonprofit organization with the mission to educ
 The app is flagged with the "NonFreeAsset" flag, because the openHAB icon is not under a free license.
 
 
-Privacy policy: https://www.openhabfoundation.org/privacy
\ No newline at end of file
+Privacy policy: https://www.openhabfoundation.org/privacy.html
\ No newline at end of file
diff --git a/fastlane/metadata/android/uk-UA/full_description.txt b/fastlane/metadata/android/uk-UA/full_description.txt
index f995a62fd7760a4704e0c2c4c4af976c48344e1f..53c6cb6c5d35df8e7a3ffdfa4c9e24f4ee7e05a9 100644
--- a/fastlane/metadata/android/uk-UA/full_description.txt
+++ b/fastlane/metadata/android/uk-UA/full_description.txt
@@ -39,4 +39,4 @@ The openHAB Foundation e.V. is a nonprofit organization with the mission to educ
 The app is flagged with the "NonFreeAsset" flag, because the openHAB icon is not under a free license.
 
 
-Privacy policy: https://www.openhabfoundation.org/privacy
\ No newline at end of file
+Privacy policy: https://www.openhabfoundation.org/privacy.html
\ No newline at end of file
diff --git a/fastlane/metadata/android/vi-VN/full_description.txt b/fastlane/metadata/android/vi-VN/full_description.txt
index f995a62fd7760a4704e0c2c4c4af976c48344e1f..53c6cb6c5d35df8e7a3ffdfa4c9e24f4ee7e05a9 100644
--- a/fastlane/metadata/android/vi-VN/full_description.txt
+++ b/fastlane/metadata/android/vi-VN/full_description.txt
@@ -39,4 +39,4 @@ The openHAB Foundation e.V. is a nonprofit organization with the mission to educ
 The app is flagged with the "NonFreeAsset" flag, because the openHAB icon is not under a free license.
 
 
-Privacy policy: https://www.openhabfoundation.org/privacy
\ No newline at end of file
+Privacy policy: https://www.openhabfoundation.org/privacy.html
\ No newline at end of file
diff --git a/fastlane/metadata/android/yi-DE/full_description.txt b/fastlane/metadata/android/yi-DE/full_description.txt
index f995a62fd7760a4704e0c2c4c4af976c48344e1f..53c6cb6c5d35df8e7a3ffdfa4c9e24f4ee7e05a9 100644
--- a/fastlane/metadata/android/yi-DE/full_description.txt
+++ b/fastlane/metadata/android/yi-DE/full_description.txt
@@ -39,4 +39,4 @@ The openHAB Foundation e.V. is a nonprofit organization with the mission to educ
 The app is flagged with the "NonFreeAsset" flag, because the openHAB icon is not under a free license.
 
 
-Privacy policy: https://www.openhabfoundation.org/privacy
\ No newline at end of file
+Privacy policy: https://www.openhabfoundation.org/privacy.html
\ No newline at end of file
diff --git a/fastlane/metadata/android/zh-TW/full_description.txt b/fastlane/metadata/android/zh-TW/full_description.txt
index f995a62fd7760a4704e0c2c4c4af976c48344e1f..53c6cb6c5d35df8e7a3ffdfa4c9e24f4ee7e05a9 100644
--- a/fastlane/metadata/android/zh-TW/full_description.txt
+++ b/fastlane/metadata/android/zh-TW/full_description.txt
@@ -39,4 +39,4 @@ The openHAB Foundation e.V. is a nonprofit organization with the mission to educ
 The app is flagged with the "NonFreeAsset" flag, because the openHAB icon is not under a free license.
 
 
-Privacy policy: https://www.openhabfoundation.org/privacy
\ No newline at end of file
+Privacy policy: https://www.openhabfoundation.org/privacy.html
\ No newline at end of file
diff --git a/mobile/build.gradle b/mobile/build.gradle
index 30589500cc6e573d26ceb7dc5060ca518e4489d9..210130a36904a621edcc3c46ab3c39811aff6c5d 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -33,8 +33,8 @@ android {
         applicationId "org.openhab.habdroid"
         minSdkVersion 14
         targetSdkVersion 27
-        versionCode 84
-        versionName "2.3.2-beta"
+        versionCode 85
+        versionName "2.3.3-beta"
         multiDexEnabled true
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
     }