diff --git a/.buckconfig b/.buckconfig
index 9cc2f1b7bc..2be4eea941 100644
--- a/.buckconfig
+++ b/.buckconfig
@@ -1,14 +1,14 @@
 [cxx]
   default_platform = iphoneos-armv7
-  cflags = -g -fmodules -fobjc-arc -D BUCK -D DEBUG -w $(config custom.other_cflags)
-  cxxflags = -fobjc-arc -std=c++14 -D BUCK -D DEBUG -g -w $(config custom.other_cxxflags)
+  cflags = -fmodules -fobjc-arc -D BUCK -D DEBUG -w -fno-optimize-sibling-calls $(config custom.other_cflags)
+  cxxflags = -fobjc-arc -std=c++14 -D BUCK -D DEBUG -w -fno-optimize-sibling-calls $(config custom.other_cxxflags)
   combined_preprocess_and_compile = true
   pch_enabled = false
-  ldflags = -Xlinker -objc_abi_version -Xlinker 2 -fobjc-arc -fobjc-link-runtime $(config custom.other_cxxflags)
+  ldflags = -Xlinker -objc_abi_version -Xlinker 2 -fobjc-arc -fobjc-link-runtime -dead_strip -Xlinker -no_deduplicate $(config custom.other_cxxflags)
 
 [swift]
   version = 4.0
-  compiler_flags = -DBUCK -enable-testing -g -Onone -whole-module-optimization -suppress-warnings $(config custom.other_swift_compiler_flags)
+  compiler_flags = -DBUCK -enable-testing -Onone -whole-module-optimization -suppress-warnings -Xcc -fno-optimize-sibling-calls $(config custom.other_swift_compiler_flags)
   use_filelist = true
 
 [apple]
diff --git a/Telegram-iOS.xcodeproj/project.pbxproj b/Telegram-iOS.xcodeproj/project.pbxproj
index f8c8447329..f7d554c715 100644
--- a/Telegram-iOS.xcodeproj/project.pbxproj
+++ b/Telegram-iOS.xcodeproj/project.pbxproj
@@ -5250,6 +5250,7 @@
 				PRODUCT_NAME = Telegram;
 				PROVISIONING_PROFILE = "1e62fceb-1fb5-4804-ad0f-9b9b974393b8";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development org.telegram.Telegram-iOS";
+				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OBJC_BRIDGING_HEADER = "Telegram-iOS/Telegram-Bridging-Header.h";
 				SWIFT_VERSION = 4.0;
 				USER_HEADER_SEARCH_PATHS = "";
diff --git a/Telegram-iOS.xcworkspace/contents.xcworkspacedata b/Telegram-iOS.xcworkspace/contents.xcworkspacedata
index 4d5b71cdc4..c513513a5c 100644
--- a/Telegram-iOS.xcworkspace/contents.xcworkspacedata
+++ b/Telegram-iOS.xcworkspace/contents.xcworkspacedata
@@ -2,45 +2,45 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "group:/Users/peter/build/telegram-build/telegram-ios/submodules/AsyncDisplayKit/AsyncDisplayKit_Xcode.xcodeproj">
+      location = "group:submodules/AsyncDisplayKit/AsyncDisplayKit_Xcode.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:/Users/peter/build/telegram-build/telegram-ios/submodules/Display/Display_Xcode.xcodeproj">
+      location = "group:submodules/Display/Display_Xcode.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:/Users/peter/build/telegram-build/telegram-ios/submodules/Postbox/Postbox_Xcode.xcodeproj">
+      location = "group:submodules/Postbox/Postbox_Xcode.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:/Users/peter/build/telegram-build/telegram-ios/submodules/MtProtoKit/MtProtoKit_Xcode.xcodeproj">
+      location = "group:submodules/MtProtoKit/MtProtoKit_Xcode.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:/Users/peter/build/telegram-build/telegram-ios/submodules/SSignalKit/SSignalKit_Xcode.xcodeproj">
+      location = "group:submodules/SSignalKit/SSignalKit_Xcode.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:/Users/peter/build/telegram-build/telegram-ios/submodules/TelegramCore/TelegramCore_Xcode.xcodeproj">
+      location = "group:submodules/TelegramCore/TelegramCore_Xcode.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:/Users/peter/build/telegram-build/telegram-ios/submodules/LegacyComponents/LegacyComponents_Xcode.xcodeproj">
+      location = "group:submodules/LegacyComponents/LegacyComponents_Xcode.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:/Users/peter/build/telegram-build/telegram-ios/submodules/lottie-ios/Lottie_Xcode.xcodeproj">
+      location = "group:submodules/lottie-ios/Lottie_Xcode.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:/Users/peter/build/telegram-build/telegram-ios/submodules/ffmpeg/FFMpeg_Xcode.xcodeproj">
+      location = "group:submodules/ffmpeg/FFMpeg_Xcode.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:/Users/peter/build/telegram-build/telegram-ios/submodules/webp/WebP_Xcode.xcodeproj">
+      location = "group:submodules/webp/WebP_Xcode.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:/Users/peter/build/telegram-build/telegram-ios/submodules/libtgvoip/libtgvoip_Xcode.xcodeproj">
+      location = "group:submodules/libtgvoip/libtgvoip_Xcode.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:/Users/peter/build/telegram-build/telegram-ios/submodules/TelegramUI/TelegramUI_Xcode.xcodeproj">
+      location = "group:submodules/TelegramUI/TelegramUI_Xcode.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:/Users/peter/build/telegram-build/telegram-ios/submodules/HockeySDK-iOS/Support/HockeySDK_Xcode.xcodeproj">
+      location = "group:submodules/HockeySDK-iOS/Support/HockeySDK_Xcode.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:/Users/peter/build/telegram-build/telegram-ios/Telegram-iOS.xcodeproj">
+      location = "group:Telegram-iOS.xcodeproj">
    </FileRef>
 </Workspace>
diff --git a/submodules/Display b/submodules/Display
index bc5c8f60d4..b91c696d51 160000
--- a/submodules/Display
+++ b/submodules/Display
@@ -1 +1 @@
-Subproject commit bc5c8f60d4f9a0dbd66243008563a86fa1a7c652
+Subproject commit b91c696d51854a82ada6043d907eb3abe931344b
diff --git a/submodules/TelegramUI b/submodules/TelegramUI
index 3a98bd9872..c48f55454d 160000
--- a/submodules/TelegramUI
+++ b/submodules/TelegramUI
@@ -1 +1 @@
-Subproject commit 3a98bd98720e1f9863bdf43263f0f15160c2e674
+Subproject commit c48f55454de4c53de2e2e3199f28f87467fe9f12
diff --git a/submodules/ffmpeg b/submodules/ffmpeg
index 0c7f6f030d..53fc3dcb60 160000
--- a/submodules/ffmpeg
+++ b/submodules/ffmpeg
@@ -1 +1 @@
-Subproject commit 0c7f6f030d3e6a700c1f2be9691a8388a967661a
+Subproject commit 53fc3dcb6022f35015afd2605ead32bfd7417144
diff --git a/submodules/libtgvoip b/submodules/libtgvoip
index d122740f39..dcbbfd9ec4 160000
--- a/submodules/libtgvoip
+++ b/submodules/libtgvoip
@@ -1 +1 @@
-Subproject commit d122740f39d90123ad8aca46c0775738352ba74c
+Subproject commit dcbbfd9ec40ee8702852a768d75362142becc727