diff --git a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTAdapterListener.java b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTAdapterListener.java
index 968faa4311..e41cfea50d 100644
--- a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTAdapterListener.java
+++ b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTAdapterListener.java
@@ -69,7 +69,7 @@ public class MQTTAdapterListener implements MqttCallback, Runnable {
     private MQTTBrokerConnectionConfiguration mqttBrokerConnectionConfiguration;
     private String topic;
     private String tenantDomain;
-    private boolean connectionSucceeded = false;
+    private volatile boolean connectionSucceeded = false;
     private ContentValidator contentValidator;
     private ContentTransformer contentTransformer;
     private InputEventAdapterConfiguration inputEventAdapterConfiguration;
diff --git a/features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.backend.feature/src/main/resources/devicetypes/android_sense.xml b/features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.backend.feature/src/main/resources/devicetypes/android_sense.xml
index 9699c5699d..e7c5c97fcd 100644
--- a/features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.backend.feature/src/main/resources/devicetypes/android_sense.xml
+++ b/features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.backend.feature/src/main/resources/devicetypes/android_sense.xml
@@ -52,9 +52,9 @@
         <SharedWithAllTenants>true</SharedWithAllTenants>
     </ProvisioningConfig>
 
-    <PushNotificationProvider type="MQTT">
+    <PushNotificationProviderConfig type="MQTT">
         <FileBasedProperties>true</FileBasedProperties>
-    </PushNotificationProvider>
+    </PushNotificationProviderConfig>
 
     <License>
         <Language>en_US</Language>
diff --git a/features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.ui.feature/src/main/resources/devicetypes/android_sense.xml b/features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.ui.feature/src/main/resources/devicetypes/android_sense.xml
index 9699c5699d..e7c5c97fcd 100644
--- a/features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.ui.feature/src/main/resources/devicetypes/android_sense.xml
+++ b/features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.ui.feature/src/main/resources/devicetypes/android_sense.xml
@@ -52,9 +52,9 @@
         <SharedWithAllTenants>true</SharedWithAllTenants>
     </ProvisioningConfig>
 
-    <PushNotificationProvider type="MQTT">
+    <PushNotificationProviderConfig type="MQTT">
         <FileBasedProperties>true</FileBasedProperties>
-    </PushNotificationProvider>
+    </PushNotificationProviderConfig>
 
     <License>
         <Language>en_US</Language>
diff --git a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/devicetypes/raspberrypi.xml b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/devicetypes/raspberrypi.xml
index cc2800ea87..70de5d4f87 100644
--- a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/devicetypes/raspberrypi.xml
+++ b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/src/main/resources/devicetypes/raspberrypi.xml
@@ -34,9 +34,9 @@
         <SharedWithAllTenants>true</SharedWithAllTenants>
     </ProvisioningConfig>
 
-    <PushNotificationProvider type="MQTT">
+    <PushNotificationProviderConfig type="MQTT">
         <FileBasedProperties>true</FileBasedProperties>
-    </PushNotificationProvider>
+    </PushNotificationProviderConfig>
 
     <License>
         <Language>en_US</Language>
diff --git a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.ui.feature/src/main/resources/devicetypes/raspberrypi.xml b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.ui.feature/src/main/resources/devicetypes/raspberrypi.xml
index cc2800ea87..70de5d4f87 100644
--- a/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.ui.feature/src/main/resources/devicetypes/raspberrypi.xml
+++ b/features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.ui.feature/src/main/resources/devicetypes/raspberrypi.xml
@@ -34,9 +34,9 @@
         <SharedWithAllTenants>true</SharedWithAllTenants>
     </ProvisioningConfig>
 
-    <PushNotificationProvider type="MQTT">
+    <PushNotificationProviderConfig type="MQTT">
         <FileBasedProperties>true</FileBasedProperties>
-    </PushNotificationProvider>
+    </PushNotificationProviderConfig>
 
     <License>
         <Language>en_US</Language>
diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/devicetypes/virtual_firealarm.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/devicetypes/virtual_firealarm.xml
index 10f1985ca6..59ed4bcb4b 100644
--- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/devicetypes/virtual_firealarm.xml
+++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/src/main/resources/devicetypes/virtual_firealarm.xml
@@ -34,11 +34,11 @@
         <SharedWithAllTenants>true</SharedWithAllTenants>
     </ProvisioningConfig>
 
-    <PushNotificationProvider type="MQTT">
+    <PushNotificationProviderConfig type="MQTT">
         <FileBasedProperties>true</FileBasedProperties>
-    </PushNotificationProvider>
+    </PushNotificationProviderConfig>
 
-    <!--<PushNotificationProvider type="XMPP">-->
+    <!--<PushNotificationProviderConfig type="XMPP">-->
         <!--<FileBasedProperties>true</FileBasedProperties>-->
         <!--&lt;!&ndash;if file based properties is set to false then the configuration will be picked from platform configuration&ndash;&gt;-->
         <!--<ConfigProperties>-->
@@ -50,7 +50,7 @@
             <!--<Property Name="jid">admin@localhost</Property>-->
             <!--<Property Name="server.name">localhost</Property>-->
         <!--</ConfigProperties>-->
-    <!--</PushNotificationProvider>-->
+    <!--</PushNotificationProviderConfig>-->
 
     <License>
         <Language>en_US</Language>
diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/devicetypes/virtual_firealarm.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/devicetypes/virtual_firealarm.xml
index 145709c861..aedb9e7fae 100644
--- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/devicetypes/virtual_firealarm.xml
+++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/devicetypes/virtual_firealarm.xml
@@ -34,12 +34,12 @@
         <SharedWithAllTenants>true</SharedWithAllTenants>
     </ProvisioningConfig>
 
-    <PushNotificationProvider type="MQTT">
+    <PushNotificationProviderConfig type="MQTT">
         <FileBasedProperties>true</FileBasedProperties>
         <!--if file based properties is set to false then the configuration will be picked from platform configuration-->
-    </PushNotificationProvider>
+    </PushNotificationProviderConfig>
 
-    <!--<PushNotificationProvider type="XMPP">-->
+    <!--<PushNotificationProviderConfig type="XMPP">-->
         <!--<FileBasedProperties>true</FileBasedProperties>-->
         <!--&lt;!&ndash;if file based properties is set to false then the configuration will be picked from platform configuration&ndash;&gt;-->
         <!--<ConfigProperties>-->
@@ -51,7 +51,7 @@
             <!--<Property Name="jid">admin@localhost</Property>-->
             <!--<Property Name="server.name">localhost</Property>-->
         <!--</ConfigProperties>-->
-    <!--</PushNotificationProvider>-->
+    <!--</PushNotificationProviderConfig>-->
 
     <License>
         <Language>en_US</Language>
diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
index 961aa1c9b4..edd27ae754 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
@@ -57,8 +57,8 @@
     access server after receiving push notification.
     -->
     <!--Configuration for enable firebase push notifications-->
-    <!--<PushNotificationProvider type="FCM" isScheduled="false">-->
-    <!--</PushNotificationProvider>-->
+    <!--<PushNotificationProviderConfig type="FCM" isScheduled="false">-->
+    <!--</PushNotificationProviderConfig>-->
 
     <DataSource>
         <JndiConfig>
diff --git a/pom.xml b/pom.xml
index f351fb6b76..54bcd402b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1157,8 +1157,8 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Device Management -->
-        <carbon.devicemgt.version>2.0.75-SNAPSHOT</carbon.devicemgt.version>
-        <carbon.devicemgt.version.range>[2.0.0, 3.0.0)</carbon.devicemgt.version.range>
+        <carbon.devicemgt.version>3.0.0-SNAPSHOT</carbon.devicemgt.version>
+        <carbon.devicemgt.version.range>[3.0.0, 4.0.0)</carbon.devicemgt.version.range>
 
         <!-- Carbon App Management -->
         <carbon.appmgt.version>1.2.25</carbon.appmgt.version>
@@ -1284,6 +1284,7 @@
         <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
         <siddhi.version>3.1.2</siddhi.version>
         <maven.scr.version>1.7.2</maven.scr.version>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
     </properties>
 
     <scm>