diff --git a/SDK/backendlessAPI/Classes/Backendless.h b/SDK/backendlessAPI/Classes/Backendless.h
index 2a526612..1947675a 100644
--- a/SDK/backendlessAPI/Classes/Backendless.h
+++ b/SDK/backendlessAPI/Classes/Backendless.h
@@ -19,10 +19,6 @@
  *  ********************************************************************************************************************
  */
 
-// applications & services deployment
-#define OLD_ASYNC_WITH_FAULT 0
-#define OLD_MEDIA_APP 0
-
 // implementation options
 #define _USE_SAFARI_VC_ 1
 
diff --git a/SDK/backendlessAPI/Classes/Messaging/MessagingService.h b/SDK/backendlessAPI/Classes/Messaging/MessagingService.h
index e9538767..fed54731 100755
--- a/SDK/backendlessAPI/Classes/Messaging/MessagingService.h
+++ b/SDK/backendlessAPI/Classes/Messaging/MessagingService.h
@@ -83,6 +83,7 @@
 -(DeviceRegistration *)currentDevice;
 -(NSString *)deviceTokenAsString:(NSData *)token;
 #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
--(void)attachmentProcessing:(UNNotificationRequest *)request withContentHandler:(void (^)(UNNotificationContent *))contentHandler;
+-(void)attachmentProcessing:(UNNotificationRequest *_Nonnull)request withContentHandler:(void (^_Nonnull)(UNNotificationContent *_Nonnull))contentHandler;
 #endif
+
 @end
diff --git a/SDK/backendlessAPI/Classes/Messaging/MessagingService.m b/SDK/backendlessAPI/Classes/Messaging/MessagingService.m
index 93d5c0e2..46c3d418 100644
--- a/SDK/backendlessAPI/Classes/Messaging/MessagingService.m
+++ b/SDK/backendlessAPI/Classes/Messaging/MessagingService.m
@@ -158,7 +158,7 @@ -(NSString *)deviceTokenAsString:(NSData *)token {
 }
 
 #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
--(void)attachmentProcessing:(UNNotificationRequest *)request withContentHandler:(void (^)(UNNotificationContent *))contentHandler {
+-(void)attachmentProcessing:(UNNotificationRequest *_Nonnull)request withContentHandler:(void (^_Nonnull)(UNNotificationContent *_Nonnull))contentHandler {
     UNMutableNotificationContent *bestAttemptContent = [request.content mutableCopy];
     NSString *urlString = [request.content.userInfo valueForKey:@"attachment-url"];
     NSURL *fileUrl = [NSURL URLWithString:urlString];
@@ -179,7 +179,6 @@ -(void)attachmentProcessing:(UNNotificationRequest *)request withContentHandler:
 }
 #endif
 
-
 // sync methods with fault return (as exception)
 
 -(NSString *)registerDevice:(NSData *)deviceToken {
diff --git a/SDK/backendlessAPI/backendlessAPI.xcodeproj/project.pbxproj b/SDK/backendlessAPI/backendlessAPI.xcodeproj/project.pbxproj
index 88bd7c7c..a24f5e06 100644
--- a/SDK/backendlessAPI/backendlessAPI.xcodeproj/project.pbxproj
+++ b/SDK/backendlessAPI/backendlessAPI.xcodeproj/project.pbxproj
@@ -3201,10 +3201,10 @@
 		F91B47E115FF448F00012DFC /* Classes */ = {
 			isa = PBXGroup;
 			children = (
-				0F9AC6E81E798C5B0087869F /* weborb */,
 				D30A5D7319B9CA8200C0BA44 /* Backendless-Bridging-Header.h */,
 				F91B47FE15FF569400012DFC /* Backendless.h */,
 				F91B47FF15FF569400012DFC /* Backendless.m */,
+				0F9AC6E81E798C5B0087869F /* weborb */,
 				91F1398917D7240A00D1AC4C /* Cache */,
 				F91B47EC15FF48AF00012DFC /* IO */,
 				F9BE41C11B2ED8FC00CD0A72 /* Exceptions */,
diff --git a/SDK/ios/backendless/backendless.a b/SDK/ios/backendless/backendless.a
index 24e4f1b5..1ccdfe4a 100644
Binary files a/SDK/ios/backendless/backendless.a and b/SDK/ios/backendless/backendless.a differ
diff --git a/SDK/ios/backendless/include/Backendless.h b/SDK/ios/backendless/include/Backendless.h
index 2a526612..1947675a 100644
--- a/SDK/ios/backendless/include/Backendless.h
+++ b/SDK/ios/backendless/include/Backendless.h
@@ -19,10 +19,6 @@
  *  ********************************************************************************************************************
  */
 
-// applications & services deployment
-#define OLD_ASYNC_WITH_FAULT 0
-#define OLD_MEDIA_APP 0
-
 // implementation options
 #define _USE_SAFARI_VC_ 1
 
diff --git a/SDK/ios/backendless/include/MessagingService.h b/SDK/ios/backendless/include/MessagingService.h
index e9538767..fed54731 100755
--- a/SDK/ios/backendless/include/MessagingService.h
+++ b/SDK/ios/backendless/include/MessagingService.h
@@ -83,6 +83,7 @@
 -(DeviceRegistration *)currentDevice;
 -(NSString *)deviceTokenAsString:(NSData *)token;
 #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
--(void)attachmentProcessing:(UNNotificationRequest *)request withContentHandler:(void (^)(UNNotificationContent *))contentHandler;
+-(void)attachmentProcessing:(UNNotificationRequest *_Nonnull)request withContentHandler:(void (^_Nonnull)(UNNotificationContent *_Nonnull))contentHandler;
 #endif
+
 @end
diff --git a/SDK/lib/backendless/backendless.a b/SDK/lib/backendless/backendless.a
index f0d69423..79d1dc0d 100644
Binary files a/SDK/lib/backendless/backendless.a and b/SDK/lib/backendless/backendless.a differ
diff --git a/SDK/lib/backendless/include/Backendless.h b/SDK/lib/backendless/include/Backendless.h
index 2a526612..1947675a 100644
--- a/SDK/lib/backendless/include/Backendless.h
+++ b/SDK/lib/backendless/include/Backendless.h
@@ -19,10 +19,6 @@
  *  ********************************************************************************************************************
  */
 
-// applications & services deployment
-#define OLD_ASYNC_WITH_FAULT 0
-#define OLD_MEDIA_APP 0
-
 // implementation options
 #define _USE_SAFARI_VC_ 1
 
diff --git a/SDK/lib/backendless/include/MessagingService.h b/SDK/lib/backendless/include/MessagingService.h
index e9538767..fed54731 100755
--- a/SDK/lib/backendless/include/MessagingService.h
+++ b/SDK/lib/backendless/include/MessagingService.h
@@ -83,6 +83,7 @@
 -(DeviceRegistration *)currentDevice;
 -(NSString *)deviceTokenAsString:(NSData *)token;
 #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
--(void)attachmentProcessing:(UNNotificationRequest *)request withContentHandler:(void (^)(UNNotificationContent *))contentHandler;
+-(void)attachmentProcessing:(UNNotificationRequest *_Nonnull)request withContentHandler:(void (^_Nonnull)(UNNotificationContent *_Nonnull))contentHandler;
 #endif
+
 @end
diff --git a/SDK/osx/backendless/include/Backendless.h b/SDK/osx/backendless/include/Backendless.h
index 2a526612..1947675a 100644
--- a/SDK/osx/backendless/include/Backendless.h
+++ b/SDK/osx/backendless/include/Backendless.h
@@ -19,10 +19,6 @@
  *  ********************************************************************************************************************
  */
 
-// applications & services deployment
-#define OLD_ASYNC_WITH_FAULT 0
-#define OLD_MEDIA_APP 0
-
 // implementation options
 #define _USE_SAFARI_VC_ 1
 
diff --git a/SDK/osx/backendless/include/MessagingService.h b/SDK/osx/backendless/include/MessagingService.h
index e9538767..fed54731 100755
--- a/SDK/osx/backendless/include/MessagingService.h
+++ b/SDK/osx/backendless/include/MessagingService.h
@@ -83,6 +83,7 @@
 -(DeviceRegistration *)currentDevice;
 -(NSString *)deviceTokenAsString:(NSData *)token;
 #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
--(void)attachmentProcessing:(UNNotificationRequest *)request withContentHandler:(void (^)(UNNotificationContent *))contentHandler;
+-(void)attachmentProcessing:(UNNotificationRequest *_Nonnull)request withContentHandler:(void (^_Nonnull)(UNNotificationContent *_Nonnull))contentHandler;
 #endif
+
 @end
diff --git a/SDK/osx/backendless/libbackendless-mac.a b/SDK/osx/backendless/libbackendless-mac.a
index cfaded78..2d820cf7 100644
Binary files a/SDK/osx/backendless/libbackendless-mac.a and b/SDK/osx/backendless/libbackendless-mac.a differ