diff --git a/Telegram-iOS/AppDelegate.swift b/Telegram-iOS/AppDelegate.swift
index 8242180649..4ee6899f3c 100644
--- a/Telegram-iOS/AppDelegate.swift
+++ b/Telegram-iOS/AppDelegate.swift
@@ -366,6 +366,16 @@ private enum QueuedWakeup: Int32 {
             return true
         }
         
+        #if DEBUG
+        LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: true, redactSensitiveData: true)
+        #else
+        if BuildConfig.shared().isInternalBuild {
+            LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: false, redactSensitiveData: true)
+        } else {
+            LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: false, redactSensitiveData: true)
+        }
+        #endif
+        
         let rootPath = rootPathForBasePath(appGroupUrl.path)
         performAppGroupUpgrades(appGroupPath: appGroupUrl.path, rootPath: rootPath)
         
@@ -414,16 +424,6 @@ private enum QueuedWakeup: Int32 {
         
         telegramUIDeclareEncodables()
         
-        #if DEBUG
-        LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: true, redactSensitiveData: true)
-        #else
-        if BuildConfig.shared().isInternalBuild {
-            LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: false, redactSensitiveData: true)
-        } else {
-            LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: false, redactSensitiveData: true)
-        }
-        #endif
-        
         GlobalExperimentalSettings.isAppStoreBuild = BuildConfig.shared().isAppStoreBuild
         
         GlobalExperimentalSettings.enableFeed = false
diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings
index d8c6a04eb6..a04a6aecf4 100644
--- a/Telegram-iOS/en.lproj/Localizable.strings
+++ b/Telegram-iOS/en.lproj/Localizable.strings
@@ -2826,6 +2826,8 @@ Unused sets are archived when you add more.";
 
 "Group.Setup.HistoryVisibleHelp" = "New members will see messages that were sent before they joined.";
 "Group.Setup.HistoryHiddenHelp" = "New members won't see earlier messages.";
+"Group.Setup.BasicHistoryHiddenHelp" = "New members won't see more than 100 previous messages.";
+
 
 "Channel.AdminLog.MessageGroupPreHistoryVisible" = "%@ made the group history visible for new members";
 "Channel.AdminLog.MessageGroupPreHistoryHidden" = "%@ made the group history hidden from new members";
diff --git a/submodules/TelegramCore b/submodules/TelegramCore
index 0341c221f6..ae844e1a20 160000
--- a/submodules/TelegramCore
+++ b/submodules/TelegramCore
@@ -1 +1 @@
-Subproject commit 0341c221f6c6d68a6054482e1d10d16bc3f587e2
+Subproject commit ae844e1a203745452ea630470db519dc152c0765
diff --git a/submodules/TelegramUI b/submodules/TelegramUI
index 7c40211c4b..c9631285bf 160000
--- a/submodules/TelegramUI
+++ b/submodules/TelegramUI
@@ -1 +1 @@
-Subproject commit 7c40211c4bbb3cd5414b7e594772f4ae82d7998c
+Subproject commit c9631285bf9af4712b9c0b966f50d6e2ec1ac314