diff --git a/.env.nightly b/.env.nightly
index e5be7af577..55c65a820c 100644
--- a/.env.nightly
+++ b/.env.nightly
@@ -18,4 +18,3 @@ DEBUG_WEBVIEW=1
 INSTABUG_SURVEYS=1
 GROUP_CHATS_ENABLED=0
 FORCE_SENT_RECEIVED_TRACKING=1
-BOOTNODES_SETTINGS_ENABLED=0
diff --git a/.env.prod b/.env.prod
index f151d6560f..294b4f79d3 100644
--- a/.env.prod
+++ b/.env.prod
@@ -19,4 +19,3 @@ INSTABUG_SURVEYS=1
 GROUP_CHATS_ENABLED=0
 FORCE_SENT_RECEIVED_TRACKING=0
 USE_SYM_KEY=0
-BOOTNODES_SETTINGS_ENABLED=0
diff --git a/modules/react-native-status/android/build.gradle b/modules/react-native-status/android/build.gradle
index 213089608b..689a9af18d 100644
--- a/modules/react-native-status/android/build.gradle
+++ b/modules/react-native-status/android/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation 'com.github.ericwlange:AndroidJSCore:3.0.1'
     implementation 'status-im:function:0.0.1'
 
-    String statusGoVersion = 'develop-g098053f6'
+    String statusGoVersion = 'develop-gcd5782b3'
     final String statusGoGroup = 'status-im', statusGoName = 'status-go'
 
     // Check if the local status-go jar exists, and compile against that if it does
diff --git a/modules/react-native-status/ios/RCTStatus/pom.xml b/modules/react-native-status/ios/RCTStatus/pom.xml
index 254b4bcb9c..674a3686e3 100644
--- a/modules/react-native-status/ios/RCTStatus/pom.xml
+++ b/modules/react-native-status/ios/RCTStatus/pom.xml
@@ -25,7 +25,7 @@
                         <artifactItem>
                             <groupId>status-im</groupId>
                             <artifactId>status-go-ios-simulator</artifactId>
-                            <version>develop-g098053f6</version>
+                            <version>develop-gcd5782b3</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
                             <outputDirectory>./</outputDirectory>
diff --git a/src/status_im/ui/screens/bootnodes_settings/edit_bootnode/views.cljs b/src/status_im/ui/screens/bootnodes_settings/edit_bootnode/views.cljs
index 2932156b42..41fb647040 100644
--- a/src/status_im/ui/screens/bootnodes_settings/edit_bootnode/views.cljs
+++ b/src/status_im/ui/screens/bootnodes_settings/edit_bootnode/views.cljs
@@ -43,12 +43,11 @@
     (let [url  (get-in manage-bootnode [:url :value])
           id   (get-in manage-bootnode [:id :value])
           name (get-in manage-bootnode [:name :value])]
-
       [react/view components.styles/flex
        [status-bar/status-bar]
        [react/keyboard-avoiding-view components.styles/flex
         [toolbar/simple-toolbar (i18n/label (if id :t/bootnode-details :t/add-bootnode))]
-        [react/scroll-view
+        [react/scroll-view {:keyboard-should-persist-taps :handled}
          [react/view styles/edit-bootnode-view
           [text-input/text-input-with-label
            {:label           (i18n/label :t/name)
diff --git a/src/status_im/ui/screens/offline_messaging_settings/edit_mailserver/views.cljs b/src/status_im/ui/screens/offline_messaging_settings/edit_mailserver/views.cljs
index 9cbd799544..1332cd7ecf 100644
--- a/src/status_im/ui/screens/offline_messaging_settings/edit_mailserver/views.cljs
+++ b/src/status_im/ui/screens/offline_messaging_settings/edit_mailserver/views.cljs
@@ -58,7 +58,7 @@
        [status-bar/status-bar]
        [react/keyboard-avoiding-view components.styles/flex
         [toolbar/simple-toolbar (i18n/label (if id :t/mailserver-details :t/add-mailserver))]
-        [react/scroll-view
+        [react/scroll-view {:keyboard-should-persist-taps :handled}
          [react/view styles/edit-mailserver-view
           [text-input/text-input-with-label
            {:label           (i18n/label :t/name)
diff --git a/src/status_im/ui/screens/profile/user/views.cljs b/src/status_im/ui/screens/profile/user/views.cljs
index 384fb51d82..aaeaad79e7 100644
--- a/src/status_im/ui/screens/profile/user/views.cljs
+++ b/src/status_im/ui/screens/profile/user/views.cljs
@@ -152,6 +152,8 @@
            {:label-kw            :t/offline-messaging
             :action-fn           #(re-frame/dispatch [:navigate-to :offline-messaging-settings])
             :accessibility-label :offline-messages-settings-button}])
+        (when config/bootnodes-settings-enabled?
+          [profile.components/settings-item-separator])
         (when config/bootnodes-settings-enabled?
           [profile.components/settings-item
            {:label-kw            :t/bootnodes