diff --git a/components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/src/main/java/org/wso2/carbon/appmgt/mdm/osgiconnector/ApplicationOperationsImpl.java b/components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/src/main/java/org/wso2/carbon/appmgt/mdm/osgiconnector/ApplicationOperationsImpl.java
index 7d7636d1a..607570bd0 100644
--- a/components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/src/main/java/org/wso2/carbon/appmgt/mdm/osgiconnector/ApplicationOperationsImpl.java
+++ b/components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/src/main/java/org/wso2/carbon/appmgt/mdm/osgiconnector/ApplicationOperationsImpl.java
@@ -243,13 +243,12 @@ public class ApplicationOperationsImpl implements ApplicationOperations {
 								getDevicesOfUser(
 										applicationOperationDevice.getCurrentUser().getUsername());
 			} else {
-                //TODO: Uncomment below when device-mgt core release-2.0.x is merged with master branch.
-				/*deviceList = MDMServiceAPIUtils
-						.getDeviceManagementService(applicationOperationDevice.getTenantId()).
-								getDevicesOfUser(
-										applicationOperationDevice.getCurrentUser().getUsername(),
-										applicationOperationDevice.getPlatform());*/
-			}
+                deviceList = MDMServiceAPIUtils
+                        .getDeviceManagementService(applicationOperationDevice.getTenantId()).
+                                getDevicesOfUser(
+                                        applicationOperationDevice.getCurrentUser().getUsername(),
+                                        applicationOperationDevice.getPlatform());
+            }
 			devices = new ArrayList<>(deviceList.size());
 			if(log.isDebugEnabled()){
 				log.debug("device list got from mdm "+ deviceList.toString());
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/discovery/DiscoveryService.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/discovery/DiscoveryService.java
index c84a0b9cf..460f11f40 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/discovery/DiscoveryService.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/discovery/DiscoveryService.java
@@ -50,7 +50,7 @@ import javax.xml.ws.soap.SOAPBinding;
                         @Extension(properties = {
                                 @ExtensionProperty(name = "name", value = "Windows Discovery service provider"),
                                 @ExtensionProperty(name = "context",
-                                        value = "api/device-mgt/windows/v1.0/discovery/post"),
+                                        value = "/api/device-mgt/windows/v1.0/discovery/post"),
                         })
                 }
         ),