diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
index d54f38bcfb..a3b6161f6e 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
@@ -298,7 +298,7 @@ var operationModule = function () {
             case iosOperationConstants["WIFI_OPERATION_CODE"]:
                 payload = {
                     "wifiHiddenNetwork": operationPayload["hiddenNetwork"],
-                    "wifiSSID": operationPayload["ssid"],
+                    "wifiSSID": operationPayload["SSID"],
                     "wifiAutoJoin": operationPayload["autoJoin"],
                     "wifiProxyType": operationPayload["proxyType"],
                     "wifiEncryptionType": operationPayload["encryptionType"],
@@ -441,7 +441,7 @@ var operationModule = function () {
                 operationType = operationTypeConstants["PROFILE"];
                 payload = {
                     "operation": {
-                        "ssid": operationData["wifiSSID"],
+                        "SSID": operationData["wifiSSID"],
                         "hiddenNetwork": operationData["wifiHiddenNetwork"],
                         "autoJoin": operationData["wifiAutoJoin"],
                         "proxyType": operationData["wifiProxyType"],
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js
index 7778f71bbc..1c1eefcfd6 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js
@@ -535,16 +535,13 @@ validateStep["policy-profile"] = function () {
 
                 // Updating validationStatusArray with validationStatus
                 validationStatusArray.push(validationStatus);
-
             }
             if ($.inArray(androidOperationConstants["KIOSK_APPS_CODE"], configuredOperations) != -1) {
                 //If COSU whitelisting applications configured
                 operation = androidOperationConstants["KIOSK_APPS"];
                 // Initializing continueToCheckNextInputs to true
                 continueToCheckNextInputs = true;
-
                 var whitelistedApplicationsGridChildInputs = "div#cosu-whitelisted-applications .child-input";
-
                 if (continueToCheckNextInputs) {
                     if ($(whitelistedApplicationsGridChildInputs).length == 0) {
                         validationStatus = {
@@ -609,20 +606,16 @@ validateStep["policy-profile"] = function () {
                             };
                             continueToCheckNextInputs = false;
                         }
-
                     }
                 }
-
                 if (continueToCheckNextInputs) {
                     validationStatus = {
                         "error": false,
                         "okFeature": operation
                     };
                 }
-
                 // Updating validationStatusArray with validationStatus
                 validationStatusArray.push(validationStatus);
-
             }
         }
     }
@@ -2550,14 +2543,12 @@ var slideDownPaneAgainstValueSet = function (selectElement, paneID, valueSet) {
 
 var slideDownPaneAgainstValueSetForRadioButtons = function (selectElement, paneID, valueSet) {
     var selectedValueOnChange = selectElement.value;
-
     var i, slideDownVotes = 0;
     for (i = 0; i < valueSet.length; i++) {
         if (selectedValueOnChange == valueSet[i]) {
             slideDownVotes++;
         }
     }
-
     var paneSelector = "#" + paneID;
     if(slideDownVotes > 0) {
         $(paneSelector).removeClass("hidden");
@@ -2799,6 +2790,26 @@ $(document).ready(function () {
         }
     });
 
+    // <start - fixing feature-configuring switch double-click issue>
+    $(advanceOperations).on('hidden.bs.collapse', function (event) {
+        var collapsedFeatureBody = event.target.id;
+        var featureConfiguringSwitch = "#" + collapsedFeatureBody.
+            substr(0, collapsedFeatureBody.lastIndexOf("-")) + "-heading input[type=checkbox]";
+        if ($(featureConfiguringSwitch).prop("checked") == true) {
+            $(featureConfiguringSwitch).prop("checked", false);
+        }
+    });
+
+    $(advanceOperations).on('shown.bs.collapse', function (event) {
+        var expandedFeatureBody = event.target.id;
+        var featureConfiguringSwitch = "#" + expandedFeatureBody.
+            substr(0, expandedFeatureBody.lastIndexOf("-")) + "-heading input[type=checkbox]";
+        if ($(featureConfiguringSwitch).prop("checked") == false) {
+            $(featureConfiguringSwitch).prop("checked", true);
+        }
+    });
+    // <end - fixing feature-configuring switch double-click issue>
+
     // adding support for cloning multiple profiles per feature with cloneable class definitions
     $(advanceOperations).on("click", ".multi-view.add.enabled", function () {
         // get a copy of .cloneable and create new .cloned div element
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs
index be99f83a94..adf9008d46 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs
@@ -1201,14 +1201,12 @@
                         to modify these settings on their devices.
                     </div>
                 </div>
-
                 <div id="cosu-system-update-policy-body hidden" class="panel-collapse panel-body collapse" role="tabpanel"
                     aria-labelledby="cosu-system-update-policy-body">
                     <hr/>
                     <div id="cosu-system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
                         <i class="icon fw fw-error"></i><span></span>
                     </div>
-
                     <div class="wr-input-control">
                         <label class="wr-input-label">
                             System Update
@@ -1242,7 +1240,6 @@
                             </span>
                         </label>
                     </div>
-
                     <div id="cosu-system-update-policy-window-select" class="hidden">
                         <div>
                             <ul class="message message-info">
@@ -1326,7 +1323,6 @@
                             </select>
                         </div>
                     </div>
-
                 </div>
             </div>
         </div>
@@ -1352,7 +1348,6 @@
                         to modify these settings on their devices.
                     </div>
                 </div>
-
                 <div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
                     aria-labelledby="cosu-whitelisted-applications-body">
                     <hr/>
@@ -1391,7 +1386,7 @@
                                 <tbody data-add-form-container="#cosu-whitelisted-applications-grid">
                                     <tr data-help-text="add-form">
                                         <td colspan="4">
-                                            No entries added yet .
+                                            No entries added yet.
                                         </td>
                                     </tr>
                                 </tbody>
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js
index a054588f35..7c899b3cb4 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js
@@ -515,9 +515,7 @@ validateStep["policy-profile"] = function () {
                 operation = androidOperationConstants["KIOSK_APPS"];
                 // Initializing continueToCheckNextInputs to true
                 continueToCheckNextInputs = true;
-
                 var whitelistedApplicationsGridChildInputs = "div#cosu-whitelisted-applications .child-input";
-
                 if (continueToCheckNextInputs) {
                     if ($(whitelistedApplicationsGridChildInputs).length == 0) {
                         validationStatus = {
@@ -582,20 +580,16 @@ validateStep["policy-profile"] = function () {
                             };
                             continueToCheckNextInputs = false;
                         }
-
                     }
                 }
-
                 if (continueToCheckNextInputs) {
                     validationStatus = {
                         "error": false,
                         "okFeature": operation
                     };
                 }
-
                 // Updating validationStatusArray with validationStatus
                 validationStatusArray.push(validationStatus);
-
             }
         }
     } if (policy["platform"] == platformTypeConstants["WINDOWS"]) {
@@ -2559,21 +2553,25 @@ $(document).ready(function () {
         }
     });
 
-
-    $(advanceOperations).on('hidden.bs.collapse', function () {
-        if($(this).find('input').prop('checked')){
-            $(this).find('input').prop('checked',false);
+    // <start - fixing feature-configuring switch double-click issue>
+    $(advanceOperations).on('hidden.bs.collapse', function (event) {
+        var collapsedFeatureBody = event.target.id;
+        var featureConfiguringSwitch = "#" + collapsedFeatureBody.
+            substr(0, collapsedFeatureBody.lastIndexOf("-")) + "-heading input[type=checkbox]";
+        if ($(featureConfiguringSwitch).prop("checked") == true) {
+            $(featureConfiguringSwitch).prop("checked", false);
         }
     });
 
-
-    $(advanceOperations).on('shown.bs.collapse', function () {
-        if($(this).find('input').prop('checked') == false){
-            $(this).find('input').prop('checked',true);
+    $(advanceOperations).on('shown.bs.collapse', function (event) {
+        var expandedFeatureBody = event.target.id;
+        var featureConfiguringSwitch = "#" + expandedFeatureBody.
+            substr(0, expandedFeatureBody.lastIndexOf("-")) + "-heading input[type=checkbox]";
+        if ($(featureConfiguringSwitch).prop("checked") == false) {
+            $(featureConfiguringSwitch).prop("checked", true);
         }
     });
-
-
+    // <end - fixing feature-configuring switch double-click issue>
 
     // adding support for cloning multiple profiles per feature with cloneable class definitions
     $(advanceOperations).on("click", ".multi-view.add.enabled", function () {
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android-edit.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android-edit.hbs
index 21a720d80f..510e70a29d 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android-edit.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android-edit.hbs
@@ -1334,14 +1334,12 @@
                         </div>
                     </h2>
                 </div>
-
                 <div id="cosu-system-update-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
                      aria-labelledby="cosu-system-update-policy-body">
 
                     <div id="cosu-system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
                         <i class="icon fw fw-error"></i><span></span>
                     </div>
-
                     <div class="wr-input-control">
                         <label class="wr-input-label">
                             System Update
@@ -1375,7 +1373,6 @@
                             </span>
                         </label>
                     </div>
-
                     <div id="cosu-system-update-policy-window-select" class="hidden">
                         <div>
                             <ul class="message message-info">
@@ -1486,14 +1483,12 @@
                         </div>
                     </h2>
                 </div>
-
                 <div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
                      aria-labelledby="cosu-whitelisted-applications-body">
 
                     <div id="cosu-whitelisted-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
                         <i class="icon fw fw-error"></i><span></span>
                     </div>
-
                     <div class="wr-input-control">
                         <label class="wr-input-label" for="cosu-whitelisted-applications">
                             Whitelisted Applications to enter Lock Task Mode
@@ -1532,30 +1527,30 @@
                             </table>
                             <table class="template hidden">
                                 <tbody data-add-form="#cosu-whitelisted-applications-grid">
-                                <tr data-add-form-element="clone">
-                                    <td data-title="No:">
-                                        <span class="index"></span>
-                                    </td>
-                                    <td data-title="Application Name / Description">
-                                        <input type="text" class="form-control grid-input-text" data-child-key="appName"
-                                               maxlength="100" data-default="" placeholder="[ Application Name / Description ]"/>
-                                    </td>
-                                    <td data-title="Package Name">
-                                        <input type="text" class="form-control grid-input-text" data-child-key="packageName"
-                                               maxlength="100" data-default="" placeholder="[ Package Name ]"/>
-                                    </td>
-                                    <td>
-                                        <span class="list-group-item-actions">
-                                            <a href="#cosu-whitelisted-applications-grid" class="grid-input-remove"
-                                               data-click-event="remove-form">
-                                                <span class="fw-stack helper" title="Remove Entry">
-                                                    <i class="fw fw-ring fw-stack-2x"></i>
-                                                    <i class="fw fw-delete fw-stack-1x"></i>
-                                                </span>
-                                            </a>
-                                        </span>
-                                    </td>
-                                </tr>
+                                    <tr data-add-form-element="clone">
+                                        <td data-title="No:">
+                                            <span class="index"></span>
+                                        </td>
+                                        <td data-title="Application Name / Description">
+                                            <input type="text" class="form-control grid-input-text" data-child-key="appName"
+                                                   maxlength="100" data-default="" placeholder="[ Application Name / Description ]"/>
+                                        </td>
+                                        <td data-title="Package Name">
+                                            <input type="text" class="form-control grid-input-text" data-child-key="packageName"
+                                                   maxlength="100" data-default="" placeholder="[ Package Name ]"/>
+                                        </td>
+                                        <td>
+                                            <span class="list-group-item-actions">
+                                                <a href="#cosu-whitelisted-applications-grid" class="grid-input-remove"
+                                                   data-click-event="remove-form">
+                                                    <span class="fw-stack helper" title="Remove Entry">
+                                                        <i class="fw fw-ring fw-stack-2x"></i>
+                                                        <i class="fw fw-delete fw-stack-1x"></i>
+                                                    </span>
+                                                </a>
+                                            </span>
+                                        </td>
+                                    </tr>
                                 </tbody>
                             </table>
                         </div>
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/js/view.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/js/view.js
index 41eda65b1a..ad66519773 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/js/view.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/js/view.js
@@ -1954,14 +1954,12 @@ var slideDownPaneAgainstValueSet = function (selectElement, paneID, valueSet) {
 
 var slideDownPaneAgainstValueSetForRadioButtons = function (selectElement, paneID, valueSet) {
     var selectedValueOnChange = selectElement.value;
-
     var i, slideDownVotes = 0;
     for (i = 0; i < valueSet.length; i++) {
         if (selectedValueOnChange == valueSet[i]) {
             slideDownVotes++;
         }
     }
-
     var paneSelector = "#" + paneID;
     if(slideDownVotes > 0) {
         $(paneSelector).removeClass("hidden");
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android-view.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android-view.hbs
index 2017870949..4e6758d94e 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android-view.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android-view.hbs
@@ -650,7 +650,7 @@
 <div class="wr-input-control">
     <label class="wr-input-control checkbox">
         <input id="disable-screen-capture-enabled" type="checkbox" class="operationDataKeys"
-               data-key="disableScreenCapture disabled"/>
+            data-key="disableScreenCapture" disabled/>
                             <span class="helper" title="Having this checked would disable screen capture .">
                                 &nbsp;&nbsp;&nbsp;Disable screen capture
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
@@ -658,9 +658,10 @@
     </label>
 </div>
 <br>
-<br><b>
-    Bellow restrictions will be applied on devices with Android version 6.0 Marshmallow onwards only.
-</b>
+<br>
+    <b>
+        Bellow restrictions will be applied on devices with Android version 6.0 Marshmallow onwards only.
+    </b>
 <br><br>
 <div class="wr-input-control">
     <label class="wr-input-control checkbox">
@@ -1260,14 +1261,11 @@
                     </div>
                 </h2>
             </div>
-
             <div id="cosu-system-update-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
                  aria-labelledby="cosu-system-update-policy-body">
-
                 <div id="cosu-system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
                     <i class="icon fw fw-error"></i><span></span>
                 </div>
-
                 <div class="wr-input-control">
                     <label class="wr-input-label">
                         System Update
@@ -1301,7 +1299,6 @@
                             </span>
                     </label>
                 </div>
-
                 <div id="cosu-system-update-policy-window-select" class="hidden">
                     <div>
                         <ul class="message message-info">
@@ -1385,7 +1382,6 @@
                         </select>
                     </div>
                 </div>
-
             </div>
         </div>
     </div>
@@ -1412,14 +1408,12 @@
                     </div>
                 </h2>
             </div>
-
             <div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
                  aria-labelledby="cosu-whitelisted-applications-body">
 
                 <div id="cosu-whitelisted-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
                     <i class="icon fw fw-error"></i><span></span>
                 </div>
-
                 <div class="wr-input-control">
                     <label class="wr-input-label" for="cosu-whitelisted-applications">
                         Whitelisted Applications to enter Lock Task Mode
@@ -1451,37 +1445,37 @@
                             <tbody data-add-form-container="#cosu-whitelisted-applications-grid">
                             <tr data-help-text="add-form">
                                 <td colspan="4">
-                                    No entries added yet .
+                                    No entries added yet.
                                 </td>
                             </tr>
                             </tbody>
                         </table>
                         <table class="template hidden">
                             <tbody data-add-form="#cosu-whitelisted-applications-grid">
-                            <tr data-add-form-element="clone">
-                                <td data-title="No:">
-                                    <span class="index"></span>
-                                </td>
-                                <td data-title="Application Name / Description">
-                                    <input type="text" class="form-control grid-input-text" data-child-key="appName"
-                                           maxlength="100" data-default="" placeholder="[ Application Name / Description ]" disabled/>
-                                </td>
-                                <td data-title="Package Name">
-                                    <input type="text" class="form-control grid-input-text" data-child-key="packageName"
-                                           maxlength="100" data-default="" placeholder="[ Package Name ]" disabled/>
-                                </td>
-                                <td>
-                                    <span class="list-group-item-actions hidden">
-                                        <a href="#cosu-whitelisted-applications-grid" class="grid-input-remove"
-                                           data-click-event="remove-form">
-                                            <span class="fw-stack helper" title="Remove Entry">
-                                                <i class="fw fw-ring fw-stack-2x"></i>
-                                                <i class="fw fw-delete fw-stack-1x"></i>
-                                            </span>
-                                        </a>
-                                    </span>
-                                </td>
-                            </tr>
+                                <tr data-add-form-element="clone">
+                                    <td data-title="No:">
+                                        <span class="index"></span>
+                                    </td>
+                                    <td data-title="Application Name / Description">
+                                        <input type="text" class="form-control grid-input-text" data-child-key="appName"
+                                               maxlength="100" data-default="" placeholder="[ Application Name / Description ]" disabled/>
+                                    </td>
+                                    <td data-title="Package Name">
+                                        <input type="text" class="form-control grid-input-text" data-child-key="packageName"
+                                               maxlength="100" data-default="" placeholder="[ Package Name ]" disabled/>
+                                    </td>
+                                    <td>
+                                        <span class="list-group-item-actions hidden">
+                                            <a href="#cosu-whitelisted-applications-grid" class="grid-input-remove"
+                                               data-click-event="remove-form">
+                                                <span class="fw-stack helper" title="Remove Entry">
+                                                    <i class="fw fw-ring fw-stack-2x"></i>
+                                                    <i class="fw fw-delete fw-stack-1x"></i>
+                                                </span>
+                                            </a>
+                                        </span>
+                                    </td>
+                                </tr>
                             </tbody>
                         </table>
                     </div>
diff --git a/pom.xml b/pom.xml
index 034ea217f1..b975f34241 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1207,7 +1207,7 @@
 
 
         <!-- Carbon App Management -->
-        <carbon.appmgt.version>1.2.4</carbon.appmgt.version>
+        <carbon.appmgt.version>1.2.5-SNAPSHOT</carbon.appmgt.version>
 
         <!-- Carbon Device Management Plugins -->
         <carbon.devicemgt.plugins.version>2.2.4-SNAPSHOT</carbon.devicemgt.plugins.version>