diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 91b70569f..d370f1614 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -1419,8 +1419,8 @@ chatEventLogFilters message_edits:Bool message_deletions:Bool message_pins:Bool
 
 //@class DeviceToken @description Represents a token for push notifications
 
-//@description A token for Apple Push Notification Service @token Token, may be empty to de-register a device
-deviceTokenApplePush token:string = DeviceToken;
+//@description A token for Apple Push Notification Service @token Token, may be empty to de-register a device @is_app_sandbox True, if App Sandbox is enabled
+deviceTokenApplePush token:string is_app_sandbox:Bool = DeviceToken;
 
 //@description A token for Google Cloud Messaging @token Token, may be empty to de-register a device
 deviceTokenGoogleCloudMessaging token:string = DeviceToken;
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index a88e64f2b..ef1811c14 100644
Binary files a/td/generate/scheme/td_api.tlo and b/td/generate/scheme/td_api.tlo differ
diff --git a/td/telegram/DeviceTokenManager.cpp b/td/telegram/DeviceTokenManager.cpp
index 98f7c91e3..608483ae3 100644
--- a/td/telegram/DeviceTokenManager.cpp
+++ b/td/telegram/DeviceTokenManager.cpp
@@ -35,6 +35,7 @@ void DeviceTokenManager::TokenInfo::store(StorerT &storer) const {
   STORE_FLAG(is_sync);
   STORE_FLAG(is_unregister);
   STORE_FLAG(is_register);
+  STORE_FLAG(is_app_sandbox);
   END_STORE_FLAGS();
   store(token, storer);
   if (has_other_user_ids) {
@@ -54,6 +55,7 @@ void DeviceTokenManager::TokenInfo::parse(ParserT &parser) {
   PARSE_FLAG(is_sync);
   PARSE_FLAG(is_unregister);
   PARSE_FLAG(is_register);
+  PARSE_FLAG(is_app_sandbox);
   END_PARSE_FLAGS();
   CHECK(is_sync + is_unregister + is_register == 1);
   if (is_sync) {
@@ -87,6 +89,9 @@ StringBuilder &operator<<(StringBuilder &string_builder, const DeviceTokenManage
   if (!token_info.other_user_ids.empty()) {
     string_builder << ", with other users " << token_info.other_user_ids;
   }
+  if (token_info.is_app_sandbox) {
+    string_builder << ", sandboxed";
+  }
   return string_builder;
 }
 
@@ -95,11 +100,13 @@ void DeviceTokenManager::register_device(tl_object_ptr<td_api::DeviceToken> devi
   CHECK(device_token_ptr != nullptr);
   TokenType token_type;
   string token;
+  bool is_app_sandbox = false;
   switch (device_token_ptr->get_id()) {
     case td_api::deviceTokenApplePush::ID: {
       auto device_token = static_cast<td_api::deviceTokenApplePush *>(device_token_ptr.get());
       token = std::move(device_token->token_);
       token_type = TokenType::APNS;
+      is_app_sandbox = device_token->is_app_sandbox_;
       break;
     }
     case td_api::deviceTokenGoogleCloudMessaging::ID: {
@@ -162,6 +169,7 @@ void DeviceTokenManager::register_device(tl_object_ptr<td_api::DeviceToken> devi
     info.token = std::move(token);
   }
   info.other_user_ids = std::move(other_user_ids);
+  info.is_app_sandbox = is_app_sandbox;
   info.promise.set_value(make_tl_object<td_api::ok>());
   info.promise = std::move(promise);
   save_info(token_type);
@@ -238,7 +246,7 @@ void DeviceTokenManager::loop() {
           create_storer(telegram_api::account_unregisterDevice(token_type, info.token, std::move(other_user_ids))));
     } else {
       net_query = G()->net_query_creator().create(create_storer(
-          telegram_api::account_registerDevice(token_type, info.token, false, std::move(other_user_ids))));
+          telegram_api::account_registerDevice(token_type, info.token, info.is_app_sandbox, std::move(other_user_ids))));
     }
     info.net_query_id = net_query->id();
     G()->net_query_dispatcher().dispatch_with_callback(std::move(net_query), actor_shared(this, token_type));
@@ -268,7 +276,6 @@ void DeviceTokenManager::on_result(NetQueryPtr net_query) {
       info.token = "";
     }
     info.state = TokenInfo::State::Sync;
-    save_info(token_type);
   } else {
     if (info.promise) {
       if (r_flag.is_error()) {
@@ -283,10 +290,11 @@ void DeviceTokenManager::on_result(NetQueryPtr net_query) {
       info.state = TokenInfo::State::Sync;
       info.token = "";
     }
-    save_info(token_type);
     if (r_flag.is_error()) {
       LOG(ERROR) << r_flag.error();
     }
   }
+  save_info(token_type);
 }
+
 }  // namespace td
diff --git a/td/telegram/DeviceTokenManager.h b/td/telegram/DeviceTokenManager.h
index 2cfbb3577..cf51d33c1 100644
--- a/td/telegram/DeviceTokenManager.h
+++ b/td/telegram/DeviceTokenManager.h
@@ -37,6 +37,7 @@ class DeviceTokenManager : public NetQueryCallback {
     string token;
     uint64 net_query_id = 0;
     vector<int32> other_user_ids;
+    bool is_app_sandbox = false;
     Promise<tl_object_ptr<td_api::ok>> promise;
 
     template <class StorerT>
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index fd1b2291c..d77c9167a 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -1009,10 +1009,13 @@ class CliClient final : public Actor {
       string ip_port;
       std::tie(dc_id, ip_port) = split(args);
       send_request(make_tl_object<td_api::processDcUpdate>(dc_id, ip_port));
-    } else if (op == "rdb" || op == "RegisterDeviceB") {
+    } else if (op == "rda") {
+      send_request(make_tl_object<td_api::registerDevice>(make_tl_object<td_api::deviceTokenApplePush>(args, true),
+                                                          as_user_ids("")));
+    } else if (op == "rdb") {
       send_request(make_tl_object<td_api::registerDevice>(make_tl_object<td_api::deviceTokenBlackberryPush>(args),
                                                           as_user_ids("")));
-    } else if (op == "rdu" || op == "RegisterDeviceU") {
+    } else if (op == "rdu") {
       string token;
       string other_user_ids_str;