diff --git a/MTBackupAddressSignals.m b/MTBackupAddressSignals.m
index 93988065db..e27344d358 100644
--- a/MTBackupAddressSignals.m
+++ b/MTBackupAddressSignals.m
@@ -145,7 +145,7 @@ static NSData *base64_decode(NSString *str) {
     MTContext *context = [[MTContext alloc] initWithSerialization:currentContext.serialization apiEnvironment:apiEnvironment isTestingEnvironment:currentContext.isTestingEnvironment useTempAuthKeys:address.datacenterId != 0 ? currentContext.useTempAuthKeys : false];
     
     if (address.datacenterId != 0) {
-        context.keychain = currentContext.keychain;
+        //context.keychain = currentContext.keychain;
     }
     
     MTProto *mtProto = [[MTProto alloc] initWithContext:context datacenterId:address.datacenterId usageCalculationInfo:nil];
diff --git a/MTProtoKit/MTProto.m b/MTProtoKit/MTProto.m
index 709932443e..9a898e89ce 100644
--- a/MTProtoKit/MTProto.m
+++ b/MTProtoKit/MTProto.m
@@ -194,7 +194,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
         if ((_mtState & MTProtoStatePaused) == 0)
         {
             if (MTLogEnabled()) {
-                MTLog(@"[MTProto#%p pause]", self);
+                MTLog(@"[MTProto#%p@%p pause]", self, _context);
             }
             
             _mtState |= MTProtoStatePaused;
@@ -212,7 +212,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
         if (_mtState & MTProtoStatePaused)
         {
             if (MTLogEnabled()) {
-                MTLog(@"[MTProto#%p resume]", self);
+                MTLog(@"[MTProto#%p@%p resume]", self, _context);
             }
             
             [self setMtState:_mtState & (~MTProtoStatePaused)];
@@ -265,7 +265,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
     [[MTProto managerQueue] dispatchOnQueue:^
     {
         if (MTLogEnabled()) {
-            MTLog(@"[MTProto#%p changing transport %@#%p to %@#%p]", self, [_transport class] == nil ? @"" : NSStringFromClass([_transport class]), _transport, [transport class] == nil ? @"" : NSStringFromClass([transport class]), transport);
+            MTLog(@"[MTProto#%p@%p changing transport %@#%p to %@#%p]", self, _context, [_transport class] == nil ? @"" : NSStringFromClass([_transport class]), _transport, [transport class] == nil ? @"" : NSStringFromClass([transport class]), transport);
         }
         
         [self allTransactionsMayHaveFailed];
@@ -336,13 +336,13 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
             }
         } else if (!_useUnauthorizedMode && [_context authInfoForDatacenterWithId:_datacenterId] == nil) {
             if (MTLogEnabled()) {
-                MTLog(@"[MTProto#%p authInfoForDatacenterWithId:%d is nil]", self, _datacenterId);
+                MTLog(@"[MTProto#%p@%p authInfoForDatacenterWithId:%d is nil]", self, _context, _datacenterId);
             }
             if ((_mtState & MTProtoStateAwaitingDatacenterAuthorization) == 0) {
                 [self setMtState:_mtState | MTProtoStateAwaitingDatacenterAuthorization];
                 
                 if (MTLogEnabled()) {
-                    MTLog(@"[MTProto#%p requesting authInfo for %d]", self, _datacenterId);
+                    MTLog(@"[MTProto#%p@%p requesting authInfo for %d]", self, _context, _datacenterId);
                 }
                 [_context authInfoForDatacenterWithIdRequired:_datacenterId isCdn:_cdn];
             }
@@ -375,7 +375,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
     [[MTProto managerQueue] dispatchOnQueue:^
     {
         if (MTLogEnabled()) {
-            MTLog(@"[MTProto#%p resetting session]", self);
+            MTLog(@"[MTProto#%p@%p resetting session]", self, _context);
         }
         
         if (_authInfo.authKeyId != 0 && !self.cdn) {
@@ -424,7 +424,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
         if (!alreadySyncing)
         {
             if (MTLogEnabled()) {
-                MTLog(@"[MTProto#%p begin time sync]", self);
+                MTLog(@"[MTProto#%p@%p begin time sync]", self, _context);
             }
             
             MTTimeSyncMessageService *timeSyncService = [[MTTimeSyncMessageService alloc] init];
@@ -456,7 +456,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
         }
         
         if (MTLogEnabled()) {
-            MTLog(@"[MTProto#%p service tasks state: %d, resend: %s]", self, _mtState, haveResendMessagesPending ? "yes" : "no");
+            MTLog(@"[MTProto#%p@%p service tasks state: %d, resend: %s]", self, _context, _mtState, haveResendMessagesPending ? "yes" : "no");
         }
         
         for (id<MTMessageService> messageService in _messageServices)
@@ -506,7 +506,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
         if (notifyAboutServiceTask)
         {
             if (MTLogEnabled()) {
-                MTLog(@"[MTProto#%p service tasks state: %d, resend: %s]", self, _mtState, "yes");
+                MTLog(@"[MTProto#%p@%p service tasks state: %d, resend: %s]", self, _context, _mtState, "yes");
             }
             
             for (id<MTMessageService> messageService in _messageServices)
@@ -558,7 +558,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
                 if (!performingServiceTasks)
                 {
                     if (MTLogEnabled()) {
-                        MTLog(@"[MTProto#%p service tasks state: %d, resend: %s]", self, _mtState, "no");
+                        MTLog(@"[MTProto#%p@%p service tasks state: %d, resend: %s]", self, _context, _mtState, "no");
                     }
                     
                     for (id<MTMessageService> messageService in _messageServices)
@@ -724,7 +724,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
             return;
         
         if (MTLogEnabled()) {
-            MTLog(@"[MTProto#%p network state: %s]", self, isNetworkAvailable ? "available" : "waiting");
+            MTLog(@"[MTProto#%p@%p network state: %s]", self, _context, isNetworkAvailable ? "available" : "waiting");
         }
         
         for (id<MTMessageService> messageService in _messageServices)
@@ -755,7 +755,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
             return;
         
         if (MTLogEnabled()) {
-            MTLog(@"[MTProto#%p transport #%p connection state: %s]", self, transport, isConnected ? "connected" : "connecting");
+            MTLog(@"[MTProto#%p@%p transport #%p connection state: %s]", self, _context, transport, isConnected ? "connected" : "connecting");
         }
         
         for (id<MTMessageService> messageService in _messageServices)
@@ -782,7 +782,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
             return;
         
         if (MTLogEnabled()) {
-            MTLog(@"[MTProto#%p connection context update state: %s]", self, isUpdatingConnectionContext ? "updating" : "up to date");
+            MTLog(@"[MTProto#%p@%p connection context update state: %s]", self, _context, isUpdatingConnectionContext ? "updating" : "up to date");
         }
         
         for (id<MTMessageService> messageService in _messageServices)
@@ -1011,7 +1011,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
                                 debugResetTransport = true;
                             }
                         }*/
-                        MTLog(@"[MTProto#%p preparing %@]", self, messageDescription);
+                        MTLog(@"[MTProto#%p@%p preparing %@]", self, _context, messageDescription);
                     }
                     
                     if (!monotonityViolated || _useUnauthorizedMode)
@@ -1055,7 +1055,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
                 if (monotonityViolated)
                 {
                     if (MTLogEnabled()) {
-                        MTLog(@"[MTProto#%p client message id monotonity violated]", self);
+                        MTLog(@"[MTProto#%p@%p client message id monotonity violated]", self, _context);
                     }
                     
                     [self resetSessionInfo];
@@ -1242,7 +1242,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
                                         }
                                         
                                         if (MTLogEnabled()) {
-                                            MTLog(@"[MTProto#%p transport did not accept transactions with messages (%@)]", self, idsString);
+                                            MTLog(@"[MTProto#%p@%p transport did not accept transactions with messages (%@)]", self, _context, idsString);
                                         }
                                     }
                                 }];
@@ -1298,7 +1298,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
             MTOutputStream *decryptedOs = [[MTOutputStream alloc] init];
             
             if (MTLogEnabled()) {
-                MTLog(@"[MTProto#%x sending time fix ping (%" PRId64 "/%" PRId32 ", %" PRId64 ")]", self, timeFixMessageId, timeFixSeqNo, _sessionInfo.sessionId);
+                MTLog(@"[MTProto#%p@%p sending time fix ping (%" PRId64 "/%" PRId32 ", %" PRId64 ")]", self, _context, timeFixMessageId, timeFixSeqNo, _sessionInfo.sessionId);
             }
             
             [decryptedOs writeInt64:[_authInfo authSaltForMessageId:timeFixMessageId]]; // salt
@@ -1423,7 +1423,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
             MTOutputStream *decryptedOs = [[MTOutputStream alloc] init];
             
             if (MTLogEnabled()) {
-                MTLog(@"[MTProto#%llx sending temp key binding message (%" PRId64 "/%" PRId32 ") for %lld (%d)]", self, bindingMessageId, bindingSeqNo, effectiveTempAuthKey.authKeyId, (int)tempAuthKeyType);
+                MTLog(@"[MTProto#%p@%p sending temp key binding message (%" PRId64 "/%" PRId32 ") for %lld (%d)]", self, _context, bindingMessageId, bindingSeqNo, effectiveTempAuthKey.authKeyId, (int)tempAuthKeyType);
             }
             
             [decryptedOs writeInt64:[_authInfo authSaltForMessageId:bindingMessageId]];
@@ -2030,7 +2030,7 @@ static NSString *dumpHexString(NSData *data, int maxLength) {
             [data getBytes:&protocolErrorCode range:NSMakeRange(0, 4)];
             
             if (MTLogEnabled()) {
-                MTLog(@"[MTProto#%p protocol error %" PRId32 "", self, protocolErrorCode);
+                MTLog(@"[MTProto#%p@%p protocol error %" PRId32 "", self, _context, protocolErrorCode);
             }
             
             if (decodeResult != nil)
@@ -2081,7 +2081,7 @@ static NSString *dumpHexString(NSData *data, int maxLength) {
                         MTRpcError *rpcError = maybeInternalMessage;
                         if (rpcError.errorCode == 401 && [rpcError.errorDescription isEqualToString:@"AUTH_KEY_PERM_EMPTY"]) {
                             if (MTLogEnabled()) {
-                                MTLog(@"[MTProto#%p received AUTH_KEY_PERM_EMPTY]", self);
+                                MTLog(@"[MTProto#%p@%p received AUTH_KEY_PERM_EMPTY]", self, _context);
                             }
                             [self handleMissingKey:scheme.address];
                             [self requestSecureTransportReset];
@@ -2093,7 +2093,7 @@ static NSString *dumpHexString(NSData *data, int maxLength) {
             }
             if (parseError) {
                 if (MTLogEnabled()) {
-                    MTLog(@"[MTProto#%p incoming data parse error, header: %d:%@]", self, (int)decryptedData.length, dumpHexString(decryptedData, 128));
+                    MTLog(@"[MTProto#%p@%p incoming data parse error, header: %d:%@]", self, _context, (int)decryptedData.length, dumpHexString(decryptedData, 128));
                 }
                 
                 [_context reportTransportSchemeFailureForDatacenterId:_datacenterId transportScheme:scheme];
@@ -2114,7 +2114,7 @@ static NSString *dumpHexString(NSData *data, int maxLength) {
             }
         } else {
             if (MTLogEnabled()) {
-                MTLog(@"[MTProto#%p couldn't decrypt incoming data]", self);
+                MTLog(@"[MTProto#%p@%p couldn't decrypt incoming data]", self, _context);
             }
             
             if (decodeResult != nil)
@@ -2396,7 +2396,7 @@ static NSString *dumpHexString(NSData *data, int maxLength) {
     if ([_sessionInfo messageProcessed:incomingMessage.messageId])
     {
         if (MTLogEnabled()) {
-            MTLog(@"[MTProto#%p received duplicate message %" PRId64 "]", self, incomingMessage.messageId);
+            MTLog(@"[MTProto#%p@%p received duplicate message %" PRId64 "]", self, _context, incomingMessage.messageId);
         }
         [_sessionInfo scheduleMessageConfirmation:incomingMessage.messageId size:incomingMessage.size];
         
@@ -2407,7 +2407,7 @@ static NSString *dumpHexString(NSData *data, int maxLength) {
     }
     
     if (MTLogEnabled()) {
-        MTLog(@"[MTProto#%p [%d] received %@]", self, totalSize, [self incomingMessageDescription:incomingMessage]);
+        MTLog(@"[MTProto#%p@%p [%d] received %@]", self, _context, totalSize, [self incomingMessageDescription:incomingMessage]);
     }
     
     [_sessionInfo setMessageProcessed:incomingMessage.messageId];
@@ -2527,7 +2527,7 @@ static NSString *dumpHexString(NSData *data, int maxLength) {
             int64_t requestMessageId = ((MTMsgDetailedResponseInfoMessage *)detailedInfoMessage).requestMessageId;
             
             if (MTLogEnabled()) {
-                MTLog(@"[MTProto#%p detailed info %" PRId64 " is for %" PRId64 "", self, incomingMessage.messageId, requestMessageId);
+                MTLog(@"[MTProto#%p@%p detailed info %" PRId64 " is for %" PRId64 "", self, _context, incomingMessage.messageId, requestMessageId);
             }
             
             for (id<MTMessageService> messageService in _messageServices)
@@ -2549,7 +2549,7 @@ static NSString *dumpHexString(NSData *data, int maxLength) {
         {
             [self requestMessageWithId:detailedInfoMessage.responseMessageId];
             if (MTLogEnabled()) {
-                MTLog(@"[MTProto#%p will request message %" PRId64 "", self, detailedInfoMessage.responseMessageId);
+                MTLog(@"[MTProto#%p@%p will request message %" PRId64 "", self, _context, detailedInfoMessage.responseMessageId);
             }
         }
         else
@@ -2637,7 +2637,7 @@ static NSString *dumpHexString(NSData *data, int maxLength) {
                 }
             } else {
                 if (MTLogEnabled()) {
-                    MTLog(@"[MTProto#%p bindTempAuthKey error %@]", self, rpcError);
+                    MTLog(@"[MTProto#%p@%p bindTempAuthKey error %@]", self, _context, rpcError);
                 }
                 
                 [self requestTransportTransaction];