diff --git a/.gitmodules b/.gitmodules
index 7e8bfb8f81..8616cb54f7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,7 +9,7 @@ url=../Display.git
 	url = git@github.com:peter-iakovlev/HockeySDK-iOS.git
 [submodule "submodules/libtgvoip"]
 	path = submodules/libtgvoip
-url=git@github.com:peter-iakovlev/libtgvoip.git
+url=git@github.com:grishka/libtgvoip.git
 [submodule "submodules/lottie-ios"]
 	path = submodules/lottie-ios
 url=git@github.com:peter-iakovlev/lottie-ios.git
diff --git a/Telegram-iOS/AppDelegate.swift b/Telegram-iOS/AppDelegate.swift
index 2fe97455fa..cd63dd6c6f 100644
--- a/Telegram-iOS/AppDelegate.swift
+++ b/Telegram-iOS/AppDelegate.swift
@@ -396,7 +396,7 @@ private enum QueuedWakeup: Int32 {
         telegramUIDeclareEncodables()
         
         #if DEBUG
-        LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: false, redactSensitiveData: true)
+        LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: true, redactSensitiveData: true)
         #else
         if BuildConfig.shared().isInternalBuild {
             LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: false, redactSensitiveData: true)
diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings
index 54e09a99df..61c0d02f6f 100644
--- a/Telegram-iOS/en.lproj/Localizable.strings
+++ b/Telegram-iOS/en.lproj/Localizable.strings
@@ -20,6 +20,11 @@
 "MESSAGE_PHOTOS" = "%1$@ sent you %2$@ photos";
 "MESSAGES" = "%1$@ sent you %2$@ messages";
 
+"MESSAGE_POLL" = "%1$@ sent you a poll";
+"CHANNEL_MESSAGE_POLL" = "%1$@ posted a poll";
+"CHAT_MESSAGE_POLL" = "%1$@ sent a poll to the group %2$@";
+"PINNED_POLL" = "%1$@ pinned a poll";
+
 "CHAT_MESSAGE_TEXT" = "%1$@@%2$@: %3$@";
 "CHAT_MESSAGE_NOTEXT" = "%1$@ sent a message to the group %2$@";
 "CHAT_MESSAGE_PHOTO" = "%1$@ sent a photo to the group %2$@";
@@ -80,7 +85,6 @@
 "PINNED_GEO" = "%1$@ pinned a map";
 "PINNED_GEOLIVE" = "%1$@ pinned a live location";
 "PINNED_GIF" = "%1$@ pinned a GIF";
-"PINNED_POLL" = "%1$@ pinned a poll";
 
 "MESSAGE_GAME" = "%1$@ invited you to play %2$@";
 "CHANNEL_MESSAGE_GAME" = "%1$@ invited you to play %2$@";
@@ -401,7 +405,6 @@
 "Message.Audio" = "Voice Message";
 "Message.ForwardedMessage" = "Forwarded Message\nFrom: %@";
 "Message.Animation" = "GIF";
-"Message.Poll" = "Poll";
 
 // Conversation Profile
 "ConversationProfile.ErrorCreatingConversation" = "An error occurred";
@@ -3581,19 +3584,23 @@ Unused sets are archived when you add more.";
 "Permissions.SiriAllowInSettings.v0" = "Turn ON in Settings";
 
 "Permissions.PrivacyPolicy" = "Privacy Policy";
+"Permissions.DataSettings" = "Data Settings";
 
 "Contacts.PermissionsTitle" = "Access to Contacts";
 "Contacts.PermissionsText" = "Please allow Telegram access to your phonebook to seamlessly find all your friends.";
 "Contacts.PermissionsAllow" = "Allow Access";
 "Contacts.PermissionsAllowInSettings" = "Allow in Settings";
-"Contacts.PermissionsSuppressWarning" = "Are you sure?";
+"Contacts.PermissionsSuppressWarningTitle" = "Are you sure you want to keep access to contacts disabled?";
+"Contacts.PermissionsSuppressWarningText" = "You can fine tune contacts sync in Settings > Privacy & Security > Data Settings.";
 
 "Notifications.PermissionsTitle" = "Turn ON Notifications";
 "Notifications.PermissionsText" = "Don't miss important messages from your friends and coworkers.";
-"Notifications.PermissionsUnreachableText" = "Check that both Alert and Sound are enabled in Settings.";
+"Notifications.PermissionsUnreachableText" = "Please note that you partly disabled message notifications in your Settings.";
 "Notifications.PermissionsAllow" = "Turn Notifications ON";
 "Notifications.PermissionsAllowInSettings" = "Turn ON in Settings";
-"Notifications.PermissionsSuppressWarning" = "Are you sure?";
+"Notifications.PermissionsOpenSettings" = "Open Settings";
+"Notifications.PermissionsSuppressWarningTitle" = "Are you sure?";
+"Notifications.PermissionsKeepDisabled" = "Keep Disabled";
 
 "ChatSettings.DownloadInBackground" = "Background Download";
 "ChatSettings.DownloadInBackgroundInfo" = "The app will continue downloading media files for a limited time.";
@@ -3603,16 +3610,15 @@ Unused sets are archived when you add more.";
 "SharedMedia.SearchNoResults" = "No Results";
 "SharedMedia.SearchNoResultsDescription" = "There were no results for \"%@\".\nTry a new search.";
 
-"WebSearch.RecentSearchPlaceholder" = "Your recent search queries will appear here";
-
 "MessagePoll.LabelAnonymous" = "Anonymous Poll";
 "MessagePoll.LabelClosed" = "Final Results";
-"MessagePoll.VotedCount_0" = "No votes";
-"MessagePoll.VotedCount_1" = "1 voted";
-"MessagePoll.VotedCount_2" = "2 voted";
-"MessagePoll.VotedCount_3_10" = "%@ voted";
-"MessagePoll.VotedCount_many" = "%@ voted";
-"MessagePoll.VotedCount_any" = "%@ voted";
+"MessagePoll.NoVotes" = "No votes";
+"MessagePoll.VotedCount_0" = "%@ votes";
+"MessagePoll.VotedCount_1" = "1 vote";
+"MessagePoll.VotedCount_2" = "2 votes";
+"MessagePoll.VotedCount_3_10" = "%@ votes";
+"MessagePoll.VotedCount_many" = "%@ votes";
+"MessagePoll.VotedCount_any" = "%@ votes";
 "AttachmentMenu.Poll" = "Poll";
 "Conversation.PinnedPoll" = "Pinned Poll";
 
@@ -3641,8 +3647,9 @@ Unused sets are archived when you add more.";
 "ForwardedPolls_many" = "%@ forwarded polls";
 "ForwardedPolls_0" = "%@ forwarded polls";
 
-"Conversation.UnvotePoll" = "Unvote";
+"Conversation.UnvotePoll" = "Retract Vote";
 "Conversation.StopPoll" = "Stop Poll";
-"CreatePoll.OptionsInfo" = "You can add up to 10 options.";
+"Conversation.StopPollConfirmationTitle" = "If you stop this poll now, nobody will be able to vote in it anymore. This action cannot be undone.";
+"Conversation.StopPollConfirmation" = "Stop Poll";
 
 "AttachmentMenu.WebSearch" = "Web Search";
diff --git a/submodules/Display b/submodules/Display
index bd95025018..ba017e7c33 160000
--- a/submodules/Display
+++ b/submodules/Display
@@ -1 +1 @@
-Subproject commit bd9502501881b9195d0ecfa8f2186976df08f86e
+Subproject commit ba017e7c339b7a7e3ba131151061c5033fdca375
diff --git a/submodules/TelegramCore b/submodules/TelegramCore
index 3ebcf555e4..99e75d0f2d 160000
--- a/submodules/TelegramCore
+++ b/submodules/TelegramCore
@@ -1 +1 @@
-Subproject commit 3ebcf555e45dd8ee503faab503011ac1567c65a2
+Subproject commit 99e75d0f2dc4f76deff6689ff9dd6b848b8312e9
diff --git a/submodules/TelegramUI b/submodules/TelegramUI
index f6afd7380b..f8bee27599 160000
--- a/submodules/TelegramUI
+++ b/submodules/TelegramUI
@@ -1 +1 @@
-Subproject commit f6afd7380b7cb9a89fbc71d52b1afc51d6897e9f
+Subproject commit f8bee2759931fd4b1c094dc0135b6ffba5667a6a
diff --git a/submodules/libtgvoip b/submodules/libtgvoip
index 24fcebafe9..a7546d438a 160000
--- a/submodules/libtgvoip
+++ b/submodules/libtgvoip
@@ -1 +1 @@
-Subproject commit 24fcebafe9cd449002f6b4a2662acd918905e5af
+Subproject commit a7546d438afef9f7ce5212b36b106e1d8acb35bc