diff --git a/.gitattributes b/.gitattributes
index f657278f3..8a58f7182 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -25,6 +25,8 @@
 *.xaml text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 *.appxmanifest text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 *.vsixmanifest text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
+*.nuspec text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
+*.targets text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 *.json text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 *.csproj text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 *.sln text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index f6c1a3b10..096027223 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -1305,7 +1305,7 @@ chatFolderIcon name:string = ChatFolderIcon;
 //@description Represents a folder for user chats
 //@title The title of the folder; 1-12 characters without line feeds
 //@icon The chosen icon for the chat folder; may be null. If null, use getChatFolderDefaultIconName to get default icon name for the folder
-//@is_shareable True if at least one link has been created for the folder
+//@is_shareable True, if at least one link has been created for the folder
 //@pinned_chat_ids The chat identifiers of pinned chats in the folder. There can be up to getOption("chat_folder_chosen_chat_count_max") pinned and always included non-secret chats and the same number of secret chats, but the limit can be increased with Telegram Premium
 //@included_chat_ids The chat identifiers of always included chats in the folder. There can be up to getOption("chat_folder_chosen_chat_count_max") pinned and always included non-secret chats and the same number of secret chats, but the limit can be increased with Telegram Premium
 //@excluded_chat_ids The chat identifiers of always excluded chats in the folder. There can be up to getOption("chat_folder_chosen_chat_count_max") always excluded non-secret chats and the same number of secret chats, but the limit can be increased with Telegram Premium
@@ -6855,7 +6855,7 @@ checkChatFolderInviteLink invite_link:string = ChatFolderInviteLinkInfo;
 //@description Adds a chat folder by an invite link @invite_link Invite link for the chat folder @chat_ids Identifiers of the chats added to the chat folder. The chats are automatically joined if they aren't joined yet
 addChatFolderByInviteLink invite_link:string chat_ids:vector<int53> = Ok;
 
-//@description Returns new chats added to a shareable chat folder by its owner. The method should be called at most once in getOption("chat_folder_new_chats_update_period") for the given chat folder @chat_folder_id Chat folder identifier
+//@description Returns new chats added to a shareable chat folder by its owner. The method must be called at most once in getOption("chat_folder_new_chats_update_period") for the given chat folder @chat_folder_id Chat folder identifier
 getChatFolderNewChats chat_folder_id:int32 = Chats;
 
 //@description Adds new chats added to a shareable chat folder by its owner to the user's chat folder @chat_folder_id Chat folder identifier @chat_ids Identifiers of the new chats added to the chat folder. The chats are automatically joined if they aren't joined yet
@@ -7704,7 +7704,7 @@ setDefaultChannelAdministratorRights default_channel_administrator_rights:chatAd
 //@description Sets the name of a bot. Can be called only if userTypeBot.can_be_edited == true
 //@bot_user_id Identifier of the target bot
 //@language_code A two-letter ISO 639-1 language code. If empty, the description will be shown to all users, for which language there are no dedicated description
-//@name New bot's name on the specified language
+//@name New bot's name on the specified language; 0-64 characters. Default name can't be empty
 setBotName bot_user_id:int53 language_code:string name:string = Ok;
 
 //@description Returns the name of a bot in the given language. Can be called only if userTypeBot.can_be_edited == true
diff --git a/td/telegram/DialogFilterInviteLink.cpp b/td/telegram/DialogFilterInviteLink.cpp
index d510ede2c..f55f37a9f 100644
--- a/td/telegram/DialogFilterInviteLink.cpp
+++ b/td/telegram/DialogFilterInviteLink.cpp
@@ -10,6 +10,8 @@
 #include "td/telegram/MessagesManager.h"
 #include "td/telegram/Td.h"
 
+#include "td/utils/logging.h"
+
 namespace td {
 
 DialogFilterInviteLink::DialogFilterInviteLink(
diff --git a/td/telegram/DialogFilterInviteLink.h b/td/telegram/DialogFilterInviteLink.h
index 2a0a95cd0..101dfa325 100644
--- a/td/telegram/DialogFilterInviteLink.h
+++ b/td/telegram/DialogFilterInviteLink.h
@@ -10,7 +10,6 @@
 #include "td/telegram/td_api.h"
 #include "td/telegram/telegram_api.h"
 
-#include "td/utils/algorithm.h"
 #include "td/utils/common.h"
 #include "td/utils/Slice.h"
 #include "td/utils/StringBuilder.h"
diff --git a/td/telegram/DialogFilterManager.cpp b/td/telegram/DialogFilterManager.cpp
index 95e841383..83ae126f2 100644
--- a/td/telegram/DialogFilterManager.cpp
+++ b/td/telegram/DialogFilterManager.cpp
@@ -28,6 +28,7 @@
 #include "td/utils/buffer.h"
 #include "td/utils/FlatHashMap.h"
 #include "td/utils/logging.h"
+#include "td/utils/misc.h"
 #include "td/utils/Random.h"
 #include "td/utils/tl_helpers.h"
 
@@ -1087,11 +1088,11 @@ void DialogFilterManager::schedule_dialog_filters_reload(double timeout) {
   reload_dialog_filters_timeout_.set_timeout_in(timeout);
 }
 
-void DialogFilterManager::on_reload_dialog_filters_timeout(void *messages_manager_ptr) {
+void DialogFilterManager::on_reload_dialog_filters_timeout(void *dialog_filter_manager_ptr) {
   if (G()->close_flag()) {
     return;
   }
-  auto dialog_filter_manager = static_cast<DialogFilterManager *>(messages_manager_ptr);
+  auto dialog_filter_manager = static_cast<DialogFilterManager *>(dialog_filter_manager_ptr);
   send_closure_later(dialog_filter_manager->actor_id(dialog_filter_manager),
                      &DialogFilterManager::reload_dialog_filters);
 }
diff --git a/td/telegram/DialogFilterManager.h b/td/telegram/DialogFilterManager.h
index c201deb5d..8e3451af3 100644
--- a/td/telegram/DialogFilterManager.h
+++ b/td/telegram/DialogFilterManager.h
@@ -142,7 +142,7 @@ class DialogFilterManager final : public Actor {
 
   void schedule_dialog_filters_reload(double timeout);
 
-  static void on_reload_dialog_filters_timeout(void *messages_manager_ptr);
+  static void on_reload_dialog_filters_timeout(void *dialog_filter_manager_ptr);
 
   void reload_dialog_filters();
 
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 8e94c8517..4ddcc1a6a 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -69,7 +69,6 @@
 #include "td/actor/MultiPromise.h"
 #include "td/actor/MultiTimeout.h"
 #include "td/actor/SignalSlot.h"
-#include "td/actor/Timeout.h"
 
 #include "td/utils/buffer.h"
 #include "td/utils/ChangesProcessor.h"
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index afad490b9..4cea42bfa 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -911,7 +911,7 @@ class CliClient final : public Actor {
   }
 
   struct InputChatPhoto {
-    enum class Type { Null, Previous, Static, Animation, Sticker };
+    enum class Type : int32 { Null, Previous, Static, Animation, Sticker };
     Type type = Type::Null;
     int64 profile_photo_id = 0;
     string photo;